X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fshannon.h;h=572985b051bb3705eacce97043aab5b30d4fe1e0;hb=34c3c0e01dbf1f8cc2bd08de92f2b89ba84921eb;hp=8a4e3709b14165c92703c9379476c078279332c1;hpb=400558b561e2bdb47f87b96b3510dda0881a3662;p=u-boot

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