diff --git a/CHANGELOG b/CHANGELOG
index 26a32eecba398be011c449959b52cb29936171b5..0d7519fbeb1d4fe42b719a30dbce1bcf6514f1e7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@
Changes for U-Boot 1.1.3:
======================================================================
+* Patch by Steven Scholz, 04 Apr 2005:
+ - remove all references to CONFIG_INIT_CRITICAL for ARM based boards
+ - introduce two new configuration options instead:
+ CONFIG_SKIP_LOWLEVEL_INIT and CONFIG_SKIP_RELOCATE_UBOOT
+
* Patch by Steven Scholz, 04 Apr 2005:
Make sure that MDIO clock does not exceed 2.5 MHz on AT91
diff --git a/README b/README
index 5b73238841f9084121a1e7671a0f13ed0f369df9..e74ce4c4e6dc228cf4c3d25ed9a7e43977504992 100644
--- a/README
+++ b/README
@@ -2129,14 +2129,18 @@ Low Level (hardware related) configuration options:
This only takes effect if the memory commands are activated
globally (CFG_CMD_MEM).
-- CONFIG_INIT_CRITICAL
- [ARM only] If this variable is NOT defined, then
- certain critical initializations (like setting up the
- memory controller) are omitted. Normally this
- variable MUST be defined for all boards. The only
- exception is when U-Boot is loaded (to RAM) by some
- other boot loader or by a debugger which performs
- these intializations itself.
+- CONFIG_SKIP_LOWLEVEL_INIT
+- CONFIG_SKIP_RELOCATE_UBOOT
+
+ [ARM only] If these variables are defined, then
+ certain low level initializations (like setting up
+ the memory controller) are omitted and/or U-Boot does
+ not relocate itself into RAM.
+ Normally these variables MUST NOT be defined. The
+ only exception is when U-Boot is loaded (to RAM) by
+ some other boot loader or by a debugger which
+ performs these intializations itself.
+
Building the Software:
======================
diff --git a/board/ns9750dev/platform.S b/board/ns9750dev/platform.S
index 11f9aef8011e29036c767fbde16d7dbf5f5f9893..afcad15408248b4d69f0cc823bbc5939a1b72ee4 100644
--- a/board/ns9750dev/platform.S
+++ b/board/ns9750dev/platform.S
@@ -34,7 +34,7 @@
#include <version.h>
#if defined(CONFIG_NS9750DEV)
-# ifdef CONFIG_INIT_CRITICAL
+# ifndef CONFIG_SKIP_LOWLEVEL_INIT
# include <./ns9750_sys.h>
# include <./ns9750_mem.h>
# endif
@@ -74,7 +74,7 @@ _PHYS_FLASH:
_CAS_LATENCY:
.word 0x00022000 @ for CAS2 latency
-#ifdef CONFIG_INIT_CRITICAL
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
.globl platformsetup
platformsetup:
@@ -295,4 +295,4 @@ _AHB_MONITOR_START:
NS9750_SYS_AHB_MON_BATC_GEN_IRQ)
_AHB_MONITOR_END:
-#endif /* CONFIG_INIT_CRITICAL */
+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
diff --git a/cpu/arm1136/start.S b/cpu/arm1136/start.S
index 27fcc89cc90ea0384f13bc3e375ebe037dd49120..c3bf6e37e1cfda9820866dd1b0fc157d7a2f61fb 100644
--- a/cpu/arm1136/start.S
+++ b/cpu/arm1136/start.S
@@ -129,8 +129,11 @@ 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
bl cpu_init_crit
+#endif
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
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 */
@@ -147,6 +150,7 @@ copy_loop:
stmia r1!, {r3-r10} /* copy to target address [r1] */
cmp r0, r2 /* until source end addreee [r2] */
ble copy_loop
+#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
/* Set up the stack */
stack_setup:
diff --git a/cpu/arm720t/start.S b/cpu/arm720t/start.S
index 0e15965df6b2d67b999d64a4e8afb1eaec9c694c..3695465e70959be4837261131413e23fa6f2db17 100644
--- a/cpu/arm720t/start.S
+++ b/cpu/arm720t/start.S
@@ -119,10 +119,11 @@ 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
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
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 */
@@ -150,6 +151,8 @@ copy_loop:
cmp r0, r2 /* until source end addreee [r2] */
ble copy_loop
+#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
+
/* Set up the stack */
stack_setup:
ldr r0, _TEXT_BASE /* upper 128 KiB: relocated uboot */
diff --git a/cpu/arm920t/start.S b/cpu/arm920t/start.S
index a7cabf8f32118df690ad5eb0615611b8038c301c..afe654b8cb4f22bab49d83eee6f4a12e107b066b 100644
--- a/cpu/arm920t/start.S
+++ b/cpu/arm920t/start.S
@@ -156,10 +156,11 @@ 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
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
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 */
@@ -176,6 +177,7 @@ copy_loop:
stmia r1!, {r3-r10} /* copy to target address [r1] */
cmp r0, r2 /* until source end addreee [r2] */
ble copy_loop
+#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
/* Set up the stack */
stack_setup:
diff --git a/cpu/arm925t/start.S b/cpu/arm925t/start.S
index f74064b97f6b4f668df336bbcce3a7acf5233072..238925936eaf60b2a07895748aae7f61b33b806d 100644
--- a/cpu/arm925t/start.S
+++ b/cpu/arm925t/start.S
@@ -164,10 +164,11 @@ poll1:
* 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
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
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 */
@@ -184,6 +185,7 @@ copy_loop:
stmia r1!, {r3-r10} /* copy to target address [r1] */
cmp r0, r2 /* until source end addreee [r2] */
ble copy_loop
+#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
/* Set up the stack */
stack_setup:
diff --git a/cpu/arm926ejs/start.S b/cpu/arm926ejs/start.S
index cd728c5108a3e55d8bfe9b2240dd235987e52c35..d62940b071474fe0c87724e197b2dacbbf7dbe62 100644
--- a/cpu/arm926ejs/start.S
+++ b/cpu/arm926ejs/start.S
@@ -139,10 +139,11 @@ 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
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
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 */
@@ -159,6 +160,7 @@ copy_loop:
stmia r1!, {r3-r10} /* copy to target address [r1] */
cmp r0, r2 /* until source end addreee [r2] */
ble copy_loop
+#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
/* Set up the stack */
stack_setup:
diff --git a/cpu/at91rm9200/lowlevel.S b/cpu/at91rm9200/lowlevel.S
index 5521e5d3ccec2e19b05dfc96aaf0858d6d769a00..05887adc0c4886570cb538531b19082e22608bc5 100644
--- a/cpu/at91rm9200/lowlevel.S
+++ b/cpu/at91rm9200/lowlevel.S
@@ -30,7 +30,7 @@
#include <config.h>
#include <version.h>
-#ifdef CONFIG_INIT_CRITICAL
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
/*
* some parameters for the board
*
@@ -197,4 +197,4 @@ SMRDATA1:
.word SDRAM
.word SDRAM_VAL
/* SMRDATA1 is 176 bytes long */
-#endif /* CONFIG_INIT_CRITICAL */
+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
diff --git a/cpu/at91rm9200/start.S b/cpu/at91rm9200/start.S
index 89a0aa5dcb0b54b93fac154b516ab492f44d0d81..62315fe11957c010696ec8feea387bf4d1ff7970 100644
--- a/cpu/at91rm9200/start.S
+++ b/cpu/at91rm9200/start.S
@@ -115,7 +115,7 @@ reset:
orr r0,r0,#0xd3 /* was 13 */
msr cpsr,r0
-#ifdef CONFIG_INIT_CRITICAL
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
/* scratch stack */
/**** ldr r1, =0x00204000 ****/
/* Insure word alignment */
@@ -141,7 +141,7 @@ reset:
orr r0, r0, #0x00001000 @ set bit 12 (I) I-Cache
orr r0, r0, #0xC0000000 @ set bits 31:30 (iA, nF)
mcr p15, 0, r0, c1, c0, 0 @ write r0 in cp15 control register (cp15 r1)
-#endif /* CONFIG_INIT_CRITICAL */
+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
/*
* relocate exeception table
*/
@@ -158,9 +158,11 @@ copyex:
* 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 /* CONFIG_SKIP_LOWLEVEL_INIT */
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
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 */
@@ -177,7 +179,7 @@ copy_loop:
stmia r1!, {r3-r10} /* copy to target address [r1] */
cmp r0, r2 /* until source end addreee [r2] */
ble copy_loop
-#endif /* CONFIG_INIT_CRITICAL */
+#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
/* Set up the stack */
stack_setup:
diff --git a/cpu/ixp/start.S b/cpu/ixp/start.S
index 3b3c868fe096e8ca045dfe6abd464d49aa16c4fb..2726f659788d00f04437774d8be44267b2f4a375 100644
--- a/cpu/ixp/start.S
+++ b/cpu/ixp/start.S
@@ -261,6 +261,7 @@ reset:
orr r0,r0,#0x13
msr cpsr,r0
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
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 */
@@ -277,6 +278,7 @@ copy_loop:
stmia r1!, {r3-r10} /* copy to target address [r1] */
cmp r0, r2 /* until source end addreee [r2] */
ble copy_loop
+#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
/* Set up the stack */
stack_setup:
diff --git a/cpu/lh7a40x/start.S b/cpu/lh7a40x/start.S
index 5dca77363f9a84a148a4e51947d8513dbc98cb32..fb748cffc63be59f34a57985fb46bda8d27b5718 100644
--- a/cpu/lh7a40x/start.S
+++ b/cpu/lh7a40x/start.S
@@ -145,10 +145,11 @@ 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
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
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 */
@@ -166,6 +167,7 @@ copy_loop:
cmp r0, r2 /* until source end addreee [r2] */
blt copy_loop /* a 'ble' here actually copies */
/* four bytes of bss */
+#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
/* Set up the stack */
stack_setup:
diff --git a/cpu/pxa/start.S b/cpu/pxa/start.S
index da753a18dac62ecc9779bfb94bc03a55a5653f9a..a8cc0800b0ca48ad8e7cb7323789c4137c8c2ec0 100644
--- a/cpu/pxa/start.S
+++ b/cpu/pxa/start.S
@@ -108,10 +108,11 @@ 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 /* we do sys-critical inits */
#endif
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
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 */
@@ -128,6 +129,7 @@ copy_loop:
stmia r1!, {r3-r10} /* copy to target address [r1] */
cmp r0, r2 /* until source end addreee [r2] */
ble copy_loop
+#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
/* Set up the stack */
stack_setup:
diff --git a/cpu/s3c44b0/start.S b/cpu/s3c44b0/start.S
index fc7f59228ad673bd61a70871f7433b19f17294db..7affe87b3a1fd3943f695fe8c63fc32607794a6b 100644
--- a/cpu/s3c44b0/start.S
+++ b/cpu/s3c44b0/start.S
@@ -112,7 +112,7 @@ reset:
* not when booting from ram!
*/
-#ifdef CONFIG_INIT_CRITICAL
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
bl cpu_init_crit
/*
* before relocating, we have to setup RAM timing
@@ -122,6 +122,7 @@ reset:
bl lowlevel_init
#endif
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
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 */
@@ -151,6 +152,7 @@ vector_copy_loop:
stmia r1!, {r3-r10}
cmp r0, r2
ble vector_copy_loop
+#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
/* Set up the stack */
stack_setup:
diff --git a/cpu/sa1100/start.S b/cpu/sa1100/start.S
index 08e41c7d793042d695388b78ee36b1039a9288a3..431ee656e8d1b73831c841fdf72ec81793296f38 100644
--- a/cpu/sa1100/start.S
+++ b/cpu/sa1100/start.S
@@ -121,10 +121,11 @@ 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
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
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 */
@@ -141,6 +142,7 @@ copy_loop:
stmia r1!, {r3-r10} /* copy to target address [r1] */
cmp r0, r2 /* until source end addreee [r2] */
ble copy_loop
+#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
/* Set up the stack */
stack_setup:
diff --git a/include/common.h b/include/common.h
index edb704dca4c1031b164ae699babcd8bae48b6d6d..625c389897ad2f4725b9a2d7bda516f04821c361 100644
--- a/include/common.h
+++ b/include/common.h
@@ -586,4 +586,9 @@ int pcmcia_init (void);
void show_boot_progress (int status);
#endif
+#ifdef CONFIG_INIT_CRITICAL
+#error CONFIG_INIT_CRITICAL is depracted!
+#error Read section CONFIG_SKIP_LOWLEVEL_INIT in README.
+#endif
+
#endif /* __COMMON_H_ */
diff --git a/include/configs/B2.h b/include/configs/B2.h
index b031826f3f9d31fee97ae8dcc8b6ca432c39e880..e55858d34bc071417f612dd87567a6c33d4b906a 100644
--- a/include/configs/B2.h
+++ b/include/configs/B2.h
@@ -30,12 +30,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/SX1.h b/include/configs/SX1.h
index 7c51a1b040ff50cc15e87f7d0b66d9fafd9c549b..6ed98b8fb1889e6847324723df38cac3b2107a86 100644
--- a/include/configs/SX1.h
+++ b/include/configs/SX1.h
@@ -23,12 +23,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 2c664d5936609790c5fa747c6b258b457cbfd495..bde12e18023b77b8bf1510cb325fe980380125bc 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -29,12 +29,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/assabet.h b/include/configs/assabet.h
index a52d87dfd36be600f7fe49e21f6a79e312d6c5d4..1a69ebe0dae79ebd760d2b3f21954bdde38abba9 100644
--- a/include/configs/assabet.h
+++ b/include/configs/assabet.h
@@ -31,8 +31,6 @@
#undef DEBUG
-#define CONFIG_INIT_CRITICAL
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h
index d32ec34fc2a708431864581d910d8fbc4970240b..6a246b63ae7da0dcdbf2d2daebec58daf29833c6 100644
--- a/include/configs/at91rm9200dk.h
+++ b/include/configs/at91rm9200dk.h
@@ -25,12 +25,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/* ARM asynchronous clock */
#define AT91C_MAIN_CLOCK 179712000 /* from 18.432 MHz crystal (18432000 / 4 * 39) */
#define AT91C_MASTER_CLOCK 59904000 /* peripheral clock (AT91C_MASTER_CLOCK / 3) */
@@ -44,7 +38,7 @@
#define CONFIG_SETUP_MEMORY_TAGS 1
#define CONFIG_INITRD_TAG 1
-#ifdef CONFIG_INIT_CRITICAL
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
#define CFG_USE_MAIN_OSCILLATOR 1
/* flash */
#define MC_PUIA_VAL 0x00000000
@@ -74,7 +68,7 @@
#define SDRC_MR_VAL2 0x00000003 /* Load Mode Register */
#define SDRC_MR_VAL3 0x00000000 /* Normal Mode */
#define SDRC_TR_VAL 0x000002E0 /* Write refresh rate */
-#endif /* CONFIG_INIT_CRITICAL */
+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
/*
* Size of malloc() pool
*/
@@ -177,19 +171,19 @@
#define CFG_ENV_SIZE 0x2000 /* 0x8000 */
#else
#define CFG_ENV_IS_IN_FLASH 1
-#ifdef CONFIG_INIT_CRITICAL
+#ifdef CONFIG_SKIP_LOWLEVEL_INIT
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x60000) /* after u-boot.bin */
#define CFG_ENV_SIZE 0x10000 /* sectors are 64K here */
#else
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0xe000) /* between boot.bin and u-boot.bin.gz */
#define CFG_ENV_SIZE 0x2000 /* 0x8000 */
-#endif /* CONFIG_INIT_CRITICAL */
+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
#endif /* CFG_ENV_IS_IN_DATAFLASH */
#define CFG_LOAD_ADDR 0x21000000 /* default load address */
-#ifdef CONFIG_INIT_CRITICAL
+#ifdef CONFIG_SKIP_LOWLEVEL_INIT
#define CFG_BOOT_SIZE 0x00 /* 0 KBytes */
#define CFG_U_BOOT_BASE PHYS_FLASH_1
#define CFG_U_BOOT_SIZE 0x60000 /* 384 KBytes */
@@ -197,7 +191,7 @@
#define CFG_BOOT_SIZE 0x6000 /* 24 KBytes */
#define CFG_U_BOOT_BASE (PHYS_FLASH_1 + 0x10000)
#define CFG_U_BOOT_SIZE 0x10000 /* 64 KBytes */
-#endif /* CONFIG_INIT_CRITICAL */
+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
#define CFG_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 }
diff --git a/include/configs/cerf250.h b/include/configs/cerf250.h
index 6a136d541a50c274ef4d44af7cec16f3b934efaf..6997c7a6f4378ae71d41672060e0e9faada1a468 100644
--- a/include/configs/cerf250.h
+++ b/include/configs/cerf250.h
@@ -30,12 +30,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h
index 96b7148cf145e1929bbdf278ce29a67d7674ceda..5e96e09c3ea03ff702bac36f4936ca1aadaa4df9 100644
--- a/include/configs/cmc_pu2.h
+++ b/include/configs/cmc_pu2.h
@@ -25,12 +25,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/* ARM asynchronous clock */
#define AT91C_MAIN_CLOCK 207360000 /* from 18.432 MHz crystal (18432000 / 4 * 45) */
#define AT91C_MASTER_CLOCK (AT91C_MAIN_CLOCK/3) /* peripheral clock */
@@ -44,7 +38,7 @@
#define CONFIG_SETUP_MEMORY_TAGS 1
#define CONFIG_INITRD_TAG 1
-#ifdef CONFIG_INIT_CRITICAL
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
#define CFG_USE_MAIN_OSCILLATOR 1
/* flash */
#define MC_PUIA_VAL 0x00000000
@@ -74,7 +68,7 @@
#define SDRC_MR_VAL2 0x00000003 /* Load Mode Register */
#define SDRC_MR_VAL3 0x00000000 /* Normal Mode */
#define SDRC_TR_VAL 0x000002E0 /* Write refresh rate */
-#endif /* CONFIG_INIT_CRITICAL */
+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
/*
* Size of malloc() pool
diff --git a/include/configs/cradle.h b/include/configs/cradle.h
index ca7a97b5628bad13d879c99b870cd5a4a3b11c84..776e1d2b7f736aa65fa0137a6e30236081ab74fe 100644
--- a/include/configs/cradle.h
+++ b/include/configs/cradle.h
@@ -28,12 +28,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/csb226.h b/include/configs/csb226.h
index 0b2b251baeba3752fd8481ea531b5fcf6cedb87c..f04102e95c5dfa6d0285b8bf6145633e080b3bfe 100644
--- a/include/configs/csb226.h
+++ b/include/configs/csb226.h
@@ -33,12 +33,6 @@
#define DEBUG 1
-/*
- * If we are developing, we might want to start U-Boot from ram
- * so we MUST NOT initialize critical regs like mem-timing ...
- */
-#define CONFIG_INIT_CRITICAL
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h
index b14e35b6288613d947b0c09f0f9fc6b11c4d7eba..9ac2856f65317e1c48de73fc9ad730fb5c348f1d 100644
--- a/include/configs/dnp1110.h
+++ b/include/configs/dnp1110.h
@@ -31,7 +31,8 @@
* If we are developing, we might want to start armboot from ram
* so we MUST NOT initialize critical regs like mem-timing ...
*/
-#undef CONFIG_INIT_CRITICAL
+#define CONFIG_SKIP_LOWLEVEL_INIT 1
+#undef CONFIG_SKIP_RELOCATE_UBOOT
/*
* High Level Configuration Options
diff --git a/include/configs/ep7312.h b/include/configs/ep7312.h
index 41ad3943e1c2b5da9796ed97c375afb572047a7b..c6a028fabde5d1538ceec916ab0a429ba4f55c98 100644
--- a/include/configs/ep7312.h
+++ b/include/configs/ep7312.h
@@ -27,12 +27,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/evb4510.h b/include/configs/evb4510.h
index 9e0ed51fa4852b32f39ff1fbeaf720c15d70a8cd..88c2c7437d0f58d65b74327601993c7874a0d404 100644
--- a/include/configs/evb4510.h
+++ b/include/configs/evb4510.h
@@ -32,8 +32,8 @@
*
* Also swap the flash1 and flash2 addresses during debug.
*
+ * #define CONFIG_SKIP_LOWLEVEL_INIT
*/
-#define CONFIG_INIT_CRITICAL
/*
* High Level Configuration Options
diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h
index dbb8dec85dcf7f16ad07f66174129db7de3c64ac..b68a2dca09c5652b20b1dc59d51b43ec02591780 100644
--- a/include/configs/gcplus.h
+++ b/include/configs/gcplus.h
@@ -40,7 +40,8 @@
* 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.
*/
-#define CONFIG_INIT_CRITICAL
+#undef CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_SKIP_RELOCATE_UBOOT 1
/*
* High Level Configuration Options
diff --git a/include/configs/impa7.h b/include/configs/impa7.h
index dbc951de65e4cedbf4d362dd380198c69b3b9e9e..c187c54d6c35b6f43ff055c6e88665415c0e7a8e 100644
--- a/include/configs/impa7.h
+++ b/include/configs/impa7.h
@@ -27,12 +27,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/innokom.h b/include/configs/innokom.h
index a3d36a0d8f0c70f78cb6cd37a0713f6a7a920882..fce72e112b4e4b28efca208d8db73c4847025c57 100644
--- a/include/configs/innokom.h
+++ b/include/configs/innokom.h
@@ -30,12 +30,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * If we are developing, we might want to start U-Boot from ram
- * so we MUST NOT initialize critical regs like mem-timing ...
- */
-#define CONFIG_INIT_CRITICAL
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/ixdp425.h b/include/configs/ixdp425.h
index a8067f6ef2ae5ad756e4fe31acbdf9f3242097a4..b0a80a3ea2376dc17323461dd5b2043d790d88f1 100644
--- a/include/configs/ixdp425.h
+++ b/include/configs/ixdp425.h
@@ -37,12 +37,6 @@
* U-boot generic defines start here.
***************************************************************/
-/*
- * 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 CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
/*
diff --git a/include/configs/lart.h b/include/configs/lart.h
index 3c9895ab27e82fc043169e1e55c7142c96055e76..a00640bf8e641a50ab3ea710c8b4c38255bc28fd 100644
--- a/include/configs/lart.h
+++ b/include/configs/lart.h
@@ -27,12 +27,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/logodl.h b/include/configs/logodl.h
index b320a4050dfeb6aac407fa81236e77dfd463fb14..715ed74eadec5dc7d7c8f98779135718be60b482 100644
--- a/include/configs/logodl.h
+++ b/include/configs/logodl.h
@@ -30,12 +30,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * If we are developing, we might want to start U-Boot from ram
- * so we MUST NOT initialize critical regs like mem-timing ...
- */
-#define CONFIG_INIT_CRITICAL
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/lpd7a400.h b/include/configs/lpd7a400.h
index 6f2c32c5469fa17175940280647df577f777e348..d7d0460ef663b0b8b70a1cb7e00b5ad69ecfb070 100644
--- a/include/configs/lpd7a400.h
+++ b/include/configs/lpd7a400.h
@@ -23,12 +23,6 @@
#define CONFIG_LPD7A400 /* Logic LH7A400 SDK */
-/*
- * 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 CONFIG_USE_IRQ
/*
diff --git a/include/configs/lpd7a404.h b/include/configs/lpd7a404.h
index e6855fb1ef36e83af502468aee616f3be11be8d1..4002e6849cc25727d5ad55397e74ce7e1b29e26f 100644
--- a/include/configs/lpd7a404.h
+++ b/include/configs/lpd7a404.h
@@ -23,12 +23,6 @@
#define CONFIG_LPD7A404 /* Logic LH7A400 SDK */
-/*
- * 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 CONFIG_USE_IRQ
/*
diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index 536a175bd6584f9f9b848cc94fd508b5f97b3f87..9ac62c7e076a6add6461b0e382e90e8982421b8a 100644
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -30,12 +30,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/modnet50.h b/include/configs/modnet50.h
index 166aa1180cf95def0b65cfc4fc6e09e5c2faa2f7..067c84623f54c225ad0b0bc35e1f45dfa1e3bae2 100644
--- a/include/configs/modnet50.h
+++ b/include/configs/modnet50.h
@@ -27,12 +27,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * If we are developing, we might want to start u-boot from ram
- * so we MUST NOT initialize critical regs like mem-timing ...
- */
-#define CONFIG_INIT_CRITICAL
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index f7ccea3d45ee54ecf68ffa811b82bd0d7cb3a7e5..7f3dfd5c987833b2ed533a11abf46846576d3231 100644
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -28,12 +28,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/mx1fs2.h b/include/configs/mx1fs2.h
index 61a3b29612ef944fd214217a739073f3cbcccb18..7b4dc92c6c63b99134fc43bb01bb29e37247a1ed 100644
--- a/include/configs/mx1fs2.h
+++ b/include/configs/mx1fs2.h
@@ -113,8 +113,6 @@
#define PRECHARGE_CMD 0x910a8300
#define AUTOREFRESH_CMD 0xa10a8300
-#define CONFIG_INIT_CRITICAL
-
#define BUS32BIT_VERSION
/*
* SDRAM Memory Map
diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h
index af39e2e88d4cf59e949e9772e632f29be14451cd..0b1541d5c346c86d4c3f64d710cc74344760299e 100644
--- a/include/configs/ns9750dev.h
+++ b/include/configs/ns9750dev.h
@@ -27,12 +27,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h
index 552beedc5cff46c4981d4f5002c08e98151548b1..016d3d8bd020a98d2b5cefe7141dd930aa6a2372 100644
--- a/include/configs/omap1510inn.h
+++ b/include/configs/omap1510inn.h
@@ -26,12 +26,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h
index 9b822152c2488accc975dbfd85e40c784baf67e1..c6ca689a5fe04aee8960e834b43d843c719a3a90 100644
--- a/include/configs/omap1610h2.h
+++ b/include/configs/omap1610h2.h
@@ -26,12 +26,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h
index c00976efd14f0d07a8da80469957018e821e9620..f28ede09674c4f149d92a8c3d44bd2171a2eeb7c 100644
--- a/include/configs/omap1610inn.h
+++ b/include/configs/omap1610inn.h
@@ -26,12 +26,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index cd2dbf18b821674f6a8fad7090522de5be42b1e5..605563aa0a8842b8883c2b1b61f1e7bb2c0c15e9 100644
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -26,12 +26,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h
index 1bdea6c5ab77ea7bdf5d57562f8c62daa9620adc..fda55cf06fd249ae24f9d3bd9c4f097800542926 100644
--- a/include/configs/omap730p2.h
+++ b/include/configs/omap730p2.h
@@ -27,13 +27,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
index 9ba19c850684b3e370e6994e9085ec562bca7924..a6c23712b5db83af3a636d30748170ae2d01f8ee 100644
--- a/include/configs/pleb2.h
+++ b/include/configs/pleb2.h
@@ -30,12 +30,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h
index 6cd91269d4311fc9a550037f9c7baa32db5074fb..a4249c47c6251017f72eb73fec1acfaa384cc92c 100644
--- a/include/configs/scb9328.h
+++ b/include/configs/scb9328.h
@@ -119,7 +119,6 @@
#define PRECHARGE_CMD 0x910a8200
#define AUTOREFRESH_CMD 0xa10a8200
-#define CONFIG_INIT_CRITICAL
/*
* SDRAM Memory Map
diff --git a/include/configs/shannon.h b/include/configs/shannon.h
index 8a4e3709b14165c92703c9379476c078279332c1..572985b051bb3705eacce97043aab5b30d4fe1e0 100644
--- a/include/configs/shannon.h
+++ b/include/configs/shannon.h
@@ -28,16 +28,13 @@
#define __CONFIG_H
/*
- * If we are developing, we might want to start armboot from ram
- * so we MUST NOT initialize critical regs like mem-timing ...
- */
-
-/*
- * we just run in non-critical mode now, because we use the Inferno-Loader to
- * bring us to live
+ * Since we use the Inferno-Loader to bring us to live,
+ * we skip the lowlevel init stuff.
+ * But U-Boot still relocates itself into RAM
*/
#define CONFIG_INFERNO /* we are using the inferno bootldr */
-#undef CONFIG_INIT_CRITICAL
+#define CONFIG_SKIP_LOWLEVEL_INIT 1
+#undef CONFIG_SKIP_RELOCATE_UBOOT
/*
* High Level Configuration Options
diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h
index f477575be8df2c49bed6f675d4cb97d1ee316cbe..a137f9d7c999cc753b88fec6a23076aa7aca35f0 100644
--- a/include/configs/smdk2400.h
+++ b/include/configs/smdk2400.h
@@ -30,12 +30,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 2a1cd7707a52ee17733d0967ec7b87fd373236c0..7edec0db43d6ae437c40bd7d96f802460b01c668 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -29,12 +29,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/suzaku.h b/include/configs/suzaku.h
index 6fda7b96fd503c43622d337b334813a278bf7f34..1ee6be174fe326c3b6a92bfb2a9f05e924f88024 100644
--- a/include/configs/suzaku.h
+++ b/include/configs/suzaku.h
@@ -25,12 +25,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/trab.h b/include/configs/trab.h
index 2f59260564428162cc3da6d275ef8c2e125345f4..3ca00497eda2701415348b0710f541d85e464938 100644
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -36,12 +36,6 @@
# define CONFIG_RAM_32MB /* 32 MB SDRAM */
#endif
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/wepep250.h b/include/configs/wepep250.h
index ca32efb3c45a440bdae1823766ee1c6d556f1c16..47251bbb641e25655c4667dd2fd2c59f557f2382 100644
--- a/include/configs/wepep250.h
+++ b/include/configs/wepep250.h
@@ -23,12 +23,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
#define CONFIG_PXA250 1 /* this is an PXA250 CPU */
#define CONFIG_WEPEP250 1 /* config for wepep250 board */
#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index 1177003c801e74d47bc4c7e184c22bdf68846d47..386ce0539b496873ac6439d762bc9c5a45bfd062 100644
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -36,16 +36,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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 CONFIG_INIT_CRITICAL
-*/
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/xm250.h b/include/configs/xm250.h
index 1be7dd46a7df35a5b219f33d7d3338b438f654e9..952f73b43d1a66f97ad4a81bc6b61753cca0b192 100644
--- a/include/configs/xm250.h
+++ b/include/configs/xm250.h
@@ -28,12 +28,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/*
* High Level Configuration Options
* (easy to change)
diff --git a/include/configs/xsengine.h b/include/configs/xsengine.h
index 6b15766daa2a94805b7f3c65051ee64e4c9ac286..847e91a05961f36f6be34f14e817779fe2488adf 100644
--- a/include/configs/xsengine.h
+++ b/include/configs/xsengine.h
@@ -28,12 +28,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * 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
-
/* High Level Configuration Options */
#define CONFIG_PXA250 1 /* This is an PXA250 CPU */
#define CONFIG_XSENGINE 1