examples: rand_wfi: update CMake structure

Updating this CMake struct according hello_world example.
Using this new struct we can build debug and release configuration
at the same time and use Eclipse.

Signed-off-by: Raul Munoz <raul.munoz@toradex.com>
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>

10 files changed, 120 insertions, 120 deletions

diff --git a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/CMakeLists.txt b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/CMakeLists.txt
index f8bb577..becc3be 100644
--- a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/CMakeLists.txt
+++ b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/CMakeLists.txt
@@ -1,5 +1,8 @@
 INCLUDE(CMakeForceCompiler)
 
+SET(ProjectName rand_wfi)
+PROJECT(${ProjectName})
+
 # CROSS COMPILER SETTING
 SET(CMAKE_SYSTEM_NAME Generic)
 CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
@@ -17,123 +20,106 @@ SET(CMAKE_STATIC_LIBRARY_SUFFIX)
 SET(CMAKE_EXECUTABLE_LIBRARY_PREFIX)
 SET(CMAKE_EXECUTABLE_LIBRARY_SUFFIX)
 
- 
+SET(CMAKE_SKIP_INSTALL_RULES TRUE)
+
 # CURRENT DIRECTORY
 SET(ProjDirPath ${CMAKE_CURRENT_SOURCE_DIR})
+SET(BspRootDirPath ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../..)
+
+# RELEASE/DEBUG LINK FILE
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -T MCIMX7D_M4_ocram.ld -static -L ${BspRootDirPath}/platform/devices/MCIMX7D/linker/gcc/")
+
+# DEFAULT ASM FLAGS
+SET(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -mcpu=cortex-m4  -mfloat-abi=hard  -mfpu=fpv4-sp-d16  -mthumb  -Wall  -fno-common  -ffunction-sections  -fdata-sections  -ffreestanding  -fno-builtin  -mapcs  -std=gnu99")
 
-# DEBUG LINK FILE
-set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -T${ProjDirPath}/../../../../../../platform/devices/MCIMX7D/linker/gcc/MCIMX7D_M4_tcm.ld  -static")
+# DEFAULT C FLAGS
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=cortex-m4  -mfloat-abi=hard  -mfpu=fpv4-sp-d16  -mthumb  -MMD  -MP  -Wall  -fno-common  -ffunction-sections  -fdata-sections  -ffreestanding  -fno-builtin  -mapcs  -std=gnu99")
 
-# RELEASE LINK FILE
-set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -T${ProjDirPath}/../../../../../../platform/devices/MCIMX7D/linker/gcc/MCIMX7D_M4_tcm.ld  -static")
+# DEFAULT LD FLAGS
+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mcpu=cortex-m4 -mfloat-abi=hard  -mfpu=fpv4-sp-d16  --specs=nano.specs  -Wall  -fno-common -ffunction-sections  -fdata-sections  -ffreestanding  -fno-builtin  -mthumb -mapcs  -Xlinker --gc-sections  -Xlinker -static  -Xlinker -z -z max-page-size=4096 -Xlinker muldefs")
 
 # DEBUG ASM FLAGS
-SET(CMAKE_ASM_FLAGS_DEBUG "${CMAKE_ASM_FLAGS_DEBUG} -g  -mcpu=cortex-m4  -mfloat-abi=hard  -mfpu=fpv4-sp-d16  -mthumb  -Wall  -fno-common  -ffunction-sections  -fdata-sections  -ffreestanding  -fno-builtin  -mapcs  -std=gnu99")
+SET(CMAKE_ASM_FLAGS_DEBUG "${CMAKE_ASM_FLAGS_DEBUG} -g")
 
 # DEBUG C FLAGS
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g  -O0  -mcpu=cortex-m4  -mfloat-abi=hard  -mfpu=fpv4-sp-d16  -mthumb  -MMD  -MP  -Wall  -fno-common  -ffunction-sections  -fdata-sections  -ffreestanding  -fno-builtin  -mapcs  -std=gnu99")
+SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -O0")
 
 # DEBUG LD FLAGS
-SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -g  -mcpu=cortex-m4  -mfloat-abi=hard  -mfpu=fpv4-sp-d16  --specs=nano.specs  -lm  -Wall  -fno-common  -ffunction-sections  -fdata-sections  -ffreestanding  -fno-builtin  -Os  -mthumb  -mapcs  -Xlinker --gc-sections  -Xlinker -static  -Xlinker -z  -Xlinker muldefs")
-
-# RELEASE ASM FLAGS
-SET(CMAKE_ASM_FLAGS_RELEASE "${CMAKE_ASM_FLAGS_RELEASE} -mcpu=cortex-m4  -mfloat-abi=hard  -mfpu=fpv4-sp-d16  -mthumb  -Wall  -fno-common  -ffunction-sections  -fdata-sections  -ffreestanding  -fno-builtin  -mapcs  -std=gnu99")
+SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -g")
 
 # RELEASE C FLAGS
-SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os  -mcpu=cortex-m4  -mfloat-abi=hard  -mfpu=fpv4-sp-d16  -mthumb  -MMD  -MP  -Wall  -fno-common  -ffunction-sections  -fdata-sections  -ffreestanding  -fno-builtin  -mapcs  -std=gnu99")
-
-# RELEASE LD FLAGS
-SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -mcpu=cortex-m4  -mfloat-abi=hard  -mfpu=fpv4-sp-d16  --specs=nano.specs  -lm  -Wall  -fno-common  -ffunction-sections  -fdata-sections  -ffreestanding  -fno-builtin  -Os  -mthumb  -mapcs  -Xlinker --gc-sections  -Xlinker -static  -Xlinker -z  -Xlinker muldefs")
+SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os")
 
 # ASM MACRO
 SET(CMAKE_ASM_FLAGS_DEBUG "${CMAKE_ASM_FLAGS_DEBUG}  -D__DEBUG")
 
 # C MACRO
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCPU_MCIMX7D_M4")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}  -D__DEBUG")
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}  -DCPU_MCIMX7D_M4")
 SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}  -D__NDEBUG")
-SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}  -DCPU_MCIMX7D_M4")
-
-# CXX MACRO
 
 # INCLUDE_DIRECTORIES
-IF(CMAKE_BUILD_TYPE MATCHES Debug)
     INCLUDE_DIRECTORIES(${ProjDirPath}/../../../..)
     INCLUDE_DIRECTORIES(${ProjDirPath}/..)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/portable/GCC/ARM_CM4F)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../../../../platform/CMSIS/Include)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../../../../platform/devices)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../../../../platform/devices/MCIMX7D/include)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../../../../platform/devices/MCIMX7D/startup)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../../../../platform/drivers/inc)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/include)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../../../../platform/utilities/inc)
+    INCLUDE_DIRECTORIES(${BspRootDirPath}/rtos/FreeRTOS/Source/portable/GCC/ARM_CM4F)
+    INCLUDE_DIRECTORIES(${BspRootDirPath}/platform/CMSIS/Include)
+    INCLUDE_DIRECTORIES(${BspRootDirPath}/platform/devices)
+    INCLUDE_DIRECTORIES(${BspRootDirPath}/platform/devices/MCIMX7D/include)
+    INCLUDE_DIRECTORIES(${BspRootDirPath}/platform/devices/MCIMX7D/startup)
+    INCLUDE_DIRECTORIES(${BspRootDirPath}/platform/drivers/inc)
+    INCLUDE_DIRECTORIES(${BspRootDirPath}/rtos/FreeRTOS/Source/include)
+    INCLUDE_DIRECTORIES(${BspRootDirPath}/platform/utilities/inc)
     INCLUDE_DIRECTORIES(${ProjDirPath}/../../../..)
     INCLUDE_DIRECTORIES(${ProjDirPath}/../../common)
     INCLUDE_DIRECTORIES(${ProjDirPath}/..)
