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 /home/stefan/git/u-boot/u-boot into for-1.3.2-ver2
[platform/kernel/u-boot.git]
/
include
/
configs
/
IceCube.h
diff --git
a/include/configs/IceCube.h
b/include/configs/IceCube.h
index
cc902c8
..
4c16d22
100644
(file)
--- a/
include/configs/IceCube.h
+++ b/
include/configs/IceCube.h
@@
-84,10
+84,14
@@
#define CONFIG_ISO_PARTITION
/* USB */
#define CONFIG_ISO_PARTITION
/* USB */
-#if 1
-#define CONFIG_USB_OHCI
+#define CONFIG_USB_OHCI_NEW
#define CONFIG_USB_STORAGE
#define CONFIG_USB_STORAGE
-#endif
+#define CFG_OHCI_BE_CONTROLLER
+#undef CFG_USB_OHCI_BOARD_INIT
+#define CFG_USB_OHCI_CPU_INIT 1
+#define CFG_USB_OHCI_REGS_BASE MPC5XXX_USB
+#define CFG_USB_OHCI_SLOT_NAME "mpc5200"
+#define CFG_USB_OHCI_MAX_ROOT_PORTS 15
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
@@
-174,12
+178,9
@@
#endif /* CONFIG_MPC5200 */
/* pass open firmware flat tree */
#endif /* CONFIG_MPC5200 */
/* pass open firmware flat tree */
-#define CONFIG_OF_
FLAT_TREE
1
+#define CONFIG_OF_
LIBFDT
1
#define CONFIG_OF_BOARD_SETUP 1
#define CONFIG_OF_BOARD_SETUP 1
-/* maximum size of the flat tree (8K) */
-#define OF_FLAT_TREE_MAX_SIZE 8192
-
#define OF_CPU "PowerPC,5200@0"
#define OF_SOC "soc5200@f0000000"
#define OF_TBCLK (bd->bi_busfreq / 4)
#define OF_CPU "PowerPC,5200@0"
#define OF_SOC "soc5200@f0000000"
#define OF_TBCLK (bd->bi_busfreq / 4)