summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-05-15 23:45:20 +0200
committerWolfgang Denk <wd@denx.de>2009-06-12 20:39:48 +0200
commit8fc3bb4b0603516ad641e2de252a400b85fd869b (patch)
tree67b1974fe65ed42862111b903390edc81f1d468f /include
parentc20e28f49aaf38c7dede46d8f8fe8234fe90822c (diff)
arm: cleanup remaining CONFIG_INIT_CRITICAL
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/SMN42.h2
-rw-r--r--include/configs/armadillo.h2
-rw-r--r--include/configs/gcplus.h2
-rw-r--r--include/configs/integratorap.h2
-rw-r--r--include/configs/lpc2292sodimm.h2
5 files changed, 3 insertions, 7 deletions
diff --git a/include/configs/SMN42.h b/include/configs/SMN42.h
index 05f6d9fc1af..adb6ac52e12 100644
--- a/include/configs/SMN42.h
+++ b/include/configs/SMN42.h
@@ -30,8 +30,6 @@
* If we are developing, we might want to start u-boot from ram
* so we MUST NOT initialize critical regs like mem-timing ...
*/
-#undef CONFIG_INIT_CRITICAL /* undef for developing */
-
#undef CONFIG_SKIP_LOWLEVEL_INIT
#undef CONFIG_SKIP_RELOCATE_UBOOT
diff --git a/include/configs/armadillo.h b/include/configs/armadillo.h
index 7ba5e174e2d..f7eec276858 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 ...
*/
-/*#define CONFIG_INIT_CRITICAL*/ /* undef for developing */
+#undef CONFIG_SKIP_LOWLEVEL_INIT
/*
* High Level Configuration Options
diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h
index b2fbca2f3c2..85db4f5c773 100644
--- 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 38c024953ea..09270ff0a80 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 */
-#undef CONFIG_INIT_CRITICAL
+#define CONFIG_SKIP_LOWLEVEL_INIT
#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 15150387938..7ce8d6de1ff 100644
--- a/include/configs/lpc2292sodimm.h
+++ b/include/configs/lpc2292sodimm.h
@@ -30,8 +30,6 @@
* If we are developing, we might want to start u-boot from ram
* so we MUST NOT initialize critical regs like mem-timing ...
*/
-#undef CONFIG_INIT_CRITICAL /* undef for developing */
-
#undef CONFIG_SKIP_LOWLEVEL_INIT
#undef CONFIG_SKIP_RELOCATE_UBOOT