Merge branch 'mpc86xx'

[platform/kernel/u-boot.git] / include / configs / gcplus.h

diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h
index eefb8a6..b68a2dc 100644 (file)
--- a/include/configs/gcplus.h
+++ b/include/configs/gcplus.h
@@ -38,9 +38,10 @@
  * 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 memsetup (CONFIG_INIT_CRITICAL) to remedy that problem.
+ * 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
@@ -156,14 +157,14 @@
 #define CFG_FLASH_ERASE_TOUT   (2*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 #else
-/* REVISIT: This doesn't work on ADS GCPlus just yet:
+/* REVISIT: This doesn't work on ADS GCPlus just yet: */
 #define CFG_FLASH_CFI           1       /* flash is CFI conformant      */
 #define CFG_FLASH_CFI_DRIVER    1       /* use common cfi driver        */
 #define CFG_FLASH_USE_BUFFER_WRITE 1    /* use buffered writes (20x faster) */
 #define CFG_MAX_FLASH_BANKS     1       /* max # of memory banks        */
 #define CFG_FLASH_INCREMENT     0       /* there is only one bank       */
 #define CFG_MAX_FLASH_SECT      128     /* max # of sectors on one chip */
-//#define CFG_FLASH_PROTECTION    1       /* hardware flash protection    */
+/*#define CFG_FLASH_PROTECTION    1       /--* hardware flash protection    */
 #define CFG_FLASH_BANKS_LIST    { CFG_FLASH_BASE }
 #endif