Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[oweals/u-boot.git] / include / configs / highbank.h

diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index a6202cfab446ca30b806f153860fe0f7b92728cb..5cefddc2e0eedbdafa6ca099b415b2648e8522d9 100644 (file)
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -14,8 +14,6 @@
 
 #define CONFIG_SYS_NO_FLASH
 
-#define CONFIG_OF_BOARD_SETUP
-#define CONFIG_FIT
 #define CONFIG_SYS_BOOTMAPSZ           (16 << 20)
 
 #define CONFIG_SYS_TIMER_RATE          (150000000/256)
@@ -53,18 +51,11 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_BDI
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_LOADS
-#define CONFIG_CMD_SCSI
+#define CONFIG_SCSI
 
 #define CONFIG_BOOT_RETRY_TIME         -1
 #define CONFIG_RESET_TO_RETRY
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds...\nPress <s> to stop or <d> to delay\n", bootdelay
-#define CONFIG_AUTOBOOT_KEYED_CTRLC
+
 /*
  * Miscellaneous configurable options
  */
@@ -78,11 +69,11 @@
 #define CONFIG_SYS_LOAD_ADDR           0x800000
 #define CONFIG_SYS_64BIT_LBA
 
-
 /*-----------------------------------------------------------------------
  * Physical Memory Map
+ * The DRAM is already setup, so do not touch the DT node later.
  */
-#define CONFIG_NR_DRAM_BANKS           1
+#define CONFIG_NR_DRAM_BANKS           0
 #define PHYS_SDRAM_1_SIZE              (4089 << 20)
 #define CONFIG_SYS_MEMTEST_START       0x100000
 #define CONFIG_SYS_MEMTEST_END         (PHYS_SDRAM_1_SIZE - 0x100000)