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 be19269180bbf83a9451417ae31a7e67a121173b..08ac9cbd58ba4f4a3285dea5f02132b4eb63225e 100644 (file)
--- a/include/configs/suzaku.h
+++ b/include/configs/suzaku.h
@@ -51,10 +51,25 @@
 #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