leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: cleanup remaining CONFIG_INIT_CRITICAL

Browse Source 
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2009-05-15 23:45:20 +02:00 committed by Wolfgang Denk
parent c20e28f49a
commit 8fc3bb4b06
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu/arm946es/start.S
View File

@ -133,7 +133,7 @@ reset:
* we do sys-critical inits only at reboot, * we do sys-critical inits only at reboot,
* not when booting from ram! * not when booting from ram!
*/ */
#ifdef CONFIG_INIT_CRITICAL #ifndef CONFIG_SKIP_LOWLEVEL_INIT
bl cpu_init_crit bl cpu_init_crit
#endif #endif
@ -192,6 +192,7 @@ _start_armboot:
*/ */
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
cpu_init_crit: cpu_init_crit:
/* /*
* flush v4 I/D caches * flush v4 I/D caches
@ -217,6 +218,7 @@ cpu_init_crit:
bl lowlevel_init /* go setup memory */ bl lowlevel_init /* go setup memory */
mov lr, ip /* restore link */ mov lr, ip /* restore link */
mov pc, lr /* back to my caller */ mov pc, lr /* back to my caller */
#endif
/* /*
************************************************************************* *************************************************************************
* *

4
cpu/arm_intcm/start.S
View File

@ -131,7 +131,7 @@ reset:
* we do sys-critical inits only at reboot, * we do sys-critical inits only at reboot,
* not when booting from ram! * not when booting from ram!
*/ */
#ifdef CONFIG_INIT_CRITICAL #ifndef CONFIG_SKIP_LOWLEVEL_INIT
bl cpu_init_crit bl cpu_init_crit
#endif #endif
@ -188,11 +188,13 @@ _start_armboot:
************************************************************************* *************************************************************************
*/ */
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
cpu_init_crit: cpu_init_crit:
/* arm_int_generic assumes the ARM boot monitor, or user software, /* arm_int_generic assumes the ARM boot monitor, or user software,
* has initialized the platform * has initialized the platform
*/ */
mov pc, lr /* back to my caller */ mov pc, lr /* back to my caller */
#endif
/* /*
************************************************************************* *************************************************************************
* *

2
include/configs/SMN42.h
View File

@ -30,8 +30,6 @@
* If we are developing, we might want to start u-boot from ram * If we are developing, we might want to start u-boot from ram
* so we MUST NOT initialize critical regs like mem-timing ... * 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_LOWLEVEL_INIT
#undef CONFIG_SKIP_RELOCATE_UBOOT #undef CONFIG_SKIP_RELOCATE_UBOOT

2
include/configs/armadillo.h
View File

@ -34,7 +34,7 @@
* If we are developing, we might want to start armboot from ram * If we are developing, we might want to start armboot from ram
* so we MUST NOT initialize critical regs like mem-timing ... * 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 * High Level Configuration Options

2
include/configs/gcplus.h
View File

@ -36,7 +36,7 @@
* e.g. bootp/tftp download of the kernel is a far more convenient * 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 * 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 * 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 #undef CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_SKIP_RELOCATE_UBOOT 1 #define CONFIG_SKIP_RELOCATE_UBOOT 1

2
include/configs/integratorap.h
View File

@ -44,7 +44,7 @@
#define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_SETUP_MEMORY_TAGS 1
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r during start up */ #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_INIT 1
#define CONFIG_CM_REMAP 1 #define CONFIG_CM_REMAP 1
#undef CONFIG_CM_SPD_DETECT #undef CONFIG_CM_SPD_DETECT

2
include/configs/lpc2292sodimm.h
View File

@ -30,8 +30,6 @@
* If we are developing, we might want to start u-boot from ram * If we are developing, we might want to start u-boot from ram
* so we MUST NOT initialize critical regs like mem-timing ... * 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_LOWLEVEL_INIT
#undef CONFIG_SKIP_RELOCATE_UBOOT #undef CONFIG_SKIP_RELOCATE_UBOOT