arm: cleanup remaining CONFIG_INIT_CRITICAL
PATCH 1/1 arm: cleanup remaining CONFIG_INIT_CRITICAL
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
--- cpu/arm946es/start.S | 4 +++- cpu/arm_intcm/start.S | 4 +++- include/configs/SMN42.h | 2 -- include/configs/armadillo.h | 2 +- include/configs/gcplus.h | 2 +- include/configs/integratorap.h | 2 +- include/configs/lpc2292sodimm.h | 2 -- 7 files changed, 9 insertions(+), 9 deletions(-)
cpu/arm946es/start.S +3 -1
@@ -133,7 +133,7 @@ reset: * we do sys-critical inits only at reboot, * not when booting from ram! */ -#ifdef CONFIG_INIT_CRITICAL +#ifndef CONFIG_SKIP_LOWLEVEL_INIT bl cpu_init_crit #endif
@@ -192,6 +192,7 @@ _start_armboot: */ +#ifndef CONFIG_SKIP_LOWLEVEL_INIT cpu_init_crit: /* * flush v4 I/D caches
@@ -217,6 +218,7 @@ cpu_init_crit: bl lowlevel_init /* go setup memory */ mov lr, ip /* restore link */ mov pc, lr /* back to my caller */ +#endif /* ************************************************************************* *
cpu/arm_intcm/start.S +3 -1
@@ -131,7 +131,7 @@ reset: * we do sys-critical inits only at reboot, * not when booting from ram! */ -#ifdef CONFIG_INIT_CRITICAL +#ifndef CONFIG_SKIP_LOWLEVEL_INIT bl cpu_init_crit #endif
@@ -188,11 +188,13 @@ _start_armboot: ************************************************************************* */ +#ifndef CONFIG_SKIP_LOWLEVEL_INIT cpu_init_crit: /* arm_int_generic assumes the ARM boot monitor, or user software, * has initialized the platform */ mov pc, lr /* back to my caller */ +#endif /* ************************************************************************* *
include/configs/SMN42.h +0 -2
@@ -30,8 +30,6 @@* If we are developing, we might want to start u-boot from ram * so we MUST NOT initialize critical regs like mem-timing ... */ -#undef CONFIG_INIT_CRITICAL/* undef for developing */ -#undef CONFIG_SKIP_LOWLEVEL_INIT#undef CONFIG_SKIP_RELOCATE_UBOOT
include/configs/armadillo.h +1 -1
@@ -34,7 +34,7 @@* If we are developing, we might want to start armboot from ram * so we MUST NOT initialize critical regs like mem-timing ... */ -/*#define CONFIG_INIT_CRITICAL*/ /* undef for developing */ +#undef CONFIG_SKIP_LOWLEVEL_INIT/* * High Level Configuration Options
include/configs/gcplus.h +1 -1
@@ -36,7 +36,7 @@* e.g. bootp/tftp download of the kernel is a far more convenient * when testing new kernels on this target. However the ADS GCPlus Linux * boot ROM leaves the MMU enabled when it passes control to U-Boot. So -* we use lowlevel_init (CONFIG_INIT_CRITICAL) to remedy that problem. +* we use lowlevel_init (!CONFIG_SKIP_LOWLEVEL_INIT) to remedy that problem. */ #undef CONFIG_SKIP_LOWLEVEL_INIT#define CONFIG_SKIP_RELOCATE_UBOOT 1
include/configs/integratorap.h +1 -1
@@ -44,7 +44,7 @@#define CONFIG_SETUP_MEMORY_TAGS 1#define CONFIG_MISC_INIT_R 1/* call misc_init_r during start up */ -#undef CONFIG_INIT_CRITICAL +#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_CM_INIT 1#define CONFIG_CM_REMAP 1#undef CONFIG_CM_SPD_DETECT
include/configs/lpc2292sodimm.h +0 -2
@@ -30,8 +30,6 @@* If we are developing, we might want to start u-boot from ram * so we MUST NOT initialize critical regs like mem-timing ... */ -#undef CONFIG_INIT_CRITICAL/* undef for developing */ -#undef CONFIG_SKIP_LOWLEVEL_INIT#undef CONFIG_SKIP_RELOCATE_UBOOT
Signature · 1 line
1.6.2.1