-ELSEIF(CMAKE_BUILD_TYPE MATCHES Release)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../..)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/..)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/portable/GCC/ARM_CM4F)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../../../../platform/CMSIS/Include)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../../../../platform/devices)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../../../../platform/devices/MCIMX7D/include)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../../../../platform/devices/MCIMX7D/startup)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../../../../platform/drivers/inc)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/include)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../../../../platform/utilities/inc)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../../..)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/../../common)
-    INCLUDE_DIRECTORIES(${ProjDirPath}/..)
-ENDIF()
 
 # ADD_EXECUTABLE
-ADD_EXECUTABLE(rand_wfi_imx7d 
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h"
-    "${ProjDirPath}/../../../../../../platform/devices/MCIMX7D/startup/gcc/startup_MCIMX7D_M4.S"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/portable/MemMang/heap_2.c"
+ADD_EXECUTABLE(${ProjectName}
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h"
+    "${BspRootDirPath}/platform/devices/MCIMX7D/startup/gcc/startup_MCIMX7D_M4.S"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/portable/MemMang/heap_2.c"
     "${ProjDirPath}/../FreeRTOSConfig.h"
     "${ProjDirPath}/../main.c"
     "${ProjDirPath}/../../common/gpc.c"
     "${ProjDirPath}/../../common/gpc.h"
     "${ProjDirPath}/../../common/lpm_mcore.c"
     "${ProjDirPath}/../../common/lpm_mcore.h"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/include/croutine.h"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/include/event_groups.h"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/include/FreeRTOS.h"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/include/list.h"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/include/mpu_wrappers.h"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/include/portable.h"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/include/projdefs.h"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/include/queue.h"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/include/semphr.h"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/include/StackMacros.h"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/include/task.h"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/include/timers.h"
-    "${ProjDirPath}/../../../../../../platform/drivers/inc/ccm_analog_imx7d.h"
-    "${ProjDirPath}/../../../../../../platform/drivers/inc/ccm_imx7d.h"
-    "${ProjDirPath}/../../../../../../platform/drivers/inc/lmem.h"
-    "${ProjDirPath}/../../../../../../platform/drivers/inc/rdc.h"
-    "${ProjDirPath}/../../../../../../platform/drivers/inc/rdc_defs_imx7d.h"
-    "${ProjDirPath}/../../../../../../platform/drivers/inc/wdog_imx.h"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/croutine.c"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/event_groups.c"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/list.c"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/queue.c"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/tasks.c"
-    "${ProjDirPath}/../../../../../../rtos/FreeRTOS/Source/timers.c"
-    "${ProjDirPath}/../../../../../../platform/drivers/src/ccm_analog_imx7d.c"
-    "${ProjDirPath}/../../../../../../platform/drivers/src/ccm_imx7d.c"
-    "${ProjDirPath}/../../../../../../platform/drivers/src/lmem.c"
-    "${ProjDirPath}/../../../../../../platform/drivers/src/rdc.c"
-    "${ProjDirPath}/../../../../../../platform/drivers/src/wdog_imx.c"
-    "${ProjDirPath}/../../../../../../platform/utilities/src/debug_console_imx.c"
-    "${ProjDirPath}/../../../../../../platform/utilities/inc/debug_console_imx.h"
-    "${ProjDirPath}/../../../../../../platform/utilities/src/print_scan.c"
-    "${ProjDirPath}/../../../../../../platform/utilities/src/print_scan.h"
-    "${ProjDirPath}/../../../../../../platform/devices/MCIMX7D/startup/system_MCIMX7D_M4.c"
-    "${ProjDirPath}/../../../../../../platform/devices/MCIMX7D/startup/system_MCIMX7D_M4.h"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/include/croutine.h"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/include/event_groups.h"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/include/FreeRTOS.h"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/include/list.h"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/include/mpu_wrappers.h"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/include/portable.h"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/include/projdefs.h"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/include/queue.h"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/include/semphr.h"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/include/StackMacros.h"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/include/task.h"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/include/timers.h"
+    "${BspRootDirPath}/platform/drivers/inc/ccm_analog_imx7d.h"
+    "${BspRootDirPath}/platform/drivers/inc/ccm_imx7d.h"
+    "${BspRootDirPath}/platform/drivers/inc/lmem.h"
+    "${BspRootDirPath}/platform/drivers/inc/rdc.h"
+    "${BspRootDirPath}/platform/drivers/inc/rdc_defs_imx7d.h"
+    "${BspRootDirPath}/platform/drivers/inc/wdog_imx.h"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/croutine.c"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/event_groups.c"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/list.c"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/queue.c"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/tasks.c"
+    "${BspRootDirPath}/rtos/FreeRTOS/Source/timers.c"
+    "${BspRootDirPath}/platform/drivers/src/ccm_analog_imx7d.c"
+    "${BspRootDirPath}/platform/drivers/src/ccm_imx7d.c"
+    "${BspRootDirPath}/platform/drivers/src/lmem.c"
+    "${BspRootDirPath}/platform/drivers/src/rdc.c"
+    "${BspRootDirPath}/platform/drivers/src/wdog_imx.c"
+    "${BspRootDirPath}/platform/utilities/src/debug_console_imx.c"
+    "${BspRootDirPath}/platform/utilities/inc/debug_console_imx.h"
+    "${BspRootDirPath}/platform/utilities/src/print_scan.c"
+    "${BspRootDirPath}/platform/utilities/src/print_scan.h"
+    "${BspRootDirPath}/platform/devices/MCIMX7D/startup/system_MCIMX7D_M4.c"
+    "${BspRootDirPath}/platform/devices/MCIMX7D/startup/system_MCIMX7D_M4.h"
     "${ProjDirPath}/../../../../pin_mux.c"
     "${ProjDirPath}/../../../../pin_mux.h"
     "${ProjDirPath}/../../../../board.c"
@@ -145,34 +131,34 @@ ADD_EXECUTABLE(rand_wfi_imx7d
     "${ProjDirPath}/../../../../gpio_pins.h"
     "${ProjDirPath}/../gpt_timer.c"
     "${ProjDirPath}/../gpt_timer.h"
-    "${ProjDirPath}/../../../../../../platform/drivers/src/uart_imx.c"
-    "${ProjDirPath}/../../../../../../platform/drivers/inc/uart_imx.h"
-    "${ProjDirPath}/../../../../../../platform/drivers/src/gpt.c"
-    "${ProjDirPath}/../../../../../../platform/drivers/inc/gpt.h"
-    "${ProjDirPath}/../../../../../../platform/drivers/src/mu_imx.c"
-    "${ProjDirPath}/../../../../../../platform/drivers/inc/mu_imx.h"
-    "${ProjDirPath}/../../../../../../platform/drivers/src/rdc_semaphore.c"
-    "${ProjDirPath}/../../../../../../platform/drivers/inc/rdc_semaphore.h"
+    "${BspRootDirPath}/platform/drivers/src/uart_imx.c"
+    "${BspRootDirPath}/platform/drivers/inc/uart_imx.h"
+    "${BspRootDirPath}/platform/drivers/src/gpt.c"
+    "${BspRootDirPath}/platform/drivers/inc/gpt.h"
+    "${BspRootDirPath}/platform/drivers/src/mu_imx.c"
+    "${BspRootDirPath}/platform/drivers/inc/mu_imx.h"
+    "${BspRootDirPath}/platform/drivers/src/rdc_semaphore.c"
+    "${BspRootDirPath}/platform/drivers/inc/rdc_semaphore.h"
 )
-SET_TARGET_PROPERTIES(rand_wfi_imx7d PROPERTIES OUTPUT_NAME "rand_wfi_imx7d.elf")
+SET_TARGET_PROPERTIES(${ProjectName} PROPERTIES OUTPUT_NAME "${ProjectName}.elf")
 
-TARGET_LINK_LIBRARIES(rand_wfi_imx7d -Wl,--start-group)
+TARGET_LINK_LIBRARIES(${ProjectName} -Wl,--start-group)
 # LIBRARIES
 IF(CMAKE_BUILD_TYPE MATCHES Debug)
 ELSEIF(CMAKE_BUILD_TYPE MATCHES Release)
 ENDIF()
 
 # SYSTEM LIBRARIES
-TARGET_LINK_LIBRARIES(rand_wfi_imx7d m)
-TARGET_LINK_LIBRARIES(rand_wfi_imx7d c)
-TARGET_LINK_LIBRARIES(rand_wfi_imx7d gcc)
-TARGET_LINK_LIBRARIES(rand_wfi_imx7d nosys)
-TARGET_LINK_LIBRARIES(rand_wfi_imx7d -Wl,--end-group)
+TARGET_LINK_LIBRARIES(${ProjectName} m)
+TARGET_LINK_LIBRARIES(${ProjectName} c)
+TARGET_LINK_LIBRARIES(${ProjectName} gcc)
+TARGET_LINK_LIBRARIES(${ProjectName} nosys)
+TARGET_LINK_LIBRARIES(${ProjectName} -Wl,--end-group)
 
 # MAP FILE
-SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}  -Xlinker -Map=debug/rand_wfi_imx7d.map")
-SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}  -Xlinker -Map=release/rand_wfi_imx7d.map")
+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}  -Xlinker -Map=${ProjectName}.map")
 
 # BIN AND HEX
