cmake: move app_data_alignment.ld under ARC sub-directory

This commit moves the app_data_alignment.ld scripts under arch/arc sub-directory, as it is not not used at all in ARM builds. The script is still used for ARC, whose v2 MPU also has the reuquirement for power-of-two size alignment. Signed-off-by: Ioannis Glaropoulos <[email protected]>
bearsh · Nov 30, 2018 · c15c491 · c15c491
1 parent 560357b
commit c15c491
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1078,7 +1078,7 @@ zephyr_compile_options(
 )
 
 configure_file(
-     $ENV{ZEPHYR_BASE}/include/arch/arm/cortex_m/scripts/app_data_alignment.ld
+     $ENV{ZEPHYR_BASE}/include/arch/arc/v2/app_data_alignment.ld
      ${PROJECT_BINARY_DIR}/include/generated/app_data_alignment.ld)
 
 configure_file(
@@ -1110,7 +1110,7 @@ if(CONFIG_CPU_HAS_MPU AND CONFIG_USERSPACE)
   endif()
 
 
-  if(CONFIG_MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT AND CONFIG_APPLICATION_MEMORY)
+  if(CONFIG_MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT AND CONFIG_ARC AND CONFIG_APPLICATION_MEMORY)
 
     construct_add_custom_command_for_linker_pass(linker_app_sizing custom_command)
     add_custom_command(

diff --git a/...rm/cortex_m/scripts/app_data_alignment.ld → include/arch/arc/v2/app_data_alignment.ld b/...rm/cortex_m/scripts/app_data_alignment.ld → include/arch/arc/v2/app_data_alignment.ld