aboutsummaryrefslogtreecommitdiffstats
path: root/include/configs/shannon.h
diff options
context:
space:
mode:
authorwdenk <wdenk>2005-04-04 12:44:11 +0000
committerwdenk <wdenk>2005-04-04 12:44:11 +0000
commit8aa1a2d115420b1eb126f69f3547b54d275c3228 (patch)
tree9167bf91193bcd6b15696a97180df29bc1524c83 /include/configs/shannon.h
parent986ef4340e73c6912a26e0c165c9966ab98618d4 (diff)
downloadu-boot-midas-8aa1a2d115420b1eb126f69f3547b54d275c3228.tar.gz
u-boot-midas-8aa1a2d115420b1eb126f69f3547b54d275c3228.tar.bz2
u-boot-midas-8aa1a2d115420b1eb126f69f3547b54d275c3228.zip
Patch by Steven Scholz, 4 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
Diffstat (limited to 'include/configs/shannon.h')
-rw-r--r--include/configs/shannon.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/include/configs/shannon.h b/include/configs/shannon.h
index 8a4e3709b1..572985b051 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