For ARM, the CONFIG_SKIP_LOWLEVEL_INIT option implies that the cpu_init_crit and lowlevel_init assembly functions are skipped. We may want to skip only lowlevel_init, so rename the option that skips both to CONFIG_SKIP_CPU_INIT_CRIT. The MIPS option of the same name is not renamed.
Signed-off-by: Michael Spang mspang@csclub.uwaterloo.ca --- Makefile | 2 +- README | 8 +++++++- arch/arm/cpu/arm1136/start.S | 6 +++--- arch/arm/cpu/arm720t/start.S | 2 +- arch/arm/cpu/arm920t/at91/lowlevel_init.S | 4 ++-- arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S | 4 ++-- arch/arm/cpu/arm920t/ks8695/lowlevel_init.S | 4 ++-- arch/arm/cpu/arm920t/start.S | 6 +++--- arch/arm/cpu/arm925t/start.S | 2 +- arch/arm/cpu/arm926ejs/at91/Makefile | 2 +- arch/arm/cpu/arm926ejs/davinci/Makefile | 2 +- arch/arm/cpu/arm926ejs/orion5x/Makefile | 2 +- arch/arm/cpu/arm926ejs/start.S | 6 +++--- arch/arm/cpu/arm946es/start.S | 4 ++-- arch/arm/cpu/arm_intcm/start.S | 4 ++-- arch/arm/cpu/armv7/start.S | 2 +- arch/arm/cpu/lh7a40x/start.S | 2 +- arch/arm/cpu/s3c44b0/start.S | 2 +- arch/arm/cpu/sa1100/start.S | 2 +- board/ns9750dev/lowlevel_init.S | 6 +++--- include/common.h | 2 +- include/configs/SMN42.h | 2 +- include/configs/a320evb.h | 2 +- include/configs/afeb9260.h | 2 +- include/configs/armadillo.h | 2 +- include/configs/aspenite.h | 2 +- include/configs/at91cap9adk.h | 2 +- include/configs/at91rm9200dk.h | 12 ++++++------ include/configs/at91rm9200ek.h | 6 +++--- include/configs/at91sam9260ek.h | 2 +- include/configs/at91sam9261ek.h | 2 +- include/configs/at91sam9263ek.h | 4 ++-- include/configs/at91sam9m10g45ek.h | 2 +- include/configs/at91sam9rlek.h | 2 +- include/configs/cmc_pu2.h | 4 ++-- include/configs/colibri_pxa270.h | 2 +- include/configs/cpuat91.h | 6 +++--- include/configs/csb637.h | 4 ++-- include/configs/da830evm.h | 2 +- include/configs/da850evm.h | 2 +- include/configs/davinci_dm355evm.h | 2 +- include/configs/davinci_dm355leopard.h | 2 +- include/configs/davinci_dm365evm.h | 2 +- include/configs/davinci_dm6467evm.h | 2 +- include/configs/davinci_dvevm.h | 6 +++--- include/configs/davinci_schmoogie.h | 2 +- include/configs/davinci_sffsdr.h | 2 +- include/configs/davinci_sonata.h | 6 +++--- include/configs/dkb.h | 2 +- include/configs/dnp1110.h | 2 +- include/configs/dockstar.h | 2 +- include/configs/ea20.h | 2 +- include/configs/evb4510.h | 2 +- include/configs/gcplus.h | 4 ++-- include/configs/guruplug.h | 2 +- include/configs/hawkboard.h | 2 +- include/configs/integratorap.h | 2 +- include/configs/integratorcp.h | 6 +++--- include/configs/kb9202.h | 2 +- include/configs/km_arm.h | 2 +- include/configs/lpc2292sodimm.h | 2 +- include/configs/meesc.h | 2 +- include/configs/mp2usb.h | 4 ++-- include/configs/mv88f6281gtw_ge.h | 2 +- include/configs/mx31pdk.h | 2 +- include/configs/nhk8815.h | 2 +- include/configs/openrd_base.h | 2 +- include/configs/otc570.h | 2 +- include/configs/pm9261.h | 2 +- include/configs/pm9263.h | 2 +- include/configs/pm9g45.h | 2 +- include/configs/pxa255_idp.h | 2 +- include/configs/rd6281a.h | 2 +- include/configs/sbc2410x.h | 2 +- include/configs/sbc35_a9g20.h | 2 +- include/configs/shannon.h | 2 +- include/configs/sheevaplug.h | 2 +- include/configs/tegra2-common.h | 2 +- include/configs/tny_a9260.h | 2 +- include/configs/top9000.h | 2 +- include/configs/tx25.h | 2 +- include/configs/zipitz2.h | 2 +- 82 files changed, 121 insertions(+), 115 deletions(-)
diff --git a/Makefile b/Makefile index dc2e3d8..d805750 100644 --- a/Makefile +++ b/Makefile @@ -1071,7 +1071,7 @@ mx31pdk_nand_config : unconfig @if [ -n "$(findstring _nand_,$@)" ]; then \ echo "#define CONFIG_NAND_U_BOOT" >> $(obj)include/config.h; \ else \ - echo "#define CONFIG_SKIP_LOWLEVEL_INIT" >> $(obj)include/config.h; \ + echo "#define CONFIG_SKIP_CPU_INIT_CRIT" >> $(obj)include/config.h; \ fi @$(MKCONFIG) -n $@ -a mx31pdk arm arm1136 mx31pdk freescale mx31
diff --git a/README b/README index 21cd71b..f9b0c91 100644 --- a/README +++ b/README @@ -2892,7 +2892,7 @@ Low Level (hardware related) configuration options: globally (CONFIG_CMD_MEM).
- CONFIG_SKIP_LOWLEVEL_INIT - [ARM only] If this variable is defined, then certain + If this variable is defined, then certain low level initializations (like setting up the memory controller) are omitted and/or U-Boot does not relocate itself into RAM. @@ -2902,6 +2902,12 @@ Low Level (hardware related) configuration options: other boot loader or by a debugger which performs these initializations itself.
+- CONFIG_SKIP_CPU_INIT_CRIT + [ARM only] If this variable is defined, then the CPU + is assumed to be initialized when U-Boot starts. For + most CPUs this also implies low level initialization + is skipped (see CONFIG_SKIP_LOWLEVEL_INIT). + - CONFIG_PRELOADER Modifies the behaviour of start.S when compiling a loader that is executed before the actual U-Boot. E.g. when diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S index 3c5f3ef..5563f14 100644 --- a/arch/arm/cpu/arm1136/start.S +++ b/arch/arm/cpu/arm1136/start.S @@ -157,7 +157,7 @@ next: bl cpy_clk_code /* put dpll adjust code behind vectors */ #endif /* the mask ROM code should have PLL and others stable */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT bl cpu_init_crit #endif
@@ -300,7 +300,7 @@ _dynsym_start_ofs: * ************************************************************************* */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT cpu_init_crit: /* * flush v4 I/D caches @@ -327,7 +327,7 @@ cpu_init_crit: bl lowlevel_init /* go setup pll,mux,memory */ mov lr, ip /* restore link */ mov pc, lr /* back to my caller */ -#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ +#endif /* CONFIG_SKIP_CPU_INIT_CRIT */
#ifndef CONFIG_PRELOADER /* diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S index e774c3f..36e2b40 100644 --- a/arch/arm/cpu/arm720t/start.S +++ b/arch/arm/cpu/arm720t/start.S @@ -131,7 +131,7 @@ reset: * we do sys-critical inits only at reboot, * not when booting from ram! */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT bl cpu_init_crit #endif
diff --git a/arch/arm/cpu/arm920t/at91/lowlevel_init.S b/arch/arm/cpu/arm920t/at91/lowlevel_init.S index eaea9d2..4ea2649 100644 --- a/arch/arm/cpu/arm920t/at91/lowlevel_init.S +++ b/arch/arm/cpu/arm920t/at91/lowlevel_init.S @@ -27,7 +27,7 @@
#include <config.h>
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT
#include <asm/arch/hardware.h> #include <asm/arch/at91_mc.h> @@ -161,4 +161,4 @@ SMRDATA1: .word CONFIG_SYS_SDRAM .word CONFIG_SYS_SDRAM_VAL /* SMRDATA1 is 176 bytes long */ -#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ +#endif /* CONFIG_SKIP_CPU_INIT_CRIT */ diff --git a/arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S b/arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S index 2e7160f..a7b8c32 100644 --- a/arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S +++ b/arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S @@ -30,7 +30,7 @@ #include <config.h> #include <version.h>
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT /* * some parameters for the board * @@ -166,4 +166,4 @@ SMRDATA1: .word CONFIG_SYS_SDRAM .word CONFIG_SYS_SDRAM_VAL /* SMRDATA1 is 176 bytes long */ -#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ +#endif /* CONFIG_SKIP_CPU_INIT_CRIT */ diff --git a/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S b/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S index e9f1227..f736ca5 100644 --- a/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S +++ b/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S @@ -26,7 +26,7 @@ #include <version.h> #include <asm/arch/platform.h>
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT
/* ************************************************************************* @@ -202,4 +202,4 @@ nobutton: add ip, ip, #0x02000000 /* this is a hack */ mov pc, lr /* all done, return */
-#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ +#endif /* CONFIG_SKIP_CPU_INIT_CRIT */ diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S index a7476b0..d945ff5 100644 --- a/arch/arm/cpu/arm920t/start.S +++ b/arch/arm/cpu/arm920t/start.S @@ -178,7 +178,7 @@ copyex: * we do sys-critical inits only at reboot, * not when booting from ram! */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT bl cpu_init_crit #endif
@@ -324,7 +324,7 @@ _dynsym_start_ofs: */
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT cpu_init_crit: /* * flush v4 I/D caches @@ -354,7 +354,7 @@ cpu_init_crit:
mov lr, ip mov pc, lr -#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ +#endif /* CONFIG_SKIP_CPU_INIT_CRIT */
/* ************************************************************************* diff --git a/arch/arm/cpu/arm925t/start.S b/arch/arm/cpu/arm925t/start.S index 39f2e99..ad2def2 100644 --- a/arch/arm/cpu/arm925t/start.S +++ b/arch/arm/cpu/arm925t/start.S @@ -172,7 +172,7 @@ poll1: * we do sys-critical inits only at reboot, * not when booting from ram! */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT bl cpu_init_crit #endif
diff --git a/arch/arm/cpu/arm926ejs/at91/Makefile b/arch/arm/cpu/arm926ejs/at91/Makefile index be9f6dd..7fb1a0a 100644 --- a/arch/arm/cpu/arm926ejs/at91/Makefile +++ b/arch/arm/cpu/arm926ejs/at91/Makefile @@ -41,7 +41,7 @@ COBJS-y += cpu.o COBJS-y += reset.o COBJS-y += timer.o
-ifndef CONFIG_SKIP_LOWLEVEL_INIT +ifndef CONFIG_SKIP_CPU_INIT_CRIT SOBJS-y := lowlevel_init.o endif
diff --git a/arch/arm/cpu/arm926ejs/davinci/Makefile b/arch/arm/cpu/arm926ejs/davinci/Makefile index 3183e6a..3442f6e 100644 --- a/arch/arm/cpu/arm926ejs/davinci/Makefile +++ b/arch/arm/cpu/arm926ejs/davinci/Makefile @@ -36,7 +36,7 @@ COBJS-$(CONFIG_DRIVER_TI_EMAC) += lxt972.o dp83848.o et1011c.o
SOBJS = reset.o
-ifndef CONFIG_SKIP_LOWLEVEL_INIT +ifndef CONFIG_SKIP_CPU_INIT_CRIT SOBJS += lowlevel_init.o endif
diff --git a/arch/arm/cpu/arm926ejs/orion5x/Makefile b/arch/arm/cpu/arm926ejs/orion5x/Makefile index e5a9994..780fe18 100644 --- a/arch/arm/cpu/arm926ejs/orion5x/Makefile +++ b/arch/arm/cpu/arm926ejs/orion5x/Makefile @@ -33,7 +33,7 @@ COBJS-y = cpu.o COBJS-y += dram.o COBJS-y += timer.o
-ifndef CONFIG_SKIP_LOWLEVEL_INIT +ifndef CONFIG_SKIP_CPU_INIT_CRIT SOBJS := lowlevel_init.o endif
diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S index fefcfa2..c0a2532 100644 --- a/arch/arm/cpu/arm926ejs/start.S +++ b/arch/arm/cpu/arm926ejs/start.S @@ -171,7 +171,7 @@ reset: * we do sys-critical inits only at reboot, * not when booting from ram! */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT bl cpu_init_crit #endif
@@ -315,7 +315,7 @@ _dynsym_start_ofs: * ************************************************************************* */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT cpu_init_crit: /* * flush v4 I/D caches @@ -341,7 +341,7 @@ cpu_init_crit: bl lowlevel_init /* go setup pll,mux,memory */ mov lr, ip /* restore link */ mov pc, lr /* back to my caller */ -#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ +#endif /* CONFIG_SKIP_CPU_INIT_CRIT */
#ifndef CONFIG_PRELOADER /* diff --git a/arch/arm/cpu/arm946es/start.S b/arch/arm/cpu/arm946es/start.S index 00914f4..9ab4122 100644 --- a/arch/arm/cpu/arm946es/start.S +++ b/arch/arm/cpu/arm946es/start.S @@ -143,7 +143,7 @@ reset: * we do sys-critical inits only at reboot, * not when booting from ram! */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT bl cpu_init_crit #endif
@@ -284,7 +284,7 @@ _dynsym_start_ofs: */
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT cpu_init_crit: /* * flush v4 I/D caches diff --git a/arch/arm/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S index 2fd3b9a..36073b2 100644 --- a/arch/arm/cpu/arm_intcm/start.S +++ b/arch/arm/cpu/arm_intcm/start.S @@ -139,7 +139,7 @@ reset: * we do sys-critical inits only at reboot, * not when booting from ram! */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT bl cpu_init_crit #endif
@@ -284,7 +284,7 @@ _dynsym_start_ofs: ************************************************************************* */
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT cpu_init_crit: /* arm_int_generic assumes the ARM boot monitor, or user software, * has initialized the platform diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index d83d501..342f08e 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -139,7 +139,7 @@ next: #endif /* NAND Boot */ #endif /* the mask ROM code should have PLL and others stable */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT bl cpu_init_crit #endif
diff --git a/arch/arm/cpu/lh7a40x/start.S b/arch/arm/cpu/lh7a40x/start.S index 81242b1..63bee1a 100644 --- a/arch/arm/cpu/lh7a40x/start.S +++ b/arch/arm/cpu/lh7a40x/start.S @@ -152,7 +152,7 @@ reset: * we do sys-critical inits only at reboot, * not when booting from ram! */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT bl cpu_init_crit #endif
diff --git a/arch/arm/cpu/s3c44b0/start.S b/arch/arm/cpu/s3c44b0/start.S index 10f5284..2ec1ae8 100644 --- a/arch/arm/cpu/s3c44b0/start.S +++ b/arch/arm/cpu/s3c44b0/start.S @@ -118,7 +118,7 @@ reset: * we do sys-critical inits only at reboot, * not when booting from ram! */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT bl cpu_init_crit /* * before relocating, we have to setup RAM timing diff --git a/arch/arm/cpu/sa1100/start.S b/arch/arm/cpu/sa1100/start.S index b27e970..be103d1 100644 --- a/arch/arm/cpu/sa1100/start.S +++ b/arch/arm/cpu/sa1100/start.S @@ -128,7 +128,7 @@ reset: * we do sys-critical inits only at reboot, * not when booting from ram! */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT bl cpu_init_crit #endif
diff --git a/board/ns9750dev/lowlevel_init.S b/board/ns9750dev/lowlevel_init.S index ba5ff81..407e413 100644 --- a/board/ns9750dev/lowlevel_init.S +++ b/board/ns9750dev/lowlevel_init.S @@ -34,7 +34,7 @@ #include <version.h>
#if defined(CONFIG_NS9750DEV) -# ifndef CONFIG_SKIP_LOWLEVEL_INIT +# ifndef CONFIG_SKIP_CPU_INIT_CRIT # include <./ns9750_sys.h> # include <./ns9750_mem.h> # endif @@ -74,7 +74,7 @@ _PHYS_FLASH: _CAS_LATENCY: .word 0x00022000 @ for CAS2 latency
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT .globl lowlevel_init lowlevel_init:
@@ -295,4 +295,4 @@ _AHB_MONITOR_START: NS9750_SYS_AHB_MON_BATC_GEN_IRQ) _AHB_MONITOR_END:
-#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ +#endif /* CONFIG_SKIP_CPU_INIT_CRIT */ diff --git a/include/common.h b/include/common.h index d8c912d..4d1f783 100644 --- a/include/common.h +++ b/include/common.h @@ -737,7 +737,7 @@ int cpu_release(int nr, int argc, char * const argv[]);
#ifdef CONFIG_INIT_CRITICAL #error CONFIG_INIT_CRITICAL is deprecated! -#error Read section CONFIG_SKIP_LOWLEVEL_INIT in README. +#error Read section CONFIG_SKIP_CPU_INIT_CRIT in README. #endif
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) diff --git a/include/configs/SMN42.h b/include/configs/SMN42.h index 4a8acab..30cfef3 100644 --- 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_SKIP_LOWLEVEL_INIT +#undef CONFIG_SKIP_CPU_INIT_CRIT
/* * High Level Configuration Options diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h index 27f137f..a0bfdb4 100644 --- a/include/configs/a320evb.h +++ b/include/configs/a320evb.h @@ -29,7 +29,7 @@ */ #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
-#undef CONFIG_SKIP_LOWLEVEL_INIT +#undef CONFIG_SKIP_CPU_INIT_CRIT
/*----------------------------------------------------------------------- * Timer diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h index 36a2a46..e2151b9 100644 --- a/include/configs/afeb9260.h +++ b/include/configs/afeb9260.h @@ -41,7 +41,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1
-#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT
/* * Hardware drivers diff --git a/include/configs/armadillo.h b/include/configs/armadillo.h index d0d0998..a20928e 100644 --- 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 ... */ -#undef CONFIG_SKIP_LOWLEVEL_INIT +#undef CONFIG_SKIP_CPU_INIT_CRIT
/* * High Level Configuration Options diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h index fd35f3e..9c1f484 100644 --- a/include/configs/aspenite.h +++ b/include/configs/aspenite.h @@ -38,7 +38,7 @@ #define CONFIG_ARMADA100 1 /* SOC Family Name */ #define CONFIG_ARMADA168 1 /* SOC Used on this Board */ #define CONFIG_MACH_ASPENITE /* Machine type */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* disable board lowlevel_init */
/* * There is no internal RAM in ARMADA100, using DRAM diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index 49c923f..19867ad 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -43,7 +43,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1
-#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT
/* * Hardware drivers diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h index 15de310..163019e 100644 --- a/include/configs/at91rm9200dk.h +++ b/include/configs/at91rm9200dk.h @@ -44,7 +44,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_SYS_USE_MAIN_OSCILLATOR 1 /* flash */ #define CONFIG_SYS_EBI_CFGR_VAL 0x00000000 @@ -69,7 +69,7 @@ #define CONFIG_SYS_SDRC_MR_VAL2 0x00000003 /* Load Mode Register */ #define CONFIG_SYS_SDRC_MR_VAL3 0x00000000 /* Normal Mode */ #define CONFIG_SYS_SDRC_TR_VAL 0x000002E0 /* Write refresh rate */ -#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ +#endif /* CONFIG_SKIP_CPU_INIT_CRIT */ /* * Size of malloc() pool */ @@ -160,19 +160,19 @@ #define CONFIG_ENV_SIZE 0x2000 /* 0x8000 */ #else #define CONFIG_ENV_IS_IN_FLASH 1 -#ifdef CONFIG_SKIP_LOWLEVEL_INIT +#ifdef CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0xe000) /* between boot.bin and u-boot.bin.gz */ #define CONFIG_ENV_SIZE 0x2000 /* 0x8000 */ #else #define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x60000) /* after u-boot.bin */ #define CONFIG_ENV_SIZE 0x10000 /* sectors are 64K here */ -#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ +#endif /* CONFIG_SKIP_CPU_INIT_CRIT */ #endif /* CONFIG_ENV_IS_IN_DATAFLASH */
#define CONFIG_SYS_LOAD_ADDR 0x21000000 /* default load address */
-#ifdef CONFIG_SKIP_LOWLEVEL_INIT +#ifdef CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_SYS_BOOT_SIZE 0x6000 /* 24 KBytes */ #define CONFIG_SYS_U_BOOT_BASE (PHYS_FLASH_1 + 0x10000) #define CONFIG_SYS_U_BOOT_SIZE 0x10000 /* 64 KBytes */ @@ -180,7 +180,7 @@ #define CONFIG_SYS_BOOT_SIZE 0x00 /* 0 KBytes */ #define CONFIG_SYS_U_BOOT_BASE PHYS_FLASH_1 #define CONFIG_SYS_U_BOOT_SIZE 0x60000 /* 384 KBytes */ -#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ +#endif /* CONFIG_SKIP_CPU_INIT_CRIT */
#define CONFIG_SYS_BAUDRATE_TABLE { 115200, 19200, 38400, 57600, 9600 }
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 810023a..48ed135 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -40,7 +40,7 @@ * initialisation was done by some preloader */ #ifdef CONFIG_RAMBOOT -#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_SYS_TEXT_BASE 0x20100000 #else #define CONFIG_SYS_TEXT_BASE 0x10000000 @@ -87,7 +87,7 @@ /* * LowLevel Init */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_SYS_USE_MAIN_OSCILLATOR /* flash */ #define CONFIG_SYS_EBI_CFGR_VAL 0x00000000 @@ -113,7 +113,7 @@ #define CONFIG_SYS_SDRC_MR_VAL2 0x00000003 /* Load Mode Register */ #define CONFIG_SYS_SDRC_MR_VAL3 0x00000000 /* Normal Mode */ #define CONFIG_SYS_SDRC_TR_VAL 0x000002E0 /* Write refresh rate */ -#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ +#endif /* CONFIG_SKIP_CPU_INIT_CRIT */
/* * Hardware drivers diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 5e7dee5..fdf758f 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -48,7 +48,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1
-#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT
/* * Hardware drivers diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 401478b..99ff86e 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -46,7 +46,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1
-#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT
/* * Hardware drivers diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index f6cb406..ff3914f 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -42,7 +42,7 @@ #define CONFIG_INITRD_TAG 1
#ifndef CONFIG_SYS_USE_BOOT_NORFLASH -#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT #endif
/* @@ -144,7 +144,7 @@ "cp.b ${load_addr} ${monitor_base} ${filesize};" \ "protect on ${monitor_base} +${filesize}\0"
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT #define MASTER_PLL_MUL 171 #define MASTER_PLL_DIV 14 #define MASTER_PLL_OUT 3 diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index de74dcf..7082cff 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -46,7 +46,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1
-#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT
/* * Hardware drivers diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 8dbd082..725843b 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -43,7 +43,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1
-#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT
/* * Hardware drivers diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h index a197635..a5d5487 100644 --- a/include/configs/cmc_pu2.h +++ b/include/configs/cmc_pu2.h @@ -43,7 +43,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_SYS_USE_MAIN_OSCILLATOR 1 /* flash */ #define CONFIG_SYS_EBI_CFGR_VAL 0x00000000 @@ -68,7 +68,7 @@ #define CONFIG_SYS_SDRC_MR_VAL2 0x00000003 /* Load Mode Register */ #define CONFIG_SYS_SDRC_MR_VAL3 0x00000000 /* Normal Mode */ #define CONFIG_SYS_SDRC_TR_VAL 0x000002E0 /* Write refresh rate */ -#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ +#endif /* CONFIG_SKIP_CPU_INIT_CRIT */
/* * Size of malloc() pool diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 23bfbeb..1bea34b 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -30,7 +30,7 @@
#undef BOARD_LATE_INIT #undef CONFIG_USE_IRQ -#undef CONFIG_SKIP_LOWLEVEL_INIT +#undef CONFIG_SKIP_CPU_INIT_CRIT
/* * Environment settings diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h index f31081d..cfc66e9 100644 --- a/include/configs/cpuat91.h +++ b/include/configs/cpuat91.h @@ -27,7 +27,7 @@ #define _CONFIG_CPUAT91_H
#ifdef CONFIG_CPUAT91_RAM -#define CONFIG_SKIP_LOWLEVEL_INIT 1 +#define CONFIG_SKIP_CPU_INIT_CRIT 1 #else #define CONFIG_BOOTDELAY 1 #endif @@ -48,7 +48,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_SYS_USE_MAIN_OSCILLATOR 1 /* flash */ #define CONFIG_SYS_MC_PUIA_VAL 0x00000000 @@ -78,7 +78,7 @@ #define CONFIG_SYS_SDRC_MR_VAL2 0x00000003 /* Load Mode Register */ #define CONFIG_SYS_SDRC_MR_VAL3 0x00000000 /* Normal Mode */ #define CONFIG_SYS_SDRC_TR_VAL 0x000002E0 /* Write refresh rate */ -#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ +#endif /* CONFIG_SKIP_CPU_INIT_CRIT */
/* define one of these to choose the DBGU, USART0 or USART1 as console */ #define CONFIG_AT91RM9200_USART 1 diff --git a/include/configs/csb637.h b/include/configs/csb637.h index 7a85d65..057d1d8 100644 --- a/include/configs/csb637.h +++ b/include/configs/csb637.h @@ -44,7 +44,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_SYS_USE_MAIN_OSCILLATOR 1 /* flash */ #define CONFIG_SYS_EBI_CFGR_VAL 0x00000000 @@ -69,7 +69,7 @@ #define CONFIG_SYS_SDRC_MR_VAL2 0x00000003 /* Load Mode Register */ #define CONFIG_SYS_SDRC_MR_VAL3 0x00000000 /* Normal Mode */ #define CONFIG_SYS_SDRC_TR_VAL 0x000002E0 /* Write refresh rate */ -#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ +#endif /* CONFIG_SKIP_CPU_INIT_CRIT */ /* * Size of malloc() pool */ diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h index bcf8ee0..b23a534 100644 --- a/include/configs/da830evm.h +++ b/include/configs/da830evm.h @@ -40,7 +40,7 @@ #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE #define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) #define CONFIG_SYS_HZ 1000 -#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_SYS_TEXT_BASE 0xc1080000
/* diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index bbb5a9b..65b6e28 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -40,7 +40,7 @@ #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE #define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) #define CONFIG_SYS_HZ 1000 -#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_SYS_TEXT_BASE 0xc1080000
/* diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h index 56d0ac9..a00385d 100644 --- a/include/configs/davinci_dm355evm.h +++ b/include/configs/davinci_dm355evm.h @@ -23,7 +23,7 @@ /* Spectrum Digital TMS320DM355 EVM board */ #define DAVINCI_DM355EVM
-#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 3rd stage loader */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* U-Boot is a 3rd stage loader */ #define CONFIG_SYS_NO_FLASH /* that is, no *NOR* flash */ #define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_DISPLAY_CPUINFO diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h index b44b2ea..e00723f 100644 --- a/include/configs/davinci_dm355leopard.h +++ b/include/configs/davinci_dm355leopard.h @@ -22,7 +22,7 @@
#define DAVINCI_DM355LEOPARD
-#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 3rd stage loader */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* U-Boot is a 3rd stage loader */ #define CONFIG_SYS_NO_FLASH /* that is, no *NOR* flash */ #define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_DISPLAY_CPUINFO diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h index 2825050..c810c9e 100644 --- a/include/configs/davinci_dm365evm.h +++ b/include/configs/davinci_dm365evm.h @@ -23,7 +23,7 @@ /* Spectrum Digital TMS320DM365 EVM board */ #define DAVINCI_DM365EVM
-#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 3rd stage loader */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* U-Boot is a 3rd stage loader */ #define CONFIG_SYS_NO_FLASH /* that is, no *NOR* flash */ #define CONFIG_SYS_CONSOLE_INFO_QUIET
diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h index a0a30f5..ab3f883 100644 --- a/include/configs/davinci_dm6467evm.h +++ b/include/configs/davinci_dm6467evm.h @@ -26,7 +26,7 @@ #define CONFIG_SYS_USE_NAND #define CONFIG_SYS_NAND_SMALLPAGE
-#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT
/* SoC Configuration */ #define CONFIG_ARM926EJS /* arm926ejs CPU */ diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h index 45214fa..7e75320 100644 --- a/include/configs/davinci_dvevm.h +++ b/include/configs/davinci_dvevm.h @@ -133,7 +133,7 @@ #define CONFIG_ENV_SECT_SIZE 2048 /* Env sector Size */ #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ #endif -#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* U-Boot is loaded by a bootloader */ #define CONFIG_SYS_NAND_BASE 0x02000000 #define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_HW_ECC @@ -141,9 +141,9 @@ #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #elif defined(CONFIG_SYS_USE_NOR) #ifdef CONFIG_NOR_UART_BOOT -#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* U-Boot is loaded by a bootloader */ #else -#undef CONFIG_SKIP_LOWLEVEL_INIT +#undef CONFIG_SKIP_CPU_INIT_CRIT #endif #define CONFIG_ENV_IS_IN_FLASH #undef CONFIG_SYS_NO_FLASH diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h index 5cc8bc0..7fc4453 100644 --- a/include/configs/davinci_schmoogie.h +++ b/include/configs/davinci_schmoogie.h @@ -87,7 +87,7 @@ #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ #define CONFIG_ENV_SECT_SIZE 2048 /* Env sector Size */ #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* U-Boot is loaded by a bootloader */ #define CONFIG_SYS_NAND_BASE 0x02000000 #define CONFIG_SYS_NAND_HW_ECC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h index 307b9f2..e82cddf 100644 --- a/include/configs/davinci_sffsdr.h +++ b/include/configs/davinci_sffsdr.h @@ -82,7 +82,7 @@ #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ #define CONFIG_ENV_SECT_SIZE 2048 /* Env sector Size */ #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* U-Boot is loaded by a bootloader */ #define CONFIG_SYS_NAND_BASE 0x02000000 #define CONFIG_SYS_NAND_HW_ECC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h index 2336129..2195d88 100644 --- a/include/configs/davinci_sonata.h +++ b/include/configs/davinci_sonata.h @@ -121,16 +121,16 @@ #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ #define CONFIG_ENV_SECT_SIZE 512 /* Env sector Size */ #define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* U-Boot is loaded by a bootloader */ #define CONFIG_SYS_NAND_BASE 0x02000000 #define CONFIG_SYS_NAND_HW_ECC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #elif defined(CONFIG_SYS_USE_NOR) #ifdef CONFIG_NOR_UART_BOOT -#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* U-Boot is loaded by a bootloader */ #else -#undef CONFIG_SKIP_LOWLEVEL_INIT +#undef CONFIG_SKIP_CPU_INIT_CRIT #endif #define CONFIG_ENV_IS_IN_FLASH #undef CONFIG_SYS_NO_FLASH diff --git a/include/configs/dkb.h b/include/configs/dkb.h index 638af5e..82b81be 100644 --- a/include/configs/dkb.h +++ b/include/configs/dkb.h @@ -36,7 +36,7 @@ #define CONFIG_SHEEVA_88SV331xV5 1 /* CPU Core subversion */ #define CONFIG_PANTHEON 1 /* SOC Family Name */ #define CONFIG_MACH_TTC_DKB 1 /* Machine type */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* disable board lowlevel_init */
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE - 0x00200000) #define CONFIG_NR_DRAM_BANKS_MAX 2 diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h index 69c6420..a657d4a 100644 --- a/include/configs/dnp1110.h +++ b/include/configs/dnp1110.h @@ -31,7 +31,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_SKIP_LOWLEVEL_INIT 1 +#define CONFIG_SKIP_CPU_INIT_CRIT 1
/* * High Level Configuration Options diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 249f93b..54b00d2 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -40,7 +40,7 @@ #define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_DOCKSTAR /* Machine type */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* disable board lowlevel_init */
/* * Commands configuration diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 48ce945..d9cdf55 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -41,7 +41,7 @@ #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE #define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) #define CONFIG_SYS_HZ 1000 -#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_SYS_TEXT_BASE 0xc1080000
/* diff --git a/include/configs/evb4510.h b/include/configs/evb4510.h index fb05727..9d0f27e 100644 --- a/include/configs/evb4510.h +++ b/include/configs/evb4510.h @@ -32,7 +32,7 @@ * * Also swap the flash1 and flash2 addresses during debug. * - * #define CONFIG_SKIP_LOWLEVEL_INIT + * #define CONFIG_SKIP_CPU_INIT_CRIT */
/* diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h index fd39ab4..66be194 100644 --- a/include/configs/gcplus.h +++ b/include/configs/gcplus.h @@ -36,9 +36,9 @@ * 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_SKIP_LOWLEVEL_INIT) to remedy that problem. + * we use lowlevel_init (!CONFIG_SKIP_CPU_INIT_CRIT) to remedy that problem. */ -#undef CONFIG_SKIP_LOWLEVEL_INIT +#undef CONFIG_SKIP_CPU_INIT_CRIT
/* * High Level Configuration Options diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index f449da9..4c81907 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -37,7 +37,7 @@ #define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_GURUPLUG /* Machine type */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* disable board lowlevel_init */
/* * Commands configuration diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h index 23a88d0..12c6e4d 100644 --- a/include/configs/hawkboard.h +++ b/include/configs/hawkboard.h @@ -39,7 +39,7 @@ #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE #define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) #define CONFIG_SYS_HZ 1000 -#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_BOARD_EARLY_INIT_F
#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_UART_U_BOOT) diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 32ff193..d06ef7c 100644 --- 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 */
-#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_CM_INIT 1 #define CONFIG_CM_REMAP 1 #undef CONFIG_CM_SPD_DETECT diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index 2c8ca2d..10c48e1 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -206,12 +206,12 @@ SIB at Block62 End Block62 address 0x24f80000 /* * The ARM boot monitor initializes the board. * However, the default U-Boot code also performs the initialization. - * If desired, this can be prevented by defining SKIP_LOWLEVEL_INIT + * If desired, this can be prevented by defining SKIP_CPU_INIT_CRIT * - see documentation supplied with board for details of how to choose the * image to run at reset/power up * e.g. whether the ARM Boot Monitor runs before U-Boot
-#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT
*/
@@ -235,7 +235,7 @@ SIB at Block62 End Block62 address 0x24f80000 #include "armcoremodule.h"
/* - * If CONFIG_SKIP_LOWLEVEL_INIT is not defined & + * If CONFIG_SKIP_CPU_INIT_CRIT is not defined & * the core module has a CM_INIT register * then the U-Boot initialisation code will * e.g. ARM Boot Monitor or pre-loader is repeated once diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h index cfb7cea..5cd71f7 100644 --- a/include/configs/kb9202.h +++ b/include/configs/kb9202.h @@ -52,7 +52,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1
-#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT
#define CONFIG_SYS_LONGHELP
diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h index bf77cc0..5606a1e 100644 --- a/include/configs/km_arm.h +++ b/include/configs/km_arm.h @@ -46,7 +46,7 @@ #undef CONFIG_BOOTCOUNT_LIMIT
#define CONFIG_MD5 /* get_random_hex on krikwood needs MD5 support */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* disable board lowlevel_init */ #define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */ #undef CONFIG_KIRKWOOD_PCIE_INIT /* Disable PCIE Port0 for kernel */ #define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */ diff --git a/include/configs/lpc2292sodimm.h b/include/configs/lpc2292sodimm.h index 17972d7..1fa890c 100644 --- 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_SKIP_LOWLEVEL_INIT +#undef CONFIG_SKIP_CPU_INIT_CRIT
/* * High Level Configuration Options diff --git a/include/configs/meesc.h b/include/configs/meesc.h index a27b36b..742eb04 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -47,7 +47,7 @@ #define CONFIG_REVISION_TAG 1 #undef CONFIG_USE_IRQ /* don't need IRQ/FIQ stuff */
-#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_MISC_INIT_R /* Call misc_init_r */
#define CONFIG_ARCH_CPU_INIT diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h index 8e398d7..f411278 100644 --- a/include/configs/mp2usb.h +++ b/include/configs/mp2usb.h @@ -48,7 +48,7 @@ #define CONFIG_INITRD_TAG 1
#define CONFIG_SYS_ATMEL_PLL_INIT_BUG 1 -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifndef CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_SYS_USE_MAIN_OSCILLATOR 1 /* flash */ #define CONFIG_SYS_EBI_CFGR_VAL 0x00000000 @@ -73,7 +73,7 @@ #define CONFIG_SYS_SDRC_MR_VAL2 0x00000003 /* Load Mode Register */ #define CONFIG_SYS_SDRC_MR_VAL3 0x00000000 /* Normal Mode */ #define CONFIG_SYS_SDRC_TR_VAL 0x000002E0 /* Write refresh rate */ -#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ +#endif /* CONFIG_SKIP_CPU_INIT_CRIT */
/* * Size of malloc() pool diff --git a/include/configs/mv88f6281gtw_ge.h b/include/configs/mv88f6281gtw_ge.h index d323829..07a4f78 100644 --- a/include/configs/mv88f6281gtw_ge.h +++ b/include/configs/mv88f6281gtw_ge.h @@ -37,7 +37,7 @@ #define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_MV88F6281GTW_GE /* Machine type */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* disable board lowlevel_init */
/* * Commands configuration diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 86c758f..f58f79e 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -46,7 +46,7 @@ #define CONFIG_INITRD_TAG 1
#if defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) -#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT #endif
/* diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h index 49a16ab..34eb189 100644 --- a/include/configs/nhk8815.h +++ b/include/configs/nhk8815.h @@ -33,7 +33,7 @@ #define CONFIG_NOMADIK_8815 /* cpu variant */ #define CONFIG_NOMADIK_NHK8815 /* board variant */
-#define CONFIG_SKIP_LOWLEVEL_INIT /* we have already been loaded to RAM */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* we have already been loaded to RAM */
/* commands */ #include <config_cmd_default.h> diff --git a/include/configs/openrd_base.h b/include/configs/openrd_base.h index cfdd09c..aa9d742 100644 --- a/include/configs/openrd_base.h +++ b/include/configs/openrd_base.h @@ -42,7 +42,7 @@ #define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_OPENRD_BASE /* Machine type */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* disable board lowlevel_init */
/* * Commands configuration diff --git a/include/configs/otc570.h b/include/configs/otc570.h index ca3bf26..157d5e7 100644 --- a/include/configs/otc570.h +++ b/include/configs/otc570.h @@ -47,7 +47,7 @@ #define CONFIG_REVISION_TAG 1 #undef CONFIG_USE_IRQ /* don't need IRQ/FIQ stuff */
-#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */
#define CONFIG_ARCH_CPU_INIT diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 26e5049..bcadb84 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -153,7 +153,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1
-#undef CONFIG_SKIP_LOWLEVEL_INIT +#undef CONFIG_SKIP_CPU_INIT_CRIT
/* * Hardware drivers diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 96e12f2..7b48316 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -162,7 +162,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1
-#undef CONFIG_SKIP_LOWLEVEL_INIT +#undef CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_USER_LOWLEVEL_INIT 1
/* diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index ec51ccf..52d4914 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -48,7 +48,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1
-#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT
/* * Hardware drivers diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h index c1c7f80..d5183a5 100644 --- a/include/configs/pxa255_idp.h +++ b/include/configs/pxa255_idp.h @@ -41,7 +41,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_SKIP_LOWLEVEL_INIT /* define for developing */ +#undef CONFIG_SKIP_CPU_INIT_CRIT /* define for developing */ #define CONFIG_SYS_TEXT_BASE 0x0
/* diff --git a/include/configs/rd6281a.h b/include/configs/rd6281a.h index 60f9579..b4a6b03 100644 --- a/include/configs/rd6281a.h +++ b/include/configs/rd6281a.h @@ -37,7 +37,7 @@ #define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_RD6281A /* Machine type */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* disable board lowlevel_init */
/* * Commands configuration diff --git a/include/configs/sbc2410x.h b/include/configs/sbc2410x.h index f0f19b2..110f4ac 100644 --- a/include/configs/sbc2410x.h +++ b/include/configs/sbc2410x.h @@ -37,7 +37,7 @@ * If we are developing, we might want to start armboot from ram * so we MUST NOT initialize critical regs like mem-timing ... */ -#undef CONFIG_SKIP_LOWLEVEL_INIT /* undef for developing */ +#undef CONFIG_SKIP_CPU_INIT_CRIT /* undef for developing */
/* * High Level Configuration Options diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h index 00f4dc9..85c9551 100644 --- a/include/configs/sbc35_a9g20.h +++ b/include/configs/sbc35_a9g20.h @@ -53,7 +53,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1
-#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT
/* * Hardware drivers diff --git a/include/configs/shannon.h b/include/configs/shannon.h index c0e6643..4a937df 100644 --- a/include/configs/shannon.h +++ b/include/configs/shannon.h @@ -33,7 +33,7 @@ * But U-Boot still relocates itself into RAM */ #define CONFIG_INFERNO /* we are using the inferno bootldr */ -#define CONFIG_SKIP_LOWLEVEL_INIT 1 +#define CONFIG_SKIP_CPU_INIT_CRIT 1
/* * High Level Configuration Options diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 83dd8ff..19ff9bd 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -37,7 +37,7 @@ #define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_SHEEVAPLUG /* Machine type */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_SKIP_CPU_INIT_CRIT /* disable board lowlevel_init */
/* * Commands configuration diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h index 4f4374a..203330d 100644 --- a/include/configs/tegra2-common.h +++ b/include/configs/tegra2-common.h @@ -42,7 +42,7 @@ #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SKIP_RELOCATE_UBOOT -#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h index 7b18022..c7abe0b 100644 --- a/include/configs/tny_a9260.h +++ b/include/configs/tny_a9260.h @@ -62,7 +62,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1
-#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT
/* * Hardware drivers diff --git a/include/configs/top9000.h b/include/configs/top9000.h index 5f0160d..4ed30f3 100644 --- a/include/configs/top9000.h +++ b/include/configs/top9000.h @@ -77,7 +77,7 @@ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_DISPLAY_CPUINFO #define CONFIG_AT91RESET_EXTRST /* assert external reset */ diff --git a/include/configs/tx25.h b/include/configs/tx25.h index 8f8a1a3..fa3cd22 100644 --- a/include/configs/tx25.h +++ b/include/configs/tx25.h @@ -51,7 +51,7 @@ #define CONFIG_SYS_NAND_SIZE (128 * 1024 * 1024) #define CONFIG_SYS_NAND_BAD_BLOCK_POS 0 #else -#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_CPU_INIT_CRIT #endif
#define CONFIG_DISPLAY_CPUINFO diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index ade40b5..af9d74a 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -31,7 +31,7 @@
#undef BOARD_LATE_INIT #undef CONFIG_USE_IRQ -#undef CONFIG_SKIP_LOWLEVEL_INIT +#undef CONFIG_SKIP_CPU_INIT_CRIT
/* * Environment settings