configs: Re-sync with cmd/Kconfig

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

diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index 61e6af384d4b21d5a957aa668d0bceed05566eef..caf75a6b26273e218b30c6558428ea2f14a4aafb 100644 (file)
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -15,7 +15,6 @@
 #define CONFIG_PB1X00          1
 #define CONFIG_SOC_AU1X00      1  /* alchemy series cpu */
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_DISPLAY_BOARDINFO
 
 #ifdef CONFIG_PB1000
@@ -32,8 +31,6 @@
 #endif
 #endif
 
-#define CONFIG_ETHADDR         DE:AD:BE:EF:01:01    /* Ethernet address */
-
 #define CONFIG_BOOTDELAY       2       /* autoboot after 2 seconds     */
 
 #define CONFIG_BAUDRATE                115200
@@ -55,7 +52,6 @@
  * Miscellaneous configurable options
  */
 #define        CONFIG_SYS_LONGHELP                             /* undef to save memory      */
-#define        CONFIG_SYS_PROMPT               "Pb1x00 # "     /* Monitor Command Prompt    */
 #define        CONFIG_SYS_CBSIZE               256             /* Console I/O Buffer Size   */
 #define        CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)  /* Print Buffer Size */
 #define        CONFIG_SYS_MAXARGS              16              /* max number of command args*/
@@ -85,6 +81,11 @@
 #define PHYS_FLASH_2           0xbfc00000 /* Flash Bank #2 */
 
 /* The following #defines are needed to get flash environment right */
+/* ROM version */
+/* #define CONFIG_SYS_TEXT_BASE                0xbfc00000 */
+/* SDRAM version */
+#define CONFIG_SYS_TEXT_BASE           0x83800000
+
 #define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)
 
@@ -107,10 +108,8 @@
 
 #define CONFIG_NR_DRAM_BANKS   2
 
-
 #define CONFIG_MEMSIZE_IN_BYTES
 
-
 /*---USB -------------------------------------------*/
 #if 0
 #define CONFIG_USB_OHCI
@@ -158,7 +157,6 @@
 #define CONFIG_SYS_ICACHE_SIZE         16384
 #define CONFIG_SYS_CACHELINE_SIZE      32
 
-
 /*
  * BOOTP options
  */
@@ -167,27 +165,11 @@
 #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_SAVEENV
-#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 */