-ADD_CUSTOM_COMMAND(TARGET rand_wfi_imx7d POST_BUILD COMMAND ${CMAKE_OBJCOPY} -Oihex ${EXECUTABLE_OUTPUT_PATH}/rand_wfi_imx7d.elf ${EXECUTABLE_OUTPUT_PATH}/rand_wfi_imx7d.hex)
-ADD_CUSTOM_COMMAND(TARGET rand_wfi_imx7d POST_BUILD COMMAND ${CMAKE_OBJCOPY} -Obinary ${EXECUTABLE_OUTPUT_PATH}/rand_wfi_imx7d.elf ${EXECUTABLE_OUTPUT_PATH}/rand_wfi_imx7d.bin)
+ADD_CUSTOM_COMMAND(TARGET ${ProjectName} POST_BUILD COMMAND ${CMAKE_OBJCOPY} -Oihex ${EXECUTABLE_OUTPUT_PATH}/${ProjectName}.elf ${EXECUTABLE_OUTPUT_PATH}/${ProjectName}.hex)
+# bin does not support sparse memory area, which our default linker file uses...
+#ADD_CUSTOM_COMMAND(TARGET ${ProjectName} POST_BUILD COMMAND ${CMAKE_OBJCOPY} -Obinary ${EXECUTABLE_OUTPUT_PATH}/${ProjectName}.elf ${EXECUTABLE_OUTPUT_PATH}/${ProjectName}.bin)
diff --git a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_all.bat b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_all.bat
index 0cf721f..426a29f 100644
--- a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_all.bat
+++ b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_all.bat
@@ -1,5 +1,7 @@
-cmake -DCMAKE_TOOLCHAIN_FILE="../../../../../../tools/cmake_toolchain_files/armgcc.cmake" -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Debug  .
-mingw32-make -j4
-cmake -DCMAKE_TOOLCHAIN_FILE="../../../../../../tools/cmake_toolchain_files/armgcc.cmake" -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release  .
-mingw32-make -j4
+cd release
+call build_release.bat
+cd ..
+cd debug
+call build_debug.bat
+cd ..
 pause
