Merge with git://www.denx.de/git/u-boot.git

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

diff --git a/include/configs/suzaku.h b/include/configs/suzaku.h
index e8c437364fcf765a17e618b94e1e4d3c74e32ba8..08ac9cbd58ba4f4a3285dea5f02132b4eb63225e 100644 (file)
--- a/include/configs/suzaku.h
+++ b/include/configs/suzaku.h
@@ -25,12 +25,6 @@
 #ifndef __CONFIG_H
 #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 ...
- */
-#define CONFIG_INIT_CRITICAL           /* undef for developing */
-
 /*
  * High Level Configuration Options
  * (easy to change)
@@ -50,16 +44,32 @@
 #define CFG_FLASH_SIZE         0x00400000
 #define CFG_RESET_ADDRESS      0xfff00100
 #define CFG_MONITOR_LEN                (256 << 10)     /* Reserve 256 kB for Monitor */
-#define CFG_MONITOR_BASE        (CFG_SDRAM_BASE + CFG_SDRAM_SIZE - (1024 * 1024))
+#define CFG_MONITOR_BASE       (CFG_SDRAM_BASE + CFG_SDRAM_SIZE - (1024 * 1024))
 #define CFG_MALLOC_LEN         (256 << 10)     /* Reserve 256 kB for malloc */
+#define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - (1024 * 1024))
 
 #define CONFIG_BAUDRATE                115200
 #define CFG_BAUDRATE_TABLE     { 115200 }
 
-#define CONFIG_COMMANDS                (CONFIG__CMD_DFL)
+/* System Register (GPIO) */
+#define MICROBLAZE_SYSREG_BASE_ADDR 0xFFFFA000
+#define MICROBLAZE_SYSREG_RECONFIGURE (1 << 0)
+
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
 
 #define CFG_UART1_BASE         (0xFFFF2000)
 #define CONFIG_SERIAL_BASE     CFG_UART1_BASE