Skip to content

Commit e1fc5c2

Browse files
Andy Grossgalak
authored andcommitted
cmake: Add CONFIG_APPLICATION_MEMORY constraint
This patch adds an additional constraint to make sure that we only do the application memory sizing if it is really necessary. Signed-off-by: Andy Gross <andy.gross@linaro.org>
1 parent 0be346e commit e1fc5c2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ endif() # CONFIG_APPLICATION_MEMORY
524524
# Declare MPU userspace dependencies before the linker scripts to make
525525
# sure the order of dependencies are met
526526
if(CONFIG_CPU_HAS_MPU AND CONFIG_USERSPACE)
527-
if(CONFIG_MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT)
527+
if(CONFIG_MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT AND CONFIG_APPLICATION_MEMORY)
528528
set(ALIGN_SIZING_DEP app_sizing_prebuilt linker_app_sizing_script)
529529
endif()
530530
set(PRIV_STACK_DEP priv_stacks_prebuilt)
@@ -887,7 +887,7 @@ configure_file(
887887

888888
if(CONFIG_CPU_HAS_MPU AND CONFIG_USERSPACE)
889889

890-
if(CONFIG_MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT)
890+
if(CONFIG_MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT AND CONFIG_APPLICATION_MEMORY)
891891

892892
construct_add_custom_command_for_linker_pass(linker_app_sizing custom_command)
893893
add_custom_command(

0 commit comments

Comments
 (0)