diff options
Diffstat (limited to 'target/linux/ppc40x')
-rw-r--r-- | target/linux/ppc40x/Makefile | 2 | ||||
-rw-r--r-- | target/linux/ppc40x/config-3.8 (renamed from target/linux/ppc40x/config-3.3) | 39 | ||||
-rw-r--r-- | target/linux/ppc40x/patches-3.8/003-powerpc-add-EBC_BXCR-defines.patch (renamed from target/linux/ppc40x/patches-3.3/003-powerpc-add-EBC_BXCR-defines.patch) | 0 | ||||
-rw-r--r-- | target/linux/ppc40x/patches-3.8/004-magicbox.patch (renamed from target/linux/ppc40x/patches-3.3/004-magicbox.patch) | 27 | ||||
-rw-r--r-- | target/linux/ppc40x/patches-3.8/005-openrb.patch (renamed from target/linux/ppc40x/patches-3.3/005-openrb.patch) | 26 | ||||
-rw-r--r-- | target/linux/ppc40x/patches-3.8/101-pata-magicbox-cf-driver.patch (renamed from target/linux/ppc40x/patches-3.3/101-pata-magicbox-cf-driver.patch) | 8 | ||||
-rw-r--r-- | target/linux/ppc40x/patches-3.8/110-kilauea_openwrt_flashmap.patch (renamed from target/linux/ppc40x/patches-3.3/110-kilauea_openwrt_flashmap.patch) | 0 | ||||
-rw-r--r-- | target/linux/ppc40x/patches-3.8/120-usb-isp116x-hcd-add-of-binding.patch (renamed from target/linux/ppc40x/patches-3.3/120-usb-isp116x-hcd-add-of-binding.patch) | 53 | ||||
-rw-r--r-- | target/linux/ppc40x/patches-3.8/121-usb-isp116x-hcd-ppc405-register-access.patch (renamed from target/linux/ppc40x/patches-3.3/121-usb-isp116x-hcd-ppc405-register-access.patch) | 0 |
9 files changed, 86 insertions, 69 deletions
diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index 1554bcdaf..7426422e6 100644 --- a/target/linux/ppc40x/Makefile +++ b/target/linux/ppc40x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=405 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/ppc40x/config-3.3 b/target/linux/ppc40x/config-3.8 index 683c854d3..701bb6437 100644 --- a/target/linux/ppc40x/config-3.3 +++ b/target/linux/ppc40x/config-3.8 @@ -8,22 +8,24 @@ CONFIG_4xx_SOC=y # CONFIG_ADVANCED_OPTIONS 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_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_AUDIT_ARCH=y -CONFIG_BCMA_POSSIBLE=y -CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=3 CONFIG_BOUNCE=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_CLONE_BACKWARDS=y CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd" CONFIG_CMDLINE_BOOL=y CONFIG_CONSISTENT_SIZE=0x00200000 @@ -42,14 +44,19 @@ 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 is not set +# CONFIG_GE_FPGA is not set CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_HAS_DMA=y @@ -59,6 +66,7 @@ CONFIG_HAS_IOPORT=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DYNAMIC_FTRACE=y @@ -74,11 +82,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_HOTFOOT is not set CONFIG_HW_RANDOM=y @@ -94,8 +103,9 @@ CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256 CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0 CONFIG_IBM_EMAC_TXB=256 CONFIG_INITRAMFS_SOURCE="" -CONFIG_IOMMU_HELPER=y +# CONFIG_IOMMU_HELPER is not set # CONFIG_IPIC is not set +CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_ISA_DMA_API=y CONFIG_KERNEL_START=0xc0000000 @@ -107,6 +117,7 @@ CONFIG_MAGICBOX=y # CONFIG_MATH_EMULATION is not set CONFIG_MAX_ACTIVE_REGIONS=32 # CONFIG_MMIO_NVRAM is not set +CONFIG_MODULES_USE_ELF_RELA=y # CONFIG_MPIC is not set # CONFIG_MPIC_U3_HT_IRQS is not set # CONFIG_MPIC_WEIRD is not set @@ -126,11 +137,11 @@ 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_MTD=y CONFIG_OF_NET=y CONFIG_OF_PCI=y CONFIG_OF_PCI_IRQ=y @@ -143,6 +154,7 @@ CONFIG_PCIEPORTBUS=y CONFIG_PCI_DISABLE_COMMON_QUIRKS=y CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y +CONFIG_PERCPU_RWSEM=y CONFIG_PHYSICAL_START=0x00000000 CONFIG_PPC=y CONFIG_PPC32=y @@ -189,17 +201,18 @@ CONFIG_PROC_DEVICETREE=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_SCHED_HRTICK=y # CONFIG_SCSI_DMA is not set -# CONFIG_SERIAL_8250_DETECT_IRQ is not set CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_FSL=y -# CONFIG_SERIAL_8250_MANY_PORTS is not set -# CONFIG_SERIAL_8250_RSA is not set CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_SLAB is not set CONFIG_SLUB=y -CONFIG_SWIOTLB=y +CONFIG_SPARSE_IRQ=y +# CONFIG_SWIOTLB is not set +CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_TASK_SIZE=0xc0000000 +CONFIG_TICK_CPU_ACCOUNTING=y +CONFIG_UIDGID_CONVERTED=y CONFIG_USB=m CONFIG_USB_ARCH_HAS_XHCI=y CONFIG_USB_COMMON=m @@ -208,6 +221,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_PCI=y +# CONFIG_USB_OHCI_HCD_PLATFORM is not set CONFIG_USB_OHCI_HCD_PPC_OF=y CONFIG_USB_OHCI_HCD_PPC_OF_BE=y CONFIG_USB_SUPPORT=y @@ -216,4 +230,5 @@ CONFIG_USB_SUPPORT=y CONFIG_WORD_SIZE=32 # CONFIG_XILINX_SYSACE is not set # CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set -CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_POWERPC=y diff --git a/target/linux/ppc40x/patches-3.3/003-powerpc-add-EBC_BXCR-defines.patch b/target/linux/ppc40x/patches-3.8/003-powerpc-add-EBC_BXCR-defines.patch index 660b8bcd4..660b8bcd4 100644 --- a/target/linux/ppc40x/patches-3.3/003-powerpc-add-EBC_BXCR-defines.patch +++ b/target/linux/ppc40x/patches-3.8/003-powerpc-add-EBC_BXCR-defines.patch diff --git a/target/linux/ppc40x/patches-3.3/004-magicbox.patch b/target/linux/ppc40x/patches-3.8/004-magicbox.patch index 0dade8136..75ff88979 100644 --- a/target/linux/ppc40x/patches-3.3/004-magicbox.patch +++ b/target/linux/ppc40x/patches-3.8/004-magicbox.patch @@ -397,16 +397,17 @@ $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 $(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405 $(obj)/treeboot-currituck.o: BOOTCFLAGS += -mcpu=405 -@@ -81,7 +82,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82 - virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \ - cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \ - gamecube-head.S gamecube.c wii-head.S wii.c treeboot-iss4xx.c \ -- treeboot-currituck.c -+ treeboot-currituck.c cuboot-magicbox.c - src-boot := $(src-wlib) $(src-plat) empty.c - - src-boot := $(addprefix $(obj)/, $(src-boot)) -@@ -202,6 +203,7 @@ image-$(CONFIG_HOTFOOT) += cuImage.hot +@@ -78,7 +79,8 @@ src-plat-y := of.c + src-plat-$(CONFIG_40x) += fixed-head.S ep405.c cuboot-hotfoot.c \ + treeboot-walnut.c cuboot-acadia.c \ + cuboot-kilauea.c simpleboot.c \ +- virtex405-head.S virtex.c ++ virtex405-head.S virtex.c \ ++ cuboot-magicbox.c + src-plat-$(CONFIG_44x) += treeboot-ebony.c cuboot-ebony.c treeboot-bamboo.c \ + cuboot-bamboo.c cuboot-sam440ep.c \ + cuboot-sequoia.c cuboot-rainier.c \ +@@ -221,6 +223,7 @@ image-$(CONFIG_HOTFOOT) += cuImage.hot image-$(CONFIG_WALNUT) += treeImage.walnut image-$(CONFIG_ACADIA) += cuImage.acadia image-$(CONFIG_OBS600) += uImage.obs600 @@ -435,11 +436,11 @@ depends on 40x --- a/arch/powerpc/platforms/40x/ppc40x_simple.c +++ b/arch/powerpc/platforms/40x/ppc40x_simple.c -@@ -57,6 +57,7 @@ static const char *board[] __initdata = - "amcc,makalu", +@@ -58,6 +58,7 @@ static const char * const board[] __init "apm,klondike", "est,hotfoot", + "plathome,obs600", + "magicbox", - "plathome,obs600" + NULL }; diff --git a/target/linux/ppc40x/patches-3.3/005-openrb.patch b/target/linux/ppc40x/patches-3.8/005-openrb.patch index 42d1fd5dd..3c1f0ae50 100644 --- a/target/linux/ppc40x/patches-3.3/005-openrb.patch +++ b/target/linux/ppc40x/patches-3.8/005-openrb.patch @@ -399,16 +399,16 @@ $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 $(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405 $(obj)/treeboot-currituck.o: BOOTCFLAGS += -mcpu=405 -@@ -82,7 +83,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82 - virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \ - cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \ - gamecube-head.S gamecube.c wii-head.S wii.c treeboot-iss4xx.c \ -- treeboot-currituck.c cuboot-magicbox.c -+ treeboot-currituck.c cuboot-magicbox.c cuboot-openrb.c - src-boot := $(src-wlib) $(src-plat) empty.c - - src-boot := $(addprefix $(obj)/, $(src-boot)) -@@ -204,6 +205,7 @@ image-$(CONFIG_WALNUT) += treeImage.wa +@@ -80,7 +81,7 @@ src-plat-$(CONFIG_40x) += fixed-head.S e + treeboot-walnut.c cuboot-acadia.c \ + cuboot-kilauea.c simpleboot.c \ + virtex405-head.S virtex.c \ +- cuboot-magicbox.c ++ cuboot-magicbox.c cuboot-openrb + src-plat-$(CONFIG_44x) += treeboot-ebony.c cuboot-ebony.c treeboot-bamboo.c \ + cuboot-bamboo.c cuboot-sam440ep.c \ + cuboot-sequoia.c cuboot-rainier.c \ +@@ -224,6 +225,7 @@ image-$(CONFIG_WALNUT) += treeImage.wa image-$(CONFIG_ACADIA) += cuImage.acadia image-$(CONFIG_OBS600) += uImage.obs600 image-$(CONFIG_MAGICBOX) += cuImage.magicbox @@ -437,11 +437,11 @@ depends on 40x --- a/arch/powerpc/platforms/40x/ppc40x_simple.c +++ b/arch/powerpc/platforms/40x/ppc40x_simple.c -@@ -58,6 +58,7 @@ static const char *board[] __initdata = - "apm,klondike", +@@ -59,6 +59,7 @@ static const char * const board[] __init "est,hotfoot", + "plathome,obs600", "magicbox", + "openrb", - "plathome,obs600" + NULL }; diff --git a/target/linux/ppc40x/patches-3.3/101-pata-magicbox-cf-driver.patch b/target/linux/ppc40x/patches-3.8/101-pata-magicbox-cf-driver.patch index 0b4bb0d3d..746189122 100644 --- a/target/linux/ppc40x/patches-3.3/101-pata-magicbox-cf-driver.patch +++ b/target/linux/ppc40x/patches-3.8/101-pata-magicbox-cf-driver.patch @@ -19,7 +19,7 @@ depends on CPU_CAVIUM_OCTEON --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile -@@ -81,6 +81,7 @@ obj-$(CONFIG_PATA_AT91) += pata_at91.o +@@ -83,6 +83,7 @@ obj-$(CONFIG_PATA_AT91) += pata_at91.o obj-$(CONFIG_PATA_CMD640_PCI) += pata_cmd640.o obj-$(CONFIG_PATA_ISAPNP) += pata_isapnp.o obj-$(CONFIG_PATA_IXP4XX_CF) += pata_ixp4xx_cf.o @@ -326,7 +326,7 @@ + ap->ioaddr.ctl_addr); +} + -+static int __devinit magicbox_cf_of_probe(struct platform_device *op) ++static int magicbox_cf_of_probe(struct platform_device *op) +{ + struct magicbox_cf_info *info; + struct ata_host *host; @@ -385,7 +385,7 @@ + return ret; +} + -+static __devexit int magicbox_cf_of_remove(struct platform_device *op) ++static int magicbox_cf_of_remove(struct platform_device *op) +{ + struct ata_host *host = dev_get_drvdata(&op->dev); + struct magicbox_cf_info *info = host->private_data; @@ -405,7 +405,7 @@ + +static struct platform_driver magicbox_cf_of_platform_driver = { + .probe = magicbox_cf_of_probe, -+ .remove = __devexit_p(magicbox_cf_of_remove), ++ .remove = magicbox_cf_of_remove, + .driver = { + .name = DRV_NAME, + .owner = THIS_MODULE, diff --git a/target/linux/ppc40x/patches-3.3/110-kilauea_openwrt_flashmap.patch b/target/linux/ppc40x/patches-3.8/110-kilauea_openwrt_flashmap.patch index ab44a2d57..ab44a2d57 100644 --- a/target/linux/ppc40x/patches-3.3/110-kilauea_openwrt_flashmap.patch +++ b/target/linux/ppc40x/patches-3.8/110-kilauea_openwrt_flashmap.patch diff --git a/target/linux/ppc40x/patches-3.3/120-usb-isp116x-hcd-add-of-binding.patch b/target/linux/ppc40x/patches-3.8/120-usb-isp116x-hcd-add-of-binding.patch index 2f2502266..03de42e69 100644 --- a/target/linux/ppc40x/patches-3.3/120-usb-isp116x-hcd-add-of-binding.patch +++ b/target/linux/ppc40x/patches-3.8/120-usb-isp116x-hcd-add-of-binding.patch @@ -1,6 +1,6 @@ --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c -@@ -1535,6 +1535,7 @@ static struct hc_driver isp116x_hc_drive +@@ -1534,6 +1534,7 @@ static struct hc_driver isp116x_hc_drive /*----------------------------------------------------------------*/ @@ -8,10 +8,11 @@ static int isp116x_remove(struct platform_device *pdev) { struct usb_hcd *hcd = platform_get_drvdata(pdev); -@@ -1708,22 +1709,249 @@ static struct platform_driver isp116x_dr +@@ -1710,4 +1711,251 @@ static struct platform_driver isp116x_dr }, }; +-module_platform_driver(isp116x_driver); +static inline int isp116x_platform_register(void) +{ + return platform_driver_register(&isp116x_driver); @@ -30,6 +31,8 @@ + +#ifdef CONFIG_USB_ISP116X_HCD_OF + ++/* TODO: rework platform probe instead of using a separate probe */ ++ +#include <linux/of_platform.h> + +#ifdef USE_PLATFORM_DELAY @@ -41,7 +44,7 @@ +#define isp116x_of_delay NULL +#endif + -+static int __devinit isp116x_of_probe(struct platform_device *op) ++static int isp116x_of_probe(struct platform_device *op) +{ + struct device_node *dn = op->dev.of_node; + struct usb_hcd *hcd; @@ -161,7 +164,7 @@ + return ret; +} + -+static __devexit int isp116x_of_remove(struct platform_device *op) ++static int isp116x_of_remove(struct platform_device *op) +{ + struct usb_hcd *hcd = dev_get_drvdata(&op->dev); + struct isp116x *isp116x; @@ -199,7 +202,7 @@ + +static struct platform_driver isp116x_of_platform_driver = { + .probe = isp116x_of_probe, -+ .remove = __devexit_p(isp116x_of_remove), ++ .remove = isp116x_of_remove, + .driver = { + .name = "isp116x-hcd-of", + .owner = THIS_MODULE, @@ -224,17 +227,16 @@ +static void isp116x_of_unregister(void) {}; +#endif /* CONFIG_USB_ISP116X_HCD_OF */ + - /*-----------------------------------------------------------------*/ - - static int __init isp116x_init(void) - { ++/*-----------------------------------------------------------------*/ ++ ++static int __init isp116x_init(void) ++{ + int ret; + - if (usb_disabled()) - return -ENODEV; - - INFO("driver %s, %s\n", hcd_name, DRIVER_VERSION); -- return platform_driver_register(&isp116x_driver); ++ if (usb_disabled()) ++ return -ENODEV; ++ ++ INFO("driver %s, %s\n", hcd_name, DRIVER_VERSION); + ret = isp116x_platform_register(); + if (ret) + return ret; @@ -248,21 +250,20 @@ + err_platform_unregister: + isp116x_platform_unregister(); + return ret; - } - - module_init(isp116x_init); - - static void __exit isp116x_cleanup(void) - { -- platform_driver_unregister(&isp116x_driver); ++} ++ ++module_init(isp116x_init); ++ ++static void __exit isp116x_cleanup(void) ++{ + isp116x_of_unregister(); + isp116x_platform_unregister(); - } - - module_exit(isp116x_cleanup); ++} ++ ++module_exit(isp116x_cleanup); --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig -@@ -251,6 +251,24 @@ config USB_ISP116X_HCD +@@ -269,6 +269,24 @@ config USB_ISP116X_HCD To compile this driver as a module, choose M here: the module will be called isp116x-hcd. @@ -286,4 +287,4 @@ + config USB_ISP1760_HCD tristate "ISP 1760 HCD support" - depends on USB && EXPERIMENTAL + depends on USB diff --git a/target/linux/ppc40x/patches-3.3/121-usb-isp116x-hcd-ppc405-register-access.patch b/target/linux/ppc40x/patches-3.8/121-usb-isp116x-hcd-ppc405-register-access.patch index c81d18a44..c81d18a44 100644 --- a/target/linux/ppc40x/patches-3.3/121-usb-isp116x-hcd-ppc405-register-access.patch +++ b/target/linux/ppc40x/patches-3.8/121-usb-isp116x-hcd-ppc405-register-access.patch |