From d2e89856cc96ece16abfbe404ee9397c8593bafa Mon Sep 17 00:00:00 2001
From: Kumar Gala <kumar.gala@linaro.org>
Date: Mon, 26 Feb 2018 10:52:29 -0600
Subject: [PATCH] cmake: dts: Fix usage of BOARD vs BOARD_FAMILY

We assumed that ${BOARD} and ${BOARD_FAMILY} are always the same and
thus interchangeable.  That isn't always the case so use ${BOARD} proper
for when we mean the exact BOARD name we are building for vs the
BOARD_FAMILY.

We also add .dts files for board variants within a board family, such
that we have a .dts matching each board name.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
---
 boards/x86/qemu_x86/qemu_x86_iamcu.dts |  1 +
 boards/x86/qemu_x86/qemu_x86_nommu.dts |  1 +
 cmake/dts.cmake                        | 10 +++++-----
 3 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 boards/x86/qemu_x86/qemu_x86_iamcu.dts
 create mode 100644 boards/x86/qemu_x86/qemu_x86_nommu.dts

diff --git a/boards/x86/qemu_x86/qemu_x86_iamcu.dts b/boards/x86/qemu_x86/qemu_x86_iamcu.dts
new file mode 100644
index 00000000000..ebed13076f8
--- /dev/null
+++ b/boards/x86/qemu_x86/qemu_x86_iamcu.dts
@@ -0,0 +1 @@
+#include "qemu_x86.dts"
diff --git a/boards/x86/qemu_x86/qemu_x86_nommu.dts b/boards/x86/qemu_x86/qemu_x86_nommu.dts
new file mode 100644
index 00000000000..ebed13076f8
--- /dev/null
+++ b/boards/x86/qemu_x86/qemu_x86_nommu.dts
@@ -0,0 +1 @@
+#include "qemu_x86.dts"
diff --git a/cmake/dts.cmake b/cmake/dts.cmake
index 508caf2abbe..4200e108ffd 100644
--- a/cmake/dts.cmake
+++ b/cmake/dts.cmake
@@ -10,7 +10,7 @@
 # See ~/zephyr/doc/dts
 set(GENERATED_DTS_BOARD_H    ${PROJECT_BINARY_DIR}/include/generated/generated_dts_board.h)
 set(GENERATED_DTS_BOARD_CONF ${PROJECT_BINARY_DIR}/include/generated/generated_dts_board.conf)
-set_ifndef(DTS_SOURCE ${BOARD_ROOT}/boards/${ARCH}/${BOARD_FAMILY}/${BOARD_FAMILY}.dts)
+set_ifndef(DTS_SOURCE ${BOARD_ROOT}/boards/${ARCH}/${BOARD_FAMILY}/${BOARD}.dts)
 set_ifndef(DTS_COMMON_OVERLAYS ${PROJECT_SOURCE_DIR}/dts/common/common.dts)
 
 message(STATUS "Generating zephyr/include/generated/generated_dts_board.h")
@@ -61,7 +61,7 @@ if(CONFIG_HAS_DTS)
     -undef -D__DTS__
     -P
     -E ${ZEPHYR_BASE}/misc/empty_file.c
-    -o ${BOARD_FAMILY}.dts.pre.tmp
+    -o ${BOARD}.dts.pre.tmp
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
     RESULT_VARIABLE ret
     )
@@ -73,9 +73,9 @@ if(CONFIG_HAS_DTS)
   execute_process(
     COMMAND ${DTC}
     -O dts
-    -o ${BOARD_FAMILY}.dts_compiled
+    -o ${BOARD}.dts_compiled
     -b 0
-    ${BOARD_FAMILY}.dts.pre.tmp
+    ${BOARD}.dts.pre.tmp
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
     RESULT_VARIABLE ret
     )
@@ -97,7 +97,7 @@ if(CONFIG_HAS_DTS)
     set(DTS_APP_FIXUP -f ${APPLICATION_SOURCE_DIR}/dts.fixup)
   endif()
   set(CMD_EXTRACT_DTS_INCLUDES ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/dts/extract_dts_includes.py
-    --dts ${BOARD_FAMILY}.dts_compiled
+    --dts ${BOARD}.dts_compiled
     --yaml ${PROJECT_SOURCE_DIR}/dts/bindings
     ${DTS_SOC_FIXUP} ${DTS_BOARD_FIXUP} ${DTS_APP_FIXUP}
     )