cmake: fixed issue with invalid usage of APPLICATION_SOURCE_DIR

Fixes: zephyrproject-rtos#24158 The shell/fs sample was using APPLICATION_SOURCE_DIR before it has been defined. This has now been fixed to use the proper way of overlaying board specific settings using boards folder. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
hakehuang · Jun 20, 2020 · a6a4423 · a6a4423
1 parent d2df7a2
commit a6a4423
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 14 deletions.
diff --git a/samples/subsys/shell/fs/CMakeLists.txt b/samples/subsys/shell/fs/CMakeLists.txt
@@ -2,22 +2,8 @@
 
 cmake_minimum_required(VERSION 3.13.1)
 
-if((BOARD STREQUAL nrf52840dk_nrf52840) OR
-   (BOARD STREQUAL nrf52dk_nrf52832) OR
-   (BOARD STREQUAL nrf9160dk_nrf9160) OR
-   (BOARD STREQUAL reel_board)
-)
-  if(EXISTS               ${APPLICATION_SOURCE_DIR}/boards/${BOARD}.conf)
-    set(CONF_FILE "prj.conf mpu.conf boards/${BOARD}.conf")
-  else()
-    set(CONF_FILE "prj.conf mpu.conf")
-  endif()
-endif()
-
 find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
 project(fs_shell)
 
-
-
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
diff --git a/samples/subsys/shell/fs/boards/nrf52840dk_nrf52840.conf b/samples/subsys/shell/fs/boards/nrf52840dk_nrf52840.conf
@@ -0,0 +1 @@
+CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/shell/fs/boards/nrf52dk_nrf52832.conf b/samples/subsys/shell/fs/boards/nrf52dk_nrf52832.conf
@@ -0,0 +1 @@
+CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/shell/fs/boards/nrf9160dk_nrf9160.conf b/samples/subsys/shell/fs/boards/nrf9160dk_nrf9160.conf
@@ -0,0 +1 @@
+CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/shell/fs/boards/reel_board.conf b/samples/subsys/shell/fs/boards/reel_board.conf
@@ -0,0 +1 @@
+CONFIG_MPU_ALLOW_FLASH_WRITE=y