author | Markus Klotzbuecher <mk@denx.de> | |
Fri, 23 Mar 2007 08:52:17 +0000 (09:52 +0100) | ||
committer | Markus Klotzbuecher <mk@pollux.denx.de> | |
Fri, 23 Mar 2007 08:52:17 +0000 (09:52 +0100) |
1 | 2 | |||
---|---|---|---|---|
CHANGELOG | patch | | diff1 | | diff2 | | blob | history |
Makefile | patch | | diff1 | | diff2 | | blob | history |
README | patch | | diff1 | | diff2 | | blob | history |
board/trab/auto_update.c | patch | | diff1 | | diff2 | | blob | history |
cpu/ppc4xx/Makefile | patch | | diff1 | | diff2 | | blob | history |
drivers/Makefile | patch | | diff1 | | diff2 | | blob | history |
include/configs/IceCube.h | patch | | diff1 | | diff2 | | blob | history |
include/configs/TQM5200.h | patch | | diff1 | | diff2 | | blob | history |
include/configs/yosemite.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc CHANGELOG
Simple merge
diff --cc Makefile
Simple merge
diff --cc README
Simple merge
diff --cc board/trab/auto_update.c
Simple merge
diff --cc cpu/ppc4xx/Makefile
index 96f0f62eb6094ea149d6b45f0d767859285a1e56,87c6230dc9950e8b5875ac2580173655e93a9047..1347e0f9f09cd8e2ae276185d49adf9e1c176f9a
--- 1/cpu/ppc4xx/Makefile
--- 2/cpu/ppc4xx/Makefile
+++ b/cpu/ppc4xx/Makefile
bedbug_405.o commproc.o \
cpu.o cpu_init.o i2c.o interrupts.o \
miiphy.o ndfc.o sdram.o serial.o \
- spd_sdram.o speed.o traps.o usb_ohci.o usbdev.o usb.o
+ 40x_spd_sdram.o 44x_spd_ddr.o 44x_spd_ddr2.o speed.o \
- tlb.o traps.o usb_ohci.o usbdev.o \
++ tlb.o traps.o usb_ohci.o usbdev.o usb.o \
+ 440spe_pcie.o
SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --cc drivers/Makefile
index fffc22a5e1d72451739d67ffe17ba3df105c3fb1,b89b06f7b79b61863ae3730b1b1613ab2c9e897b..0ca400c6821a9b04ef2210b97e02894197cae56d
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
serial.o serial_max3100.o \
serial_pl010.o serial_pl011.o serial_xuartlite.o \
sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
- status_led.o sym53c8xx.o ahci.o \
+ status_led.o sym53c8xx.o systemace.o ahci.o \
ti_pci1410a.o tigon3.o tsec.o \
- usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbtty.o \
+ usb_ohci.o \
+ usbdcore.o usbdcore_ep0.o usbdcore_mpc8xx.o usbdcore_omap1510.o \
+ usbtty.o \
videomodes.o w83c553f.o \
ks8695eth.o \
pxa_pcmcia.o mpc8xx_pcmcia.o tqm8xx_pcmcia.o \
diff --cc include/configs/IceCube.h
Simple merge
diff --cc include/configs/TQM5200.h
Simple merge
diff --cc include/configs/yosemite.h
index 818462eedee9413bae8ae525f4d1d77d1a56d812,9f98500a6dcc1b98c2f35b0b12ce0e4d697b4284..b59f75b9d0f9dbb392ca81f4ad97826b32c7a116
#ifdef CONFIG_440EP
/* USB */
- #define CONFIG_USB_OHCI
+ #define CONFIG_USB_OHCI_NEW
#define CONFIG_USB_STORAGE
-/*Comment this out to enable USB 1.1 device*/
+ #undef CFG_USB_OHCI_BOARD_INIT
+ #define CFG_USB_OHCI_CPU_INIT 1
+ #define CFG_USB_OHCI_REGS_BASE (CFG_PERIPHERAL_BASE | 0x1000)
+ #define CFG_USB_OHCI_SLOT_NAME "ppc440"
+ #define CFG_USB_OHCI_MAX_ROOT_PORTS 15
+
+/* Comment this out to enable USB 1.1 device */
#define USB_2_0_DEVICE
-#endif /*CONFIG_440EP*/
+
+#define CMD_USB (CFG_CMD_USB | CFG_CMD_FAT | CFG_CMD_EXT2)
+
+#define CONFIG_SUPPORT_VFAT
+#else
+#define CMD_USB 0 /* no USB on 440GR */
+#endif /* CONFIG_440EP */
#ifdef DEBUG
#define CONFIG_PANIC_HANG