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 git://git.denx.de/u-boot-mpc85xx
[platform/kernel/u-boot.git]
/
include
/
configs
/
acadia.h
diff --git
a/include/configs/acadia.h
b/include/configs/acadia.h
index
2f53d73
..
9f35e71
100644
(file)
--- a/
include/configs/acadia.h
+++ b/
include/configs/acadia.h
@@
-32,7
+32,6
@@
#define CONFIG_SYS_CLK_FREQ ((in8(CONFIG_SYS_CPLD_BASE + 0) == 0x0c) ? \
66666666 : 33333000)
#define CONFIG_SYS_CLK_FREQ ((in8(CONFIG_SYS_CPLD_BASE + 0) == 0x0c) ? \
66666666 : 33333000)
-#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_MISC_INIT_F 1 /* Call misc_init_f */
#define CONFIG_NO_SERIAL_EEPROM
#define CONFIG_MISC_INIT_F 1 /* Call misc_init_f */
#define CONFIG_NO_SERIAL_EEPROM
@@
-153,12
+152,8
@@
""
#define CONFIG_USB_OHCI
""
#define CONFIG_USB_OHCI
-#define CONFIG_USB_STORAGE
/* Partitions */
/* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
#define CONFIG_SUPPORT_VFAT
#define CONFIG_SUPPORT_VFAT
@@
-167,7
+162,6
@@
*/
#define CONFIG_CMD_DTT
#define CONFIG_CMD_NAND
*/
#define CONFIG_CMD_DTT
#define CONFIG_CMD_NAND
-#define CONFIG_CMD_USB
/*-----------------------------------------------------------------------
* NAND FLASH
/*-----------------------------------------------------------------------
* NAND FLASH