boards: colibri_imx7d_m4/warp7_m4: Remove CONFIG_XIP for dts

Move the how enabling of CONFIG_XIP impacts CONFIG_FLASH_SIZE and CONFIG_FLASH_BASE_ADDRESS to Kconfig instead of dts. Signed-off-by: Kumar Gala <[email protected]>
zephyrproject-rtos · Jan 31, 2019 · d8a9fb8 · d8a9fb8
1 parent d4ed823
commit d8a9fb8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/boards/arm/colibri_imx7d_m4/Kconfig.defconfig b/boards/arm/colibri_imx7d_m4/Kconfig.defconfig
@@ -65,5 +65,12 @@ config PWM_1
 
 endif # PWM_IMX
 
+if !XIP
+config FLASH_SIZE
+	default 0
+config FLASH_BASE_ADDRESS
+	default 0
+endif
+
 
 endif # BOARD_COLIBRI_IMX7D_M4
diff --git a/boards/arm/colibri_imx7d_m4/colibri_imx7d_m4.dts b/boards/arm/colibri_imx7d_m4/colibri_imx7d_m4.dts
@@ -24,9 +24,7 @@
 	};
 
 	chosen {
-#if defined(CONFIG_XIP)
 		zephyr,flash = &tcml_code;
-#endif
 		zephyr,sram = &tcmu_sys;
 		zephyr,console = &uart2;
 		zephyr,shell-uart = &uart2;

diff --git a/boards/arm/warp7_m4/Kconfig.defconfig b/boards/arm/warp7_m4/Kconfig.defconfig
@@ -48,4 +48,11 @@ config FXAS21002_DRDY_INT1
 
 endif # FXAS21002
 
+if !XIP
+config FLASH_SIZE
+	default 0
+config FLASH_BASE_ADDRESS
+	default 0
+endif
+
 endif # BOARD_WARP7_M4
diff --git a/boards/arm/warp7_m4/warp7_m4.dts b/boards/arm/warp7_m4/warp7_m4.dts
@@ -22,9 +22,7 @@
 	};
 
 	chosen {
-#if defined(CONFIG_XIP)
 		zephyr,flash = &tcml_code;
-#endif
 		zephyr,sram = &tcmu_sys;
 		zephyr,console = &uart2;
 		zephyr,shell-uart = &uart2;