diff --git a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_all.sh b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_all.sh
index 3827529..99e6267 100755
--- a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_all.sh
+++ b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_all.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
-cmake -DCMAKE_TOOLCHAIN_FILE="../../../../../../tools/cmake_toolchain_files/armgcc.cmake" -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug  .
-make -j4
-cmake -DCMAKE_TOOLCHAIN_FILE="../../../../../../tools/cmake_toolchain_files/armgcc.cmake" -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  .
-make -j4
+cd debug/
+./build_debug.sh
+cd ..
+cd release/
+./build_release.sh
+cd ..
diff --git a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_debug.sh b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_debug.sh
deleted file mode 100755
index effd076..0000000
--- a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_debug.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cmake -DCMAKE_TOOLCHAIN_FILE="../../../../../../tools/cmake_toolchain_files/armgcc.cmake" -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug  .
-make -j4
diff --git a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/clean.bat b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/clean.bat
index ffea088..fc53949 100644
--- a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/clean.bat
+++ b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/clean.bat
@@ -1,3 +1,9 @@
-RD /s /Q Debug Release CMakeFiles
-DEL /s /Q /F Makefile cmake_install.cmake CMakeCache.txt
+cd debug
+rd /s /Q CMakeFiles/
+del /s /Q /F Makefile cmake_install.cmake CMakeCache.txt *.elf *.bin *.map *.hex
+cd ..
+cd release
+rd /s /Q CMakeFiles/
+del /s /Q /F Makefile cmake_install.cmake CMakeCache.txt *.elf *.bin *.map *.hex
+cd ..
 pause
