Hi,
- CONFIG_INIT_CRITICAL is deprecated - remove all references to CONFIG_INIT_CRITICAL for ARM based boards - replace by CONFIG_SKIP_LOWLEVEL_INIT
Signed-off-by: Gururaja Hebbar gururajakr@sanyo.co.in --- cpu/arm946es/start.S | 6 +++--- cpu/arm_intcm/start.S | 2 +- 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(-)
diff --git a/cpu/arm946es/start.S b/cpu/arm946es/start.S index 9e97f53..582cf18 100755 --- a/cpu/arm946es/start.S +++ b/cpu/arm946es/start.S @@ -133,15 +133,15 @@ 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
relocate: /* relocate U-Boot to RAM */ adr r0, _start /* r0 <- current position of code */ ldr r1, _TEXT_BASE /* test if we run from flash or RAM */ - cmp r0, r1 /* don't reloc during debug */ - beq stack_setup + cmp r0, r1 /* don't reloc during debug */ + beq stack_setup
ldr r2, _armboot_start ldr r3, _bss_start diff --git a/cpu/arm_intcm/start.S b/cpu/arm_intcm/start.S index d5778a0..2ee2c86 100755 --- a/cpu/arm_intcm/start.S +++ b/cpu/arm_intcm/start.S @@ -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
diff --git a/include/configs/SMN42.h b/include/configs/SMN42.h index a5d3d69..53d7c7b 100755 --- a/include/configs/SMN42.h +++ b/include/configs/SMN42.h @@ -30,7 +30,7 @@ * 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 */ +#define CONFIG_SKIP_LOWLEVEL_INIT 1
#undef CONFIG_SKIP_LOWLEVEL_INIT #undef CONFIG_SKIP_RELOCATE_UBOOT diff --git a/include/configs/armadillo.h b/include/configs/armadillo.h index 98a83db..ab06ecf 100755 --- a/include/configs/armadillo.h +++ b/include/configs/armadillo.h @@ -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 */ +#define CONFIG_SKIP_LOWLEVEL_INIT 1
/* * High Level Configuration Options diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h index 3b1b4ab..b7bd274 100755 --- a/include/configs/gcplus.h +++ b/include/configs/gcplus.h @@ -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 diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 1452bf2..c877a01 100755 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -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 1 #define CONFIG_CM_INIT 1 #define CONFIG_CM_REMAP 1 #undef CONFIG_CM_SPD_DETECT diff --git a/include/configs/lpc2292sodimm.h b/include/configs/lpc2292sodimm.h index e3fef5e..3ce3c97 100755 --- a/include/configs/lpc2292sodimm.h +++ b/include/configs/lpc2292sodimm.h @@ -30,7 +30,7 @@ * 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 */ +#define CONFIG_SKIP_LOWLEVEL_INIT 1
#undef CONFIG_SKIP_LOWLEVEL_INIT #undef CONFIG_SKIP_RELOCATE_UBOOT