Merge branch 'master' of git://git.denx.de/u-boot-i2c

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

diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index c92948f..f6bd4fe 100644 (file)
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -29,9 +29,6 @@
 #endif
 #endif
 
-
-#define CONFIG_BAUDRATE                115200
-
 #define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
 #undef CONFIG_BOOTARGS
 
@@ -104,7 +101,6 @@
 /*---USB -------------------------------------------*/
 #if 0
 #define CONFIG_USB_OHCI
-#define CONFIG_DOS_PARTITION
 #endif
 
 /*---ATA PCMCIA ------------------------------------*/
@@ -114,7 +110,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
@@ -154,6 +149,5 @@
  */
 
 #undef CONFIG_CMD_IDE
-#undef CONFIG_CMD_BEDBUG
 
 #endif /* __CONFIG_H */