diff --git a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/clean.sh b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/clean.sh
index 795ad87..4b188ab 100755
--- a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/clean.sh
+++ b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/clean.sh
@@ -1,3 +1,7 @@
 #!/bin/sh
-rm -rf debug release CMakeFiles
-rm -rf Makefile cmake_install.cmake CMakeCache.txt
+cd debug
+rm -rf Makefile cmake_install.cmake CMakeCache.txt CMakeFiles *.elf *.bin *.map *.hex .cproject .project
+cd ..
+cd release
+rm -rf Makefile cmake_install.cmake CMakeCache.txt CMakeFiles *.elf *.bin *.map *.hex
+cd ..
diff --git a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_debug.bat b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/debug/build_debug.bat
index e9ccfdd..ea7473c 100644
--- a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_debug.bat
+++ b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/debug/build_debug.bat
@@ -1,3 +1,3 @@
-cmake -DCMAKE_TOOLCHAIN_FILE="../../../../../../tools/cmake_toolchain_files/armgcc.cmake" -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Debug  .
+cmake -DCMAKE_TOOLCHAIN_FILE="../../../../../../tools/cmake_toolchain_files/armgcc.cmake" -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Debug ..
 mingw32-make -j4
 pause
diff --git a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/debug/build_debug.sh b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/debug/build_debug.sh
new file mode 100755
index 0000000..a839f78
--- /dev/null
+++ b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/debug/build_debug.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+cmake -DCMAKE_TOOLCHAIN_FILE="../../../../../../tools/cmake_toolchain_files/armgcc.cmake" -G "Eclipse CDT4 - Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug  ..
+make -j4
diff --git a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_release.bat b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/release/build_release.bat
index 0759349..1e066fb 100644
--- a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_release.bat
+++ b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/release/build_release.bat
@@ -1,3 +1,3 @@
-cmake -DCMAKE_TOOLCHAIN_FILE="../../../../../../tools/cmake_toolchain_files/armgcc.cmake" -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release  .
+cmake -DCMAKE_TOOLCHAIN_FILE="../../../../../../tools/cmake_toolchain_files/armgcc.cmake" -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release  ..
 mingw32-make -j4
 pause
diff --git a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_release.sh b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/release/build_release.sh
index a12067d..576604f 100755
--- a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/build_release.sh
+++ b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/armgcc/release/build_release.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-cmake -DCMAKE_TOOLCHAIN_FILE="../../../../../../tools/cmake_toolchain_files/armgcc.cmake" -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  .
+cmake -DCMAKE_TOOLCHAIN_FILE="../../../../../../tools/cmake_toolchain_files/armgcc.cmake" -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  ..
 make -j4