diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 72ea928795e..76471c2d8ce 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -42,9 +42,6 @@ config ARM help This option signifies the use of an ARM system. -config XIP - default n - config ISA_THUMB2 bool "Thumb-2 Technology" default y diff --git a/arch/arm/configs/micro_fsl_frdm_k64f_defconfig b/arch/arm/configs/micro_fsl_frdm_k64f_defconfig index 7774cf346f7..9317e137db3 100644 --- a/arch/arm/configs/micro_fsl_frdm_k64f_defconfig +++ b/arch/arm/configs/micro_fsl_frdm_k64f_defconfig @@ -12,7 +12,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_SYS_CLOCK_EXISTS=y # CONFIG_INIT_STACKS is not set -# CONFIG_XIP is not set +CONFIG_XIP=y # CONFIG_ENHANCED_SECURITY is not set # diff --git a/arch/arm/configs/micro_ti_lm3s6965_defconfig b/arch/arm/configs/micro_ti_lm3s6965_defconfig index 9f401cef70f..9a132843af8 100644 --- a/arch/arm/configs/micro_ti_lm3s6965_defconfig +++ b/arch/arm/configs/micro_ti_lm3s6965_defconfig @@ -12,7 +12,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000 CONFIG_SYS_CLOCK_EXISTS=y # CONFIG_INIT_STACKS is not set -# CONFIG_XIP is not set +CONFIG_XIP=y # CONFIG_ENHANCED_SECURITY is not set # diff --git a/arch/arm/configs/nano_fsl_frdm_k64f_defconfig b/arch/arm/configs/nano_fsl_frdm_k64f_defconfig index 1622b4bc8ee..081914b6f58 100644 --- a/arch/arm/configs/nano_fsl_frdm_k64f_defconfig +++ b/arch/arm/configs/nano_fsl_frdm_k64f_defconfig @@ -12,7 +12,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_SYS_CLOCK_EXISTS=y # CONFIG_INIT_STACKS is not set -# CONFIG_XIP is not set +CONFIG_XIP=y # CONFIG_ENHANCED_SECURITY is not set # diff --git a/arch/arm/configs/nano_ti_lm3s6965_defconfig b/arch/arm/configs/nano_ti_lm3s6965_defconfig index 0dbdbe46d5d..8f75faca9fa 100644 --- a/arch/arm/configs/nano_ti_lm3s6965_defconfig +++ b/arch/arm/configs/nano_ti_lm3s6965_defconfig @@ -12,7 +12,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000 CONFIG_SYS_CLOCK_EXISTS=y # CONFIG_INIT_STACKS is not set -# CONFIG_XIP is not set +CONFIG_XIP=y # CONFIG_ENHANCED_SECURITY is not set # diff --git a/arch/arm/defconfig b/arch/arm/defconfig index 7774cf346f7..9317e137db3 100644 --- a/arch/arm/defconfig +++ b/arch/arm/defconfig @@ -12,7 +12,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_SYS_CLOCK_EXISTS=y # CONFIG_INIT_STACKS is not set -# CONFIG_XIP is not set +CONFIG_XIP=y # CONFIG_ENHANCED_SECURITY is not set #