include/configs: remove CONFIG_SYS_CBSIZE when the default value is used

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

diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index 1c04a58e9fed7428afaa517c89dc5d68c4c39c08..ba9c99850c6fa95a115f3dad3e1a8bab72ecb826 100644 (file)
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -29,14 +29,7 @@
 #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
-
 #define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
-#undef CONFIG_BOOTARGS
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "addmisc=setenv bootargs ${bootargs} "                          \
@@ -52,8 +45,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*/
 
@@ -81,7 +72,6 @@
 #define PHYS_FLASH_1           0xbec00000 /* Flash Bank #1 */
 #define PHYS_FLASH_2           0xbfc00000 /* Flash Bank #2 */
 
-/* The following #defines are needed to get flash environment right */
 #define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)
 
@@ -94,8 +84,6 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    (2 * CONFIG_SYS_HZ) /* Timeout for Flash Erase */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    (2 * CONFIG_SYS_HZ) /* Timeout for Flash Write */
 
-#define        CONFIG_ENV_IS_NOWHERE   1
-
 /* Address and size of Primary Environment Sector      */
 #define CONFIG_ENV_ADDR                0xB0030000
 #define CONFIG_ENV_SIZE                0x10000
@@ -104,15 +92,11 @@
 
 #define CONFIG_NR_DRAM_BANKS   2
 
-
 #define CONFIG_MEMSIZE_IN_BYTES
 
-
 /*---USB -------------------------------------------*/
 #if 0
 #define CONFIG_USB_OHCI
-#define CONFIG_USB_STORAGE
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*---ATA PCMCIA ------------------------------------*/
@@ -122,7 +106,6 @@
 #define CONFIG_PCMCIA_SLOT_A
 
 #define CONFIG_ATAPI 1
-#define CONFIG_MAC_PARTITION 1
 
 /* We run CF in "true ide" mode or a harddrive via pcmcia */
 #define CONFIG_IDE_PCMCIA 1
@@ -148,13 +131,6 @@
 #define CONFIG_SYS_ATA_ALT_OFFSET      0x0100
 
 #endif
-/*-----------------------------------------------------------------------
- * Cache Configuration
- */
-#define CONFIG_SYS_DCACHE_SIZE         16384
-#define CONFIG_SYS_ICACHE_SIZE         16384
-#define CONFIG_SYS_CACHELINE_SIZE      32
-
 
 /*
  * BOOTP options
@@ -164,27 +140,8 @@
 #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 */