summaryrefslogtreecommitdiffstats
path: root/target/linux/mpc83xx
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/mpc83xx')
-rw-r--r--target/linux/mpc83xx/Makefile2
-rwxr-xr-xtarget/linux/mpc83xx/base-files/etc/uci-defaults/02_network (renamed from target/linux/mpc83xx/base-files/etc/uci-defaults/network)0
-rw-r--r--target/linux/mpc83xx/config-3.8 (renamed from target/linux/mpc83xx/config-3.3)57
-rw-r--r--target/linux/mpc83xx/modules.mk25
-rw-r--r--target/linux/mpc83xx/patches-3.8/100-powerpc_create_fit_uImages.patch (renamed from target/linux/mpc83xx/patches-3.3/100-powerpc_create_fit_uImages.patch)19
-rw-r--r--target/linux/mpc83xx/patches-3.8/101-mpc8377_wlan-dts-add-gpio-leds.patch (renamed from target/linux/mpc83xx/patches-3.3/101-mpc8377_wlan-dts-add-gpio-leds.patch)0
-rw-r--r--target/linux/mpc83xx/patches-3.8/110-vitesse_8601.patch (renamed from target/linux/mpc83xx/patches-3.3/110-vitesse_8601.patch)71
-rw-r--r--target/linux/mpc83xx/patches-3.8/111-etsec27_war.patch (renamed from target/linux/mpc83xx/patches-3.3/111-etsec27_war.patch)0
-rw-r--r--target/linux/mpc83xx/patches-3.8/120-ucc_tdm.patch (renamed from target/linux/mpc83xx/patches-3.3/120-ucc_tdm.patch)8
-rw-r--r--target/linux/mpc83xx/patches-3.8/200-powerpc-add-rbppc-support.patch (renamed from target/linux/mpc83xx/patches-3.3/200-powerpc-add-rbppc-support.patch)25
-rw-r--r--target/linux/mpc83xx/patches-3.8/201-powerpc-add-rb_iomap.patch (renamed from target/linux/mpc83xx/patches-3.3/201-powerpc-add-rb_iomap.patch)11
-rw-r--r--target/linux/mpc83xx/patches-3.8/202-ata-add-pata_rbppc_cf-driver.patch (renamed from target/linux/mpc83xx/patches-3.3/202-ata-add-pata_rbppc_cf-driver.patch)4
-rw-r--r--target/linux/mpc83xx/patches-3.8/203-mtd-add-rbppc_nand-driver.patch (renamed from target/linux/mpc83xx/patches-3.3/203-mtd-add-rbppc_nand-driver.patch)9
-rw-r--r--target/linux/mpc83xx/patches-3.8/300-mpc8377_wlan-dts-add-openwrt-hacks.patch (renamed from target/linux/mpc83xx/patches-3.3/300-mpc8377_wlan-dts-add-openwrt-hacks.patch)0
14 files changed, 126 insertions, 105 deletions
diff --git a/target/linux/mpc83xx/Makefile b/target/linux/mpc83xx/Makefile
index 3151213a1..b705c7e12 100644
--- a/target/linux/mpc83xx/Makefile
+++ b/target/linux/mpc83xx/Makefile
@@ -13,7 +13,7 @@ CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=603e
FEATURES:=squashfs targz
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.3.8
+LINUX_VERSION:=3.8.12
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/mpc83xx/base-files/etc/uci-defaults/network b/target/linux/mpc83xx/base-files/etc/uci-defaults/02_network
index a3467aaed..a3467aaed 100755
--- a/target/linux/mpc83xx/base-files/etc/uci-defaults/network
+++ b/target/linux/mpc83xx/base-files/etc/uci-defaults/02_network
diff --git a/target/linux/mpc83xx/config-3.3 b/target/linux/mpc83xx/config-3.8
index 925274c47..caaf3655f 100644
--- a/target/linux/mpc83xx/config-3.3
+++ b/target/linux/mpc83xx/config-3.8
@@ -7,28 +7,31 @@ CONFIG_8xxx_WDT=y
# CONFIG_AMIGAONE is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_ARCH_HAS_ILOG2_U32=y
CONFIG_ARCH_HAS_WALK_MEMORY=y
CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
# CONFIG_ARPD is not set
# CONFIG_ASP834x is not set
CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
CONFIG_ATA=y
CONFIG_AUDIT_ARCH=y
-CONFIG_BCMA_POSSIBLE=y
CONFIG_BLK_DEV_SD=y
# CONFIG_BOOTX_TEXT is not set
CONFIG_BOUNCE=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_CLONE_BACKWARDS=y
CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,yaffs2,jffs2"
CONFIG_CMDLINE_BOOL=y
CONFIG_COMPAT_BRK=y
@@ -40,9 +43,6 @@ CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=m
CONFIG_CRYPTO_AEAD=y
CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLKCIPHER=y
CONFIG_CRYPTO_BLKCIPHER2=y
@@ -59,7 +59,6 @@ CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MANAGER2=y
CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_PCOMP2=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_SHA1=m
CONFIG_CRYPTO_WORKQUEUE=y
@@ -72,6 +71,7 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
CONFIG_DTC=y
+# CONFIG_DW_DMAC is not set
# CONFIG_E200 is not set
CONFIG_EARLY_PRINTK=y
# CONFIG_EMBEDDED6xx is not set
@@ -95,18 +95,22 @@ CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_IO=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_NVRAM=y
CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
# CONFIG_GENERIC_TBSYNC is not set
-CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_TIME_VSYSCALL_OLD=y
CONFIG_GEN_RTC=y
# CONFIG_GEN_RTC_X is not set
+# CONFIG_GE_FPGA is not set
CONFIG_GIANFAR=y
CONFIG_GPIOLIB=y
-CONFIG_GPIO_DEVICE=y
CONFIG_GPIO_MPC8XXX=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HAMRADIO is not set
@@ -117,6 +121,8 @@ CONFIG_HAS_IOPORT=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_HAVE_ARCH_KGDB=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_DMA_ATTRS=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -132,11 +138,12 @@ CONFIG_HAVE_IRQ_WORK=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_MEMBLOCK=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_HAVE_NET_DSA=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_PERF_EVENTS=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-CONFIG_HAVE_SPARSE_IRQ=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HW_RANDOM=y
CONFIG_HZ=250
@@ -163,6 +170,7 @@ CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
CONFIG_IP_ROUTE_CLASSID=y
CONFIG_IP_SCTP=m
+CONFIG_IRQ_DOMAIN=y
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_ISA_DMA_API=y
# CONFIG_ISDN is not set
@@ -185,6 +193,7 @@ CONFIG_MDIO_BITBANG=y
CONFIG_MDIO_BOARDINFO=y
CONFIG_MDIO_GPIO=y
# CONFIG_MMIO_NVRAM is not set
+CONFIG_MODULES_USE_ELF_RELA=y
# CONFIG_MPC512X_DMA is not set
CONFIG_MPC830x_RDB=y
CONFIG_MPC831x_RDB=y
@@ -204,14 +213,15 @@ CONFIG_MTD_BLOCK2MTD=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_ECC=y
CONFIG_MTD_NAND_FSL_ELBC=y
+# CONFIG_MTD_NAND_FSL_IFC is not set
CONFIG_MTD_NAND_FSL_UPM=y
CONFIG_MTD_NAND_RB_PPC=y
CONFIG_MTD_OF_PARTS=y
CONFIG_MTD_PHYSMAP_OF=y
# CONFIG_MTD_SM_COMMON is not set
CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_BEB_RESERVE=1
-# CONFIG_MTD_UBI_DEBUG is not set
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_WL_THRESHOLD=4096
# CONFIG_NEED_DMA_MAP_STATE is not set
@@ -251,25 +261,24 @@ CONFIG_NR_IRQS=512
CONFIG_OF=y
CONFIG_OF_ADDRESS=y
CONFIG_OF_DEVICE=y
-CONFIG_OF_DYNAMIC=y
CONFIG_OF_EARLY_FLATTREE=y
CONFIG_OF_FLATTREE=y
CONFIG_OF_GPIO=y
CONFIG_OF_IRQ=y
CONFIG_OF_MDIO=y
+CONFIG_OF_MTD=y
CONFIG_OF_NET=y
CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
-CONFIG_OF_SPI=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xc0000000
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_PATA_RB_PPC=y
CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
CONFIG_PCI_MSI=y
+CONFIG_PERCPU_RWSEM=y
CONFIG_PHYLIB=y
CONFIG_PHYSICAL_START=0x00000000
CONFIG_PPC=y
@@ -286,7 +295,7 @@ CONFIG_PPC_BOOK3S_32=y
# CONFIG_PPC_CELL is not set
# CONFIG_PPC_CELL_NATIVE is not set
# CONFIG_PPC_CHRP is not set
-# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_CLOCK=y
# CONFIG_PPC_DCR_MMIO is not set
# CONFIG_PPC_DCR_NATIVE is not set
CONFIG_PPC_DISABLE_WERROR=y
@@ -324,6 +333,7 @@ CONFIG_PPC_UDBG_16550=y
# CONFIG_PREEMPT_RCU is not set
CONFIG_PROC_DEVICETREE=y
CONFIG_PROC_PAGE_MONITOR=y
+# CONFIG_PTP_1588_CLOCK_GIANFAR is not set
CONFIG_QE_GPIO=y
CONFIG_QUICC_ENGINE=y
CONFIG_RB_IOMAP=y
@@ -335,11 +345,13 @@ CONFIG_SCSI=y
# CONFIG_SCSI_LOWLEVEL is not set
# CONFIG_SCSI_MULTI_LUN is not set
# CONFIG_SCSI_PROC_FS is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_COOKIE_HMAC_SHA1 is not set
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_HMAC_MD5=y
-# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
CONFIG_SERIAL_8250_FSL=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_QE=y
@@ -352,16 +364,19 @@ CONFIG_SERIO_SERPORT=y
CONFIG_SIMPLE_GPIO=y
# CONFIG_SLAB is not set
CONFIG_SLOB=y
+CONFIG_SOCK_DIAG=y
CONFIG_SPARSE_IRQ=y
CONFIG_SPI=y
CONFIG_SPI_MASTER=y
# CONFIG_SWAP is not set
# CONFIG_SWIOTLB is not set
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
CONFIG_TASK_SIZE=0xc0000000
# CONFIG_TAU is not set
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TICK_CPU_ACCOUNTING=y
CONFIG_TMPFS_POSIX_ACL=y
# CONFIG_UBIFS_FS is not set
CONFIG_UCC=y
@@ -370,13 +385,17 @@ CONFIG_UCC_GETH=y
CONFIG_UCC_SLOW=y
# CONFIG_UCC_TDM is not set
# CONFIG_UGETH_TX_ON_DEMAND is not set
+CONFIG_UIDGID_CONVERTED=y
+CONFIG_USB_ARCH_HAS_XHCI=y
CONFIG_VIA_VELOCITY=y
CONFIG_VITESSE_PHY=y
CONFIG_VITESSE_PHY_8601_SKEW=y
CONFIG_WAN_ROUTER=m
CONFIG_WORD_SIZE=32
+CONFIG_XFRM_ALGO=m
CONFIG_XFRM_IPCOMP=m
-CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_POWERPC=y
CONFIG_YAFFS_9BYTE_TAGS=y
# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
CONFIG_YAFFS_AUTO_YAFFS2=y
diff --git a/target/linux/mpc83xx/modules.mk b/target/linux/mpc83xx/modules.mk
new file mode 100644
index 000000000..dd65d112f
--- /dev/null
+++ b/target/linux/mpc83xx/modules.mk
@@ -0,0 +1,25 @@
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define KernelPackage/ata-rbppc-cf
+ SUBMENU:=$(BLOCK_MENU)
+ TITLE:=RB600 Compact Flash support
+ DEPENDS:=@TARGET_mpc83xx
+ KCONFIG:= \
+ CONFIG_PATA_PLATFORM \
+ CONFIG_PATA_RB_PPC
+ FILES:=\
+ $(LINUX_DIR)/drivers/ata/pata_rbppc_cf.ko
+ AUTOLOAD:=$(call AutoLoad,41,pata_rbppc_cf,1)
+ $(call AddDepends/ata)
+endef
+
+define KernelPackage/ata-rbppc-cf/description
+ RB600 Compact Flash support.
+endef
+
+$(eval $(call KernelPackage,ata-rbppc-cf))
diff --git a/target/linux/mpc83xx/patches-3.3/100-powerpc_create_fit_uImages.patch b/target/linux/mpc83xx/patches-3.8/100-powerpc_create_fit_uImages.patch
index 1389661e0..9cba98461 100644
--- a/target/linux/mpc83xx/patches-3.3/100-powerpc_create_fit_uImages.patch
+++ b/target/linux/mpc83xx/patches-3.8/100-powerpc_create_fit_uImages.patch
@@ -1,6 +1,6 @@
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
-@@ -165,7 +165,9 @@ all: zImage
+@@ -155,7 +155,9 @@ all: zImage
# With make 3.82 we cannot mix normal and wildcard targets
BOOT_TARGETS1 := zImage zImage.initrd uImage
@@ -11,7 +11,7 @@
PHONY += $(BOOT_TARGETS1) $(BOOT_TARGETS2)
-@@ -198,6 +200,7 @@ define archhelp
+@@ -188,6 +190,7 @@ define archhelp
@echo '* zImage - Build default images selected by kernel config'
@echo ' zImage.* - Compressed kernel image (arch/$(ARCH)/boot/zImage.*)'
@echo ' uImage - U-Boot native image format'
@@ -21,7 +21,7 @@
@echo ' dtbImage.<dt> - zImage with an embedded device tree blob'
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
-@@ -18,6 +18,7 @@ kernel-vmlinux.strip.c
+@@ -14,6 +14,7 @@ kernel-vmlinux.strip.c
kernel-vmlinux.strip.gz
mktree
uImage
@@ -31,7 +31,7 @@
treeImage.*
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
-@@ -326,6 +326,9 @@ $(obj)/uImage.initrd.%: vmlinux $(obj)/%
+@@ -338,6 +338,9 @@ $(obj)/uImage.initrd.%: vmlinux $(obj)/%
$(obj)/uImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
$(call if_changed,wrap,uboot-$*,,$(obj)/$*.dtb)
@@ -41,15 +41,14 @@
$(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
-@@ -363,7 +366,7 @@ install: $(CONFIGURE) $(addprefix $(obj)
+@@ -375,6 +378,7 @@ install: $(CONFIGURE) $(addprefix $(obj)
# anything not in $(targets)
clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
-- zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
-+ uImage.* zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
- zImage.iseries zImage.miboot zImage.pmac zImage.pseries \
++ uImage.* \
+ zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
+ zImage.miboot zImage.pmac zImage.pseries \
zImage.maple simpleImage.* otheros.bld *.dtb
-
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -47,6 +47,9 @@ CROSS=
@@ -62,7 +61,7 @@
# directory for object and other files used by this script
object=arch/powerpc/boot
objbin=$object
-@@ -332,6 +335,21 @@ uboot-obs600)
+@@ -336,6 +339,21 @@ uboot-obs600)
if [ -z "$cacheit" ]; then
rm -f "$vmz"
fi
diff --git a/target/linux/mpc83xx/patches-3.3/101-mpc8377_wlan-dts-add-gpio-leds.patch b/target/linux/mpc83xx/patches-3.8/101-mpc8377_wlan-dts-add-gpio-leds.patch
index 5c3df778a..5c3df778a 100644
--- a/target/linux/mpc83xx/patches-3.3/101-mpc8377_wlan-dts-add-gpio-leds.patch
+++ b/target/linux/mpc83xx/patches-3.8/101-mpc8377_wlan-dts-add-gpio-leds.patch
diff --git a/target/linux/mpc83xx/patches-3.3/110-vitesse_8601.patch b/target/linux/mpc83xx/patches-3.8/110-vitesse_8601.patch
index 56ac1b61b..09cab1a33 100644
--- a/target/linux/mpc83xx/patches-3.3/110-vitesse_8601.patch
+++ b/target/linux/mpc83xx/patches-3.8/110-vitesse_8601.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -59,6 +59,12 @@ config VITESSE_PHY
+@@ -69,6 +69,12 @@ config VITESSE_PHY
---help---
Currently supports the vsc8244
@@ -27,7 +27,15 @@
/* Vitesse Interrupt Mask Register */
#define MII_VSC8244_IMASK 0x19
#define MII_VSC8244_IMASK_IEN 0x8000
-@@ -98,6 +103,30 @@ static int vsc824x_config_init(struct ph
+@@ -56,6 +61,7 @@
+
+ #define PHY_ID_VSC8244 0x000fc6c0
+ #define PHY_ID_VSC8221 0x000fc550
++#define PHY_ID_VSC8601 0x00070420
+
+ MODULE_DESCRIPTION("Vitesse PHY driver");
+ MODULE_AUTHOR("Kriston Carson");
+@@ -98,10 +104,34 @@ static int vsc824x_config_init(struct ph
return err;
}
@@ -58,13 +66,18 @@
static int vsc824x_ack_interrupt(struct phy_device *phydev)
{
int err = 0;
-@@ -153,6 +182,21 @@ static struct phy_driver vsc8244_driver
- .driver = { .owner = THIS_MODULE,},
- };
-
-+/* Vitesse 8601 */
-+static struct phy_driver vsc8601_driver = {
-+ .phy_id = 0x00070420,
+-
++
+ /*
+ * Don't bother to ACK the interrupts if interrupts
+ * are disabled. The 824x cannot clear the interrupts
+@@ -177,6 +207,19 @@ static struct phy_driver vsc82xx_driver[
+ .ack_interrupt = &vsc824x_ack_interrupt,
+ .config_intr = &vsc82xx_config_intr,
+ .driver = { .owner = THIS_MODULE,},
++}, {
++ /* Vitesse 8601 */
++ .phy_id = PHY_ID_VSC8601,
+ .name = "Vitesse VSC8601",
+ .phy_id_mask = 0x000ffff8,
+ .features = PHY_GBIT_FEATURES,
@@ -75,42 +88,6 @@
+ .ack_interrupt = &vsc824x_ack_interrupt,
+ .config_intr = &vsc82xx_config_intr,
+ .driver = { .owner = THIS_MODULE,},
-+};
-+
- static int vsc8221_config_init(struct phy_device *phydev)
- {
- int err;
-@@ -186,10 +230,23 @@ static int __init vsc82xx_init(void)
-
- err = phy_driver_register(&vsc8244_driver);
- if (err < 0)
-- return err;
-+ goto err;
-+
- err = phy_driver_register(&vsc8221_driver);
- if (err < 0)
-- phy_driver_unregister(&vsc8244_driver);
-+ goto err1;
-+
-+ err = phy_driver_register(&vsc8601_driver);
-+ if (err < 0)
-+ goto err2;
-+
-+ return 0;
-+
-+err2:
-+ phy_driver_unregister(&vsc8221_driver);
-+err1:
-+ phy_driver_unregister(&vsc8244_driver);
-+err:
- return err;
- }
-
-@@ -197,6 +254,7 @@ static void __exit vsc82xx_exit(void)
- {
- phy_driver_unregister(&vsc8244_driver);
- phy_driver_unregister(&vsc8221_driver);
-+ phy_driver_unregister(&vsc8601_driver);
- }
+ } };
- module_init(vsc82xx_init);
+ static int __init vsc82xx_init(void)
diff --git a/target/linux/mpc83xx/patches-3.3/111-etsec27_war.patch b/target/linux/mpc83xx/patches-3.8/111-etsec27_war.patch
index 44686ab51..44686ab51 100644
--- a/target/linux/mpc83xx/patches-3.3/111-etsec27_war.patch
+++ b/target/linux/mpc83xx/patches-3.8/111-etsec27_war.patch
diff --git a/target/linux/mpc83xx/patches-3.3/120-ucc_tdm.patch b/target/linux/mpc83xx/patches-3.8/120-ucc_tdm.patch
index bfad0e965..2fe64c7b0 100644
--- a/target/linux/mpc83xx/patches-3.3/120-ucc_tdm.patch
+++ b/target/linux/mpc83xx/patches-3.8/120-ucc_tdm.patch
@@ -1250,11 +1250,11 @@
obj-$(CONFIG_ATMEL_TCLIB) += atmel_tclib.o
+obj-$(CONFIG_UCC_TDM) += ucc_tdm.o
obj-$(CONFIG_BMP085) += bmp085.o
- obj-$(CONFIG_ICS932S401) += ics932s401.o
- obj-$(CONFIG_LKDTM) += lkdtm.o
+ obj-$(CONFIG_BMP085_I2C) += bmp085-i2c.o
+ obj-$(CONFIG_BMP085_SPI) += bmp085-spi.o
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
-@@ -211,6 +211,20 @@ config ATMEL_SSC
+@@ -202,6 +202,20 @@ config ATMEL_SSC
If unsure, say N.
@@ -1290,7 +1290,7 @@
struct ucc_fast_private {
--- a/arch/powerpc/include/asm/qe.h
+++ b/arch/powerpc/include/asm/qe.h
-@@ -669,6 +669,14 @@ struct ucc_slow_pram {
+@@ -670,6 +670,14 @@ struct ucc_slow_pram {
#define UCC_GETH_UCCE_RXF1 0x00000002
#define UCC_GETH_UCCE_RXF0 0x00000001
diff --git a/target/linux/mpc83xx/patches-3.3/200-powerpc-add-rbppc-support.patch b/target/linux/mpc83xx/patches-3.8/200-powerpc-add-rbppc-support.patch
index 87274bedf..662dedf2b 100644
--- a/target/linux/mpc83xx/patches-3.3/200-powerpc-add-rbppc-support.patch
+++ b/target/linux/mpc83xx/patches-3.8/200-powerpc-add-rbppc-support.patch
@@ -1,15 +1,16 @@
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
-@@ -76,7 +76,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82
- cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c \
- cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
- fixed-head.S ep88xc.c ep405.c cuboot-c2k.c \
-- cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
-+ cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c rb600.c rb333.c \
- cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
- virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
- cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \
-@@ -242,6 +242,8 @@ image-$(CONFIG_MPC834x_ITX) += cuImage.
+@@ -89,7 +89,8 @@ src-plat-$(CONFIG_44x) += treeboot-ebony
+ src-plat-$(CONFIG_8xx) += cuboot-8xx.c fixed-head.S ep88xc.c redboot-8xx.c
+ src-plat-$(CONFIG_PPC_MPC52xx) += cuboot-52xx.c
+ src-plat-$(CONFIG_PPC_82xx) += cuboot-pq2.c fixed-head.S ep8248e.c cuboot-824x.c
+-src-plat-$(CONFIG_PPC_83xx) += cuboot-83xx.c fixed-head.S redboot-83xx.c
++src-plat-$(CONFIG_PPC_83xx) += cuboot-83xx.c fixed-head.S redboot-83xx.c \
++ rb600.c rb333.c
+ src-plat-$(CONFIG_FSL_SOC_BOOKE) += cuboot-85xx.c cuboot-85xx-cpm2.c
+ src-plat-$(CONFIG_EMBEDDED6xx) += cuboot-pq2.c cuboot-mpc7448hpc2.c \
+ cuboot-c2k.c gamecube-head.S \
+@@ -261,6 +262,8 @@ image-$(CONFIG_MPC834x_ITX) += cuImage.
image-$(CONFIG_MPC834x_MDS) += cuImage.mpc834x_mds
image-$(CONFIG_MPC836x_MDS) += cuImage.mpc836x_mds
image-$(CONFIG_ASP834x) += dtbImage.asp834x-redboot
@@ -379,8 +380,8 @@
+}
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
-@@ -215,7 +215,7 @@ ps3)
- link_address=''
+@@ -217,7 +217,7 @@ ps3)
+ make_space=n
pie=
;;
-ep88xc|ep405|ep8248e)
diff --git a/target/linux/mpc83xx/patches-3.3/201-powerpc-add-rb_iomap.patch b/target/linux/mpc83xx/patches-3.8/201-powerpc-add-rb_iomap.patch
index 81a874278..d2da62a75 100644
--- a/target/linux/mpc83xx/patches-3.3/201-powerpc-add-rb_iomap.patch
+++ b/target/linux/mpc83xx/patches-3.8/201-powerpc-add-rb_iomap.patch
@@ -1,6 +1,6 @@
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
-@@ -125,9 +125,11 @@ obj-$(CONFIG_FSL_EMB_PERF_EVENT_E500) +=
+@@ -118,9 +118,11 @@ obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.
obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o
@@ -24,7 +24,7 @@
obj-$(CONFIG_MPC836x_MDS) += mpc836x_mds.o
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
-@@ -175,6 +175,10 @@ config PPC_INDIRECT_MMIO
+@@ -192,6 +192,10 @@ config PPC_INDIRECT_MMIO
config PPC_IO_WORKAROUNDS
bool
@@ -37,12 +37,13 @@
menu "CPU Frequency drivers"
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
-@@ -65,3 +65,5 @@ obj-$(CONFIG_PPC_SCOM) += scom.o
- subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
-
+@@ -69,3 +69,6 @@ subdir-ccflags-$(CONFIG_PPC_WERROR) := -
obj-$(CONFIG_PPC_XICS) += xics/
+
+ obj-$(CONFIG_GE_FPGA) += ge/
+
+obj-$(CONFIG_RB_IOMAP) += rb_iomap.o
++
--- /dev/null
+++ b/arch/powerpc/sysdev/rb_iomap.c
@@ -0,0 +1,204 @@
diff --git a/target/linux/mpc83xx/patches-3.3/202-ata-add-pata_rbppc_cf-driver.patch b/target/linux/mpc83xx/patches-3.8/202-ata-add-pata_rbppc_cf-driver.patch
index 2c56b29a6..2a6c71013 100644
--- a/target/linux/mpc83xx/patches-3.3/202-ata-add-pata_rbppc_cf-driver.patch
+++ b/target/linux/mpc83xx/patches-3.8/202-ata-add-pata_rbppc_cf-driver.patch
@@ -1,6 +1,6 @@
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
-@@ -899,5 +899,12 @@ config PATA_LEGACY
+@@ -916,5 +916,12 @@ config PATA_LEGACY
If unsure, say N.
@@ -15,7 +15,7 @@
endif # ATA
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
-@@ -89,6 +89,7 @@ obj-$(CONFIG_PATA_PALMLD) += pata_palmld
+@@ -91,6 +91,7 @@ obj-$(CONFIG_PATA_PALMLD) += pata_palmld
obj-$(CONFIG_PATA_PLATFORM) += pata_platform.o
obj-$(CONFIG_PATA_OF_PLATFORM) += pata_of_platform.o
obj-$(CONFIG_PATA_RB532) += pata_rb532_cf.o
diff --git a/target/linux/mpc83xx/patches-3.3/203-mtd-add-rbppc_nand-driver.patch b/target/linux/mpc83xx/patches-3.8/203-mtd-add-rbppc_nand-driver.patch
index b22f2962e..5e9083716 100644
--- a/target/linux/mpc83xx/patches-3.3/203-mtd-add-rbppc_nand-driver.patch
+++ b/target/linux/mpc83xx/patches-3.8/203-mtd-add-rbppc_nand-driver.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
-@@ -436,6 +436,13 @@ config MTD_NAND_PLATFORM
+@@ -463,6 +463,13 @@ config MTD_NAND_PLATFORM
devices. You will need to provide platform-specific functions
via platform_data.
@@ -16,7 +16,7 @@
depends on USB
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
-@@ -33,6 +33,7 @@ obj-$(CONFIG_MTD_NAND_CM_X270) += cmx27
+@@ -34,6 +34,7 @@ obj-$(CONFIG_MTD_NAND_CM_X270) += cmx27
obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx_nand.o
obj-$(CONFIG_MTD_NAND_TMIO) += tmio_nand.o
obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o
@@ -26,7 +26,7 @@
obj-$(CONFIG_MTD_NAND_ORION) += orion_nand.o
--- /dev/null
+++ b/drivers/mtd/nand/rbppc_nand.c
-@@ -0,0 +1,251 @@
+@@ -0,0 +1,250 @@
+/*
+ * Copyright (C) 2008-2009 Noah Fontes <nfontes@transtruct.org>
+ * Copyright (C) 2009 Michael Guntsche <mike@it-loops.com>
@@ -146,7 +146,7 @@
+
+static unsigned init_ok = 0;
+
-+static int __devinit rbppc_nand_probe(struct platform_device *pdev)
++static int rbppc_nand_probe(struct platform_device *pdev)
+{
+ struct device_node *gpio;
+ struct device_node *nnand;
@@ -227,7 +227,6 @@
+ rnand.ecc.mode = NAND_ECC_SOFT;
+ rnand.ecc.layout = &rbppc_nand_oob_16;
+ rnand.chip_delay = 25;
-+ rnand.options |= NAND_NO_AUTOINCR;
+ rmtd.priv = &rnand;
+ rmtd.owner = THIS_MODULE;
+
diff --git a/target/linux/mpc83xx/patches-3.3/300-mpc8377_wlan-dts-add-openwrt-hacks.patch b/target/linux/mpc83xx/patches-3.8/300-mpc8377_wlan-dts-add-openwrt-hacks.patch
index 3b7ca9286..3b7ca9286 100644
--- a/target/linux/mpc83xx/patches-3.3/300-mpc8377_wlan-dts-add-openwrt-hacks.patch
+++ b/target/linux/mpc83xx/patches-3.8/300-mpc8377_wlan-dts-add-openwrt-hacks.patch