projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
a649991
..
f6bd4fe
100644
(file)
--- a/
include/configs/pb1x00.h
+++ b/
include/configs/pb1x00.h
@@
-15,8
+15,6
@@
#define CONFIG_PB1X00 1
#define CONFIG_SOC_AU1X00 1 /* alchemy series cpu */
#define CONFIG_PB1X00 1
#define CONFIG_SOC_AU1X00 1 /* alchemy series cpu */
-#define CONFIG_DISPLAY_BOARDINFO
-
#ifdef CONFIG_PB1000
#define CONFIG_SOC_AU1000 1
#else
#ifdef CONFIG_PB1000
#define CONFIG_SOC_AU1000 1
#else
@@
-31,9
+29,6
@@
#endif
#endif
#endif
#endif
-
-#define CONFIG_BAUDRATE 115200
-
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#undef CONFIG_BOOTARGS
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#undef CONFIG_BOOTARGS
@@
-106,8
+101,6
@@
/*---USB -------------------------------------------*/
#if 0
#define CONFIG_USB_OHCI
/*---USB -------------------------------------------*/
#if 0
#define CONFIG_USB_OHCI
-#define CONFIG_USB_STORAGE
-#define CONFIG_DOS_PARTITION
#endif
/*---ATA PCMCIA ------------------------------------*/
#endif
/*---ATA PCMCIA ------------------------------------*/
@@
-117,7
+110,6
@@
#define CONFIG_PCMCIA_SLOT_A
#define CONFIG_ATAPI 1
#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
/* We run CF in "true ide" mode or a harddrive via pcmcia */
#define CONFIG_IDE_PCMCIA 1
@@
-157,6
+149,5
@@
*/
#undef CONFIG_CMD_IDE
*/
#undef CONFIG_CMD_IDE
-#undef CONFIG_CMD_BEDBUG
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */