sh: Fix compile error sh7763rdp board

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

diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index ed1893f574229d8cd09ad0b1a344f3feb0bee1f2..2caa64173c8bd30effe6d2411c1a712cfe11f0e3 100644 (file)
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -30,16 +30,16 @@
 
 #define CONFIG_MIPS32          1  /* MIPS32 CPU core   */
 #define CONFIG_PB1X00          1
-#define CONFIG_AU1X00          1  /* alchemy series cpu */
+#define CONFIG_SOC_AU1X00      1  /* alchemy series cpu */
 
 #ifdef CONFIG_PB1000
-#define CONFIG_AU1000          1
+#define CONFIG_SOC_AU1000      1
 #else
 #ifdef CONFIG_PB1100
-#define CONFIG_AU1100          1
+#define CONFIG_SOC_AU1100      1
 #else
 #ifdef CONFIG_PB1500
-#define CONFIG_AU1500          1
+#define CONFIG_SOC_AU1500      1
 #else
 #error "No valid board set"
 #endif
@@ -81,7 +81,9 @@
 
 #define CFG_BOOTPARAMS_LEN     128*1024
 
-#define CFG_HZ                 396000000      /* FIXME causes overflow in net.c */
+#define CFG_MIPS_TIMER_FREQ    396000000
+
+#define CFG_HZ                 1000
 
 #define CFG_SDRAM_BASE         0x80000000     /* Cached addr */
 
@@ -132,11 +134,8 @@
 /*---USB -------------------------------------------*/
 #if 0
 #define CONFIG_USB_OHCI
-#define ADD_USB_CMD             CFG_CMD_USB | CFG_CMD_FAT
 #define CONFIG_USB_STORAGE
 #define CONFIG_DOS_PARTITION
-#else
-#define ADD_USB_CMD             0
 #endif
 
 /*---ATA PCMCIA ------------------------------------*/
@@ -179,11 +178,36 @@
 #define CFG_ICACHE_SIZE                16384
 #define CFG_CACHELINE_SIZE     32
 
-#define CONFIG_COMMANDS        \
-  (((CONFIG_CMD_DFL | CFG_CMD_DHCP | CFG_CMD_ELF | CFG_CMD_MII | CFG_CMD_PING) & \
- ~(CFG_CMD_ENV | CFG_CMD_FAT | CFG_CMD_FLASH | CFG_CMD_FPGA | CFG_CMD_IDE | \
-   CFG_CMD_LOADS | CFG_CMD_RUN | CFG_CMD_LOADB | CFG_CMD_ELF | \
-   CFG_CMD_BDI | CFG_CMD_BEDBUG)) | ADD_USB_CMD)
-#include <cmd_confdefs.h>
+
+/*
+ * 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>
+
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_PING
+
+#undef CONFIG_CMD_ENV
+#undef CONFIG_CMD_FAT
+#undef CONFIG_CMD_FLASH
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_IDE
+#undef CONFIG_CMD_LOADS
+#undef CONFIG_CMD_RUN
+#undef CONFIG_CMD_LOADB
+#undef CONFIG_CMD_ELF
+#undef CONFIG_CMD_BDI
+#undef CONFIG_CMD_BEDBUG
 
 #endif /* __CONFIG_H */