diff options
| author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-02-16 21:31:23 +0000 |
|---|---|---|
| committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-02-16 21:31:23 +0000 |
| commit | e5d9c14c1bd96576c60c7a0b4337517c3066d444 (patch) | |
| tree | 1283f03ca04f77633eb1da9bf32a250eb59800fe /target/linux | |
| parent | c09ae0ed92391226c253f4cef61c7f0399c3ec1c (diff) | |
[ppc40x]: upgrade to 2.6.32.8
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19673 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
9 files changed, 33 insertions, 963 deletions
diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index 910dccde3c..746ff3d227 100644 --- a/target/linux/ppc40x/Makefile +++ b/target/linux/ppc40x/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2009 OpenWrt.org +# Copyright (C) 2008-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ BOARDNAME:=AMCC/IBM PPC40x FEATURES:=squashfs CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=405 -LINUX_VERSION:=2.6.30.10 +LINUX_VERSION:=2.6.32.8 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc40x/config-default b/target/linux/ppc40x/config-default index 278387d278..252637a59b 100644 --- a/target/linux/ppc40x/config-default +++ b/target/linux/ppc40x/config-default @@ -80,6 +80,7 @@ CONFIG_HAVE_MLOCK=y CONFIG_HAVE_OPROFILE=y # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set # CONFIG_HCU4 is not set +# CONFIG_HOTFOOT is not set CONFIG_HW_RANDOM=y # CONFIG_HZ_100 is not set CONFIG_HZ=250 @@ -135,6 +136,7 @@ CONFIG_PPC4xx_PCI_EXPRESS=y # CONFIG_PPC_85xx is not set # CONFIG_PPC_8xx is not set # CONFIG_PPC_970_NAP is not set +# CONFIG_PPC_BOOK3S_32 is not set # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_CLOCK is not set @@ -170,6 +172,7 @@ CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_SLAB is not set # CONFIG_SLOW_WORK is not set CONFIG_SLUB=y +CONFIG_SWIOTLB=y CONFIG_TASK_SIZE=0xc0000000 CONFIG_TRACING_SUPPORT=y # CONFIG_WALNUT is not set diff --git a/target/linux/ppc40x/patches/001-makalu_ppc40x_simple.patch b/target/linux/ppc40x/patches/001-makalu_ppc40x_simple.patch deleted file mode 100644 index d4497d8c15..0000000000 --- a/target/linux/ppc40x/patches/001-makalu_ppc40x_simple.patch +++ /dev/null @@ -1,443 +0,0 @@ ---- a/arch/powerpc/configs/40x/makalu_defconfig -+++ b/arch/powerpc/configs/40x/makalu_defconfig -@@ -1,7 +1,7 @@ - # - # Automatically generated make config: don't edit --# Linux kernel version: 2.6.29-rc2 --# Tue Jan 20 08:17:53 2009 -+# Linux kernel version: 2.6.30-rc7 -+# Wed Jun 3 09:11:02 2009 - # - # CONFIG_PPC64 is not set - -@@ -27,6 +27,7 @@ CONFIG_GENERIC_TIME=y - CONFIG_GENERIC_TIME_VSYSCALL=y - CONFIG_GENERIC_CLOCKEVENTS=y - CONFIG_GENERIC_HARDIRQS=y -+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y - # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set - CONFIG_IRQ_PER_CPU=y - CONFIG_STACKTRACE_SUPPORT=y -@@ -49,10 +50,12 @@ CONFIG_PPC_UDBG_16550=y - # CONFIG_GENERIC_TBSYNC is not set - CONFIG_AUDIT_ARCH=y - CONFIG_GENERIC_BUG=y -+CONFIG_DTC=y - # CONFIG_DEFAULT_UIMAGE is not set - CONFIG_PPC_DCR_NATIVE=y - # CONFIG_PPC_DCR_MMIO is not set - CONFIG_PPC_DCR=y -+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y - CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" - - # -@@ -67,9 +70,19 @@ CONFIG_SWAP=y - CONFIG_SYSVIPC=y - CONFIG_SYSVIPC_SYSCTL=y - CONFIG_POSIX_MQUEUE=y -+CONFIG_POSIX_MQUEUE_SYSCTL=y - # CONFIG_BSD_PROCESS_ACCT is not set - # CONFIG_TASKSTATS is not set - # CONFIG_AUDIT is not set -+ -+# -+# RCU Subsystem -+# -+CONFIG_CLASSIC_RCU=y -+# CONFIG_TREE_RCU is not set -+# CONFIG_PREEMPT_RCU is not set -+# CONFIG_TREE_RCU_TRACE is not set -+# CONFIG_PREEMPT_RCU_TRACE is not set - # CONFIG_IKCONFIG is not set - CONFIG_LOG_BUF_SHIFT=14 - CONFIG_GROUP_SCHED=y -@@ -84,22 +97,24 @@ CONFIG_SYSFS_DEPRECATED_V2=y - # CONFIG_NAMESPACES is not set - CONFIG_BLK_DEV_INITRD=y - CONFIG_INITRAMFS_SOURCE="" -+CONFIG_RD_GZIP=y -+# CONFIG_RD_BZIP2 is not set -+# CONFIG_RD_LZMA is not set - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set - CONFIG_SYSCTL=y -+CONFIG_ANON_INODES=y - CONFIG_EMBEDDED=y - CONFIG_SYSCTL_SYSCALL=y - CONFIG_KALLSYMS=y - CONFIG_KALLSYMS_ALL=y --CONFIG_KALLSYMS_STRIP_GENERATED=y - CONFIG_KALLSYMS_EXTRA_PASS=y -+# CONFIG_STRIP_ASM_SYMS is not set - CONFIG_HOTPLUG=y - CONFIG_PRINTK=y - CONFIG_BUG=y - CONFIG_ELF_CORE=y --CONFIG_COMPAT_BRK=y - CONFIG_BASE_FULL=y - CONFIG_FUTEX=y --CONFIG_ANON_INODES=y - CONFIG_EPOLL=y - CONFIG_SIGNALFD=y - CONFIG_TIMERFD=y -@@ -109,10 +124,12 @@ CONFIG_AIO=y - CONFIG_VM_EVENT_COUNTERS=y - CONFIG_PCI_QUIRKS=y - CONFIG_SLUB_DEBUG=y -+CONFIG_COMPAT_BRK=y - # CONFIG_SLAB is not set - CONFIG_SLUB=y - # CONFIG_SLOB is not set - # CONFIG_PROFILING is not set -+# CONFIG_MARKERS is not set - CONFIG_HAVE_OPROFILE=y - # CONFIG_KPROBES is not set - CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -@@ -120,6 +137,7 @@ CONFIG_HAVE_IOREMAP_PROT=y - CONFIG_HAVE_KPROBES=y - CONFIG_HAVE_KRETPROBES=y - CONFIG_HAVE_ARCH_TRACEHOOK=y -+# CONFIG_SLOW_WORK is not set - # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set - CONFIG_SLABINFO=y - CONFIG_RT_MUTEXES=y -@@ -132,7 +150,6 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_MODULE_SRCVERSION_ALL is not set - CONFIG_BLOCK=y - CONFIG_LBD=y --# CONFIG_BLK_DEV_IO_TRACE is not set - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_BLK_DEV_INTEGRITY is not set - -@@ -148,11 +165,6 @@ CONFIG_DEFAULT_AS=y - # CONFIG_DEFAULT_CFQ is not set - # CONFIG_DEFAULT_NOOP is not set - CONFIG_DEFAULT_IOSCHED="anticipatory" --CONFIG_CLASSIC_RCU=y --# CONFIG_TREE_RCU is not set --# CONFIG_PREEMPT_RCU is not set --# CONFIG_TREE_RCU_TRACE is not set --# CONFIG_PREEMPT_RCU_TRACE is not set - # CONFIG_FREEZER is not set - CONFIG_PPC4xx_PCI_EXPRESS=y - -@@ -170,7 +182,7 @@ CONFIG_PPC4xx_PCI_EXPRESS=y - CONFIG_MAKALU=y - # CONFIG_WALNUT is not set - # CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set --# CONFIG_PPC40x_SIMPLE is not set -+CONFIG_PPC40x_SIMPLE=y - CONFIG_405EX=y - # CONFIG_IPIC is not set - # CONFIG_MPIC is not set -@@ -228,9 +240,12 @@ CONFIG_ZONE_DMA_FLAG=1 - CONFIG_BOUNCE=y - CONFIG_VIRT_TO_BUS=y - CONFIG_UNEVICTABLE_LRU=y -+CONFIG_HAVE_MLOCK=y -+CONFIG_HAVE_MLOCKED_PAGE_BIT=y - CONFIG_PPC_4K_PAGES=y - # CONFIG_PPC_16K_PAGES is not set - # CONFIG_PPC_64K_PAGES is not set -+# CONFIG_PPC_256K_PAGES is not set - CONFIG_FORCE_MAX_ZONEORDER=11 - CONFIG_PROC_DEVICETREE=y - # CONFIG_CMDLINE_BOOL is not set -@@ -255,6 +270,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y - CONFIG_PCI_LEGACY=y - # CONFIG_PCI_DEBUG is not set - # CONFIG_PCI_STUB is not set -+# CONFIG_PCI_IOV is not set - # CONFIG_PCCARD is not set - # CONFIG_HOTPLUG_PCI is not set - # CONFIG_HAS_RAPIDIO is not set -@@ -272,14 +288,12 @@ CONFIG_PAGE_OFFSET=0xc0000000 - CONFIG_KERNEL_START=0xc0000000 - CONFIG_PHYSICAL_START=0x00000000 - CONFIG_TASK_SIZE=0xc0000000 --CONFIG_CONSISTENT_START=0xff100000 - CONFIG_CONSISTENT_SIZE=0x00200000 - CONFIG_NET=y - - # - # Networking options - # --CONFIG_COMPAT_NET_DEV_OPS=y - CONFIG_PACKET=y - # CONFIG_PACKET_MMAP is not set - CONFIG_UNIX=y -@@ -329,6 +343,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" - # CONFIG_LAPB is not set - # CONFIG_ECONET is not set - # CONFIG_WAN_ROUTER is not set -+# CONFIG_PHONET is not set - # CONFIG_NET_SCHED is not set - # CONFIG_DCB is not set - -@@ -341,7 +356,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" - # CONFIG_IRDA is not set - # CONFIG_BT is not set - # CONFIG_AF_RXRPC is not set --# CONFIG_PHONET is not set - # CONFIG_WIRELESS is not set - # CONFIG_WIMAX is not set - # CONFIG_RFKILL is not set -@@ -445,7 +459,6 @@ CONFIG_MTD_PHYSMAP_OF=y - # LPDDR flash memory drivers - # - # CONFIG_MTD_LPDDR is not set --# CONFIG_MTD_QINFO_PROBE is not set - - # - # UBI - Unsorted block images -@@ -498,6 +511,7 @@ CONFIG_HAVE_IDE=y - # CONFIG_I2O is not set - # CONFIG_MACINTOSH_DRIVERS is not set - CONFIG_NETDEVICES=y -+CONFIG_COMPAT_NET_DEV_OPS=y - # CONFIG_DUMMY is not set - # CONFIG_BONDING is not set - # CONFIG_MACVLAN is not set -@@ -512,6 +526,8 @@ CONFIG_NET_ETHERNET=y - # CONFIG_SUNGEM is not set - # CONFIG_CASSINI is not set - # CONFIG_NET_VENDOR_3COM is not set -+# CONFIG_ETHOC is not set -+# CONFIG_DNET is not set - # CONFIG_NET_TULIP is not set - # CONFIG_HP100 is not set - CONFIG_IBM_NEW_EMAC=y -@@ -540,7 +556,6 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y - # - # CONFIG_WLAN_PRE80211 is not set - # CONFIG_WLAN_80211 is not set --# CONFIG_IWLWIFI_LEDS is not set - - # - # Enable WiMAX (Networking options) to see the WiMAX drivers -@@ -678,6 +693,7 @@ CONFIG_SSB_POSSIBLE=y - # CONFIG_EDAC is not set - # CONFIG_RTC_CLASS is not set - # CONFIG_DMADEVICES is not set -+# CONFIG_AUXDISPLAY is not set - # CONFIG_UIO is not set - # CONFIG_STAGING is not set - -@@ -706,6 +722,11 @@ CONFIG_INOTIFY_USER=y - # CONFIG_FUSE_FS is not set - - # -+# Caches -+# -+# CONFIG_FSCACHE is not set -+ -+# - # CD-ROM/DVD Filesystems - # - # CONFIG_ISO9660_FS is not set -@@ -749,6 +770,7 @@ CONFIG_CRAMFS=y - # CONFIG_ROMFS_FS is not set - # CONFIG_SYSV_FS is not set - # CONFIG_UFS_FS is not set -+# CONFIG_NILFS2_FS is not set - CONFIG_NETWORK_FILESYSTEMS=y - CONFIG_NFS_FS=y - CONFIG_NFS_V3=y -@@ -760,7 +782,6 @@ CONFIG_LOCKD=y - CONFIG_LOCKD_V4=y - CONFIG_NFS_COMMON=y - CONFIG_SUNRPC=y --# CONFIG_SUNRPC_REGISTER_V4 is not set - # CONFIG_RPCSEC_GSS_KRB5 is not set - # CONFIG_RPCSEC_GSS_SPKM3 is not set - # CONFIG_SMB_FS is not set -@@ -776,6 +797,7 @@ CONFIG_SUNRPC=y - CONFIG_MSDOS_PARTITION=y - # CONFIG_NLS is not set - # CONFIG_DLM is not set -+# CONFIG_BINARY_PRINTF is not set - - # - # Library routines -@@ -790,11 +812,12 @@ CONFIG_CRC32=y - # CONFIG_CRC7 is not set - # CONFIG_LIBCRC32C is not set - CONFIG_ZLIB_INFLATE=y --CONFIG_PLIST=y -+CONFIG_DECOMPRESS_GZIP=y - CONFIG_HAS_IOMEM=y - CONFIG_HAS_IOPORT=y - CONFIG_HAS_DMA=y - CONFIG_HAVE_LMB=y -+CONFIG_NLATTR=y - - # - # Kernel hacking -@@ -812,6 +835,9 @@ CONFIG_DEBUG_KERNEL=y - CONFIG_DETECT_SOFTLOCKUP=y - # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set - CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 -+CONFIG_DETECT_HUNG_TASK=y -+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 - CONFIG_SCHED_DEBUG=y - # CONFIG_SCHEDSTATS is not set - # CONFIG_TIMER_STATS is not set -@@ -841,9 +867,12 @@ CONFIG_DEBUG_BUGVERBOSE=y - # CONFIG_FAULT_INJECTION is not set - # CONFIG_LATENCYTOP is not set - CONFIG_SYSCTL_SYSCALL_CHECK=y -+# CONFIG_DEBUG_PAGEALLOC is not set - CONFIG_HAVE_FUNCTION_TRACER=y -+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y - CONFIG_HAVE_DYNAMIC_FTRACE=y - CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -+CONFIG_TRACING_SUPPORT=y - - # - # Tracers -@@ -851,17 +880,21 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y - # CONFIG_FUNCTION_TRACER is not set - # CONFIG_SCHED_TRACER is not set - # CONFIG_CONTEXT_SWITCH_TRACER is not set -+# CONFIG_EVENT_TRACER is not set - # CONFIG_BOOT_TRACER is not set - # CONFIG_TRACE_BRANCH_PROFILING is not set - # CONFIG_STACK_TRACER is not set --# CONFIG_DYNAMIC_PRINTK_DEBUG is not set -+# CONFIG_KMEMTRACE is not set -+# CONFIG_WORKQUEUE_TRACER is not set -+# CONFIG_BLK_DEV_IO_TRACE is not set -+# CONFIG_DYNAMIC_DEBUG is not set - # CONFIG_SAMPLES is not set - CONFIG_HAVE_ARCH_KGDB=y - # CONFIG_KGDB is not set - CONFIG_PRINT_STACK_DEPTH=64 - # CONFIG_DEBUG_STACKOVERFLOW is not set - # CONFIG_DEBUG_STACK_USAGE is not set --# CONFIG_DEBUG_PAGEALLOC is not set -+# CONFIG_PPC_EMULATED_STATS is not set - # CONFIG_CODE_PATCHING_SELFTEST is not set - # CONFIG_FTR_FIXUP_SELFTEST is not set - # CONFIG_MSI_BITMAP_SELFTEST is not set -@@ -892,10 +925,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y - CONFIG_CRYPTO_HASH=y - CONFIG_CRYPTO_HASH2=y - CONFIG_CRYPTO_RNG2=y -+CONFIG_CRYPTO_PCOMP=y - CONFIG_CRYPTO_MANAGER=y - CONFIG_CRYPTO_MANAGER2=y - # CONFIG_CRYPTO_GF128MUL is not set - # CONFIG_CRYPTO_NULL is not set -+CONFIG_CRYPTO_WORKQUEUE=y - # CONFIG_CRYPTO_CRYPTD is not set - # CONFIG_CRYPTO_AUTHENC is not set - # CONFIG_CRYPTO_TEST is not set -@@ -964,6 +999,7 @@ CONFIG_CRYPTO_DES=y - # Compression - # - # CONFIG_CRYPTO_DEFLATE is not set -+# CONFIG_CRYPTO_ZLIB is not set - # CONFIG_CRYPTO_LZO is not set - - # -@@ -972,5 +1008,6 @@ CONFIG_CRYPTO_DES=y - # CONFIG_CRYPTO_ANSI_CPRNG is not set - CONFIG_CRYPTO_HW=y - # CONFIG_CRYPTO_DEV_HIFN_795X is not set -+# CONFIG_CRYPTO_DEV_PPC4XX is not set - # CONFIG_PPC_CLOCK is not set - # CONFIG_VIRTUALIZATION is not set ---- a/arch/powerpc/platforms/40x/Kconfig -+++ b/arch/powerpc/platforms/40x/Kconfig -@@ -56,6 +56,7 @@ config MAKALU - select 405EX - select PCI - select PPC4xx_PCI_EXPRESS -+ select PPC40x_SIMPLE - help - This option enables support for the AMCC PPC405EX board. - ---- a/arch/powerpc/platforms/40x/Makefile -+++ b/arch/powerpc/platforms/40x/Makefile -@@ -1,6 +1,5 @@ - obj-$(CONFIG_KILAUEA) += kilauea.o - obj-$(CONFIG_HCU4) += hcu4.o --obj-$(CONFIG_MAKALU) += makalu.o - obj-$(CONFIG_WALNUT) += walnut.o - obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD) += virtex.o - obj-$(CONFIG_EP405) += ep405.o ---- a/arch/powerpc/platforms/40x/makalu.c -+++ /dev/null -@@ -1,60 +0,0 @@ --/* -- * Makalu board specific routines -- * -- * Copyright 2007 DENX Software Engineering, Stefan Roese <sr@denx.de> -- * -- * Based on the Walnut code by -- * Josh Boyer <jwboyer@linux.vnet.ibm.com> -- * Copyright 2007 IBM Corporation -- * -- * This program is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the -- * Free Software Foundation; either version 2 of the License, or (at your -- * option) any later version. -- */ --#include <linux/init.h> --#include <linux/of_platform.h> --#include <asm/machdep.h> --#include <asm/prom.h> --#include <asm/udbg.h> --#include <asm/time.h> --#include <asm/uic.h> --#include <asm/pci-bridge.h> --#include <asm/ppc4xx.h> -- --static __initdata struct of_device_id makalu_of_bus[] = { -- { .compatible = "ibm,plb4", }, -- { .compatible = "ibm,opb", }, -- { .compatible = "ibm,ebc", }, -- {}, --}; -- --static int __init makalu_device_probe(void) --{ -- of_platform_bus_probe(NULL, makalu_of_bus, NULL); -- -- return 0; --} --machine_device_initcall(makalu, makalu_device_probe); -- --static int __init makalu_probe(void) --{ -- unsigned long root = of_get_flat_dt_root(); -- -- if (!of_flat_dt_is_compatible(root, "amcc,makalu")) -- return 0; -- -- ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; -- -- return 1; --} -- --define_machine(makalu) { -- .name = "Makalu", -- .probe = makalu_probe, -- .progress = udbg_progress, -- .init_IRQ = uic_init_tree, -- .get_irq = uic_get_irq, -- .restart = ppc4xx_reset_system, -- .calibrate_decr = generic_calibrate_decr, --}; ---- a/arch/powerpc/platforms/40x/ppc40x_simple.c -+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c -@@ -51,7 +51,8 @@ machine_device_initcall(ppc40x_simple, p - * board.c file for it rather than adding it to this list. - */ - static char *board[] __initdata = { -- "amcc,acadia" -+ "amcc,acadia", -+ "amcc,makalu" - }; - - static int __init ppc40x_probe(void) diff --git a/target/linux/ppc40x/patches/002-kilauea_halekala_ppc40x_simple.patch b/target/linux/ppc40x/patches/002-kilauea_halekala_ppc40x_simple.patch deleted file mode 100644 index 0b17e1b81a..0000000000 --- a/target/linux/ppc40x/patches/002-kilauea_halekala_ppc40x_simple.patch +++ /dev/null @@ -1,440 +0,0 @@ ---- a/arch/powerpc/configs/40x/kilauea_defconfig -+++ b/arch/powerpc/configs/40x/kilauea_defconfig -@@ -1,7 +1,7 @@ - # - # Automatically generated make config: don't edit --# Linux kernel version: 2.6.29-rc2 --# Tue Jan 20 08:17:52 2009 -+# Linux kernel version: 2.6.30-rc7 -+# Wed Jun 3 10:18:16 2009 - # - # CONFIG_PPC64 is not set - -@@ -27,6 +27,7 @@ CONFIG_GENERIC_TIME=y - CONFIG_GENERIC_TIME_VSYSCALL=y - CONFIG_GENERIC_CLOCKEVENTS=y - CONFIG_GENERIC_HARDIRQS=y -+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y - # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set - CONFIG_IRQ_PER_CPU=y - CONFIG_STACKTRACE_SUPPORT=y -@@ -49,10 +50,12 @@ CONFIG_PPC_UDBG_16550=y - # CONFIG_GENERIC_TBSYNC is not set - CONFIG_AUDIT_ARCH=y - CONFIG_GENERIC_BUG=y -+CONFIG_DTC=y - # CONFIG_DEFAULT_UIMAGE is not set - CONFIG_PPC_DCR_NATIVE=y - # CONFIG_PPC_DCR_MMIO is not set - CONFIG_PPC_DCR=y -+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y - CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" - - # -@@ -67,9 +70,19 @@ CONFIG_SWAP=y - CONFIG_SYSVIPC=y - CONFIG_SYSVIPC_SYSCTL=y - CONFIG_POSIX_MQUEUE=y -+CONFIG_POSIX_MQUEUE_SYSCTL=y - # CONFIG_BSD_PROCESS_ACCT is not set - # CONFIG_TASKSTATS is not set - # CONFIG_AUDIT is not set -+ -+# -+# RCU Subsystem -+# -+CONFIG_CLASSIC_RCU=y -+# CONFIG_TREE_RCU is not set -+# CONFIG_PREEMPT_RCU is not set -+# CONFIG_TREE_RCU_TRACE is not set -+# CONFIG_PREEMPT_RCU_TRACE is not set - # CONFIG_IKCONFIG is not set - CONFIG_LOG_BUF_SHIFT=14 - CONFIG_GROUP_SCHED=y -@@ -84,22 +97,24 @@ CONFIG_SYSFS_DEPRECATED_V2=y - # CONFIG_NAMESPACES is not set - CONFIG_BLK_DEV_INITRD=y - CONFIG_INITRAMFS_SOURCE="" -+CONFIG_RD_GZIP=y -+# CONFIG_RD_BZIP2 is not set -+# CONFIG_RD_LZMA is not set - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set - CONFIG_SYSCTL=y -+CONFIG_ANON_INODES=y - CONFIG_EMBEDDED=y - CONFIG_SYSCTL_SYSCALL=y - CONFIG_KALLSYMS=y - CONFIG_KALLSYMS_ALL=y --CONFIG_KALLSYMS_STRIP_GENERATED=y - CONFIG_KALLSYMS_EXTRA_PASS=y -+# CONFIG_STRIP_ASM_SYMS is not set - CONFIG_HOTPLUG=y - CONFIG_PRINTK=y - CONFIG_BUG=y - CONFIG_ELF_CORE=y --CONFIG_COMPAT_BRK=y - CONFIG_BASE_FULL=y - CONFIG_FUTEX=y --CONFIG_ANON_INODES=y - CONFIG_EPOLL=y - CONFIG_SIGNALFD=y - CONFIG_TIMERFD=y -@@ -109,10 +124,12 @@ CONFIG_AIO=y - CONFIG_VM_EVENT_COUNTERS=y - CONFIG_PCI_QUIRKS=y - CONFIG_SLUB_DEBUG=y -+CONFIG_COMPAT_BRK=y - # CONFIG_SLAB is not set - CONFIG_SLUB=y - # CONFIG_SLOB is not set - # CONFIG_PROFILING is not set -+# CONFIG_MARKERS is not set - CONFIG_HAVE_OPROFILE=y - # CONFIG_KPROBES is not set - CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -@@ -120,6 +137,7 @@ CONFIG_HAVE_IOREMAP_PROT=y - CONFIG_HAVE_KPROBES=y - CONFIG_HAVE_KRETPROBES=y - CONFIG_HAVE_ARCH_TRACEHOOK=y -+# CONFIG_SLOW_WORK is not set - # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set - CONFIG_SLABINFO=y - CONFIG_RT_MUTEXES=y -@@ -132,7 +150,6 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_MODULE_SRCVERSION_ALL is not set - CONFIG_BLOCK=y - CONFIG_LBD=y --# CONFIG_BLK_DEV_IO_TRACE is not set - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_BLK_DEV_INTEGRITY is not set - -@@ -148,11 +165,6 @@ CONFIG_DEFAULT_AS=y - # CONFIG_DEFAULT_CFQ is not set - # CONFIG_DEFAULT_NOOP is not set - CONFIG_DEFAULT_IOSCHED="anticipatory" --CONFIG_CLASSIC_RCU=y --# CONFIG_TREE_RCU is not set --# CONFIG_PREEMPT_RCU is not set --# CONFIG_TREE_RCU_TRACE is not set --# CONFIG_PREEMPT_RCU_TRACE is not set - # CONFIG_FREEZER is not set - CONFIG_PPC4xx_PCI_EXPRESS=y - -@@ -170,7 +182,7 @@ CONFIG_KILAUEA=y - # CONFIG_MAKALU is not set - # CONFIG_WALNUT is not set - # CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set --# CONFIG_PPC40x_SIMPLE is not set -+CONFIG_PPC40x_SIMPLE=y - CONFIG_405EX=y - # CONFIG_IPIC is not set - # CONFIG_MPIC is not set -@@ -228,9 +240,12 @@ CONFIG_ZONE_DMA_FLAG=1 - CONFIG_BOUNCE=y - CONFIG_VIRT_TO_BUS=y - CONFIG_UNEVICTABLE_LRU=y -+CONFIG_HAVE_MLOCK=y -+CONFIG_HAVE_MLOCKED_PAGE_BIT=y - CONFIG_PPC_4K_PAGES=y - # CONFIG_PPC_16K_PAGES is not set - # CONFIG_PPC_64K_PAGES is not set -+# CONFIG_PPC_256K_PAGES is not set - CONFIG_FORCE_MAX_ZONEORDER=11 - CONFIG_PROC_DEVICETREE=y - # CONFIG_CMDLINE_BOOL is not set -@@ -255,6 +270,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y - CONFIG_PCI_LEGACY=y - # CONFIG_PCI_DEBUG is not set - # CONFIG_PCI_STUB is not set -+# CONFIG_PCI_IOV is not set - # CONFIG_PCCARD is not set - # CONFIG_HOTPLUG_PCI is not set - # CONFIG_HAS_RAPIDIO is not set -@@ -272,14 +288,12 @@ CONFIG_PAGE_OFFSET=0xc0000000 - CONFIG_KERNEL_START=0xc0000000 - CONFIG_PHYSICAL_START=0x00000000 - CONFIG_TASK_SIZE=0xc0000000 --CONFIG_CONSISTENT_START=0xff100000 - CONFIG_CONSISTENT_SIZE=0x00200000 - CONFIG_NET=y - - # - # Networking options - # --CONFIG_COMPAT_NET_DEV_OPS=y - CONFIG_PACKET=y - # CONFIG_PACKET_MMAP is not set - CONFIG_UNIX=y -@@ -329,6 +343,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" - # CONFIG_LAPB is not set - # CONFIG_ECONET is not set - # CONFIG_WAN_ROUTER is not set -+# CONFIG_PHONET is not set - # CONFIG_NET_SCHED is not set - # CONFIG_DCB is not set - -@@ -341,7 +356,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" - # CONFIG_IRDA is not set - # CONFIG_BT is not set - # CONFIG_AF_RXRPC is not set --# CONFIG_PHONET is not set - # CONFIG_WIRELESS is not set - # CONFIG_WIMAX is not set - # CONFIG_RFKILL is not set -@@ -445,7 +459,6 @@ CONFIG_MTD_PHYSMAP_OF=y - # LPDDR flash memory drivers - # - # CONFIG_MTD_LPDDR is not set --# CONFIG_MTD_QINFO_PROBE is not set - - # - # UBI - Unsorted block images -@@ -498,6 +511,7 @@ CONFIG_HAVE_IDE=y - # CONFIG_I2O is not set - # CONFIG_MACINTOSH_DRIVERS is not set - CONFIG_NETDEVICES=y -+CONFIG_COMPAT_NET_DEV_OPS=y - # CONFIG_DUMMY is not set - # CONFIG_BONDING is not set - # CONFIG_MACVLAN is not set -@@ -512,6 +526,8 @@ CONFIG_NET_ETHERNET=y - # CONFIG_SUNGEM is not set - # CONFIG_CASSINI is not set - # CONFIG_NET_VENDOR_3COM is not set -+# CONFIG_ETHOC is not set -+# CONFIG_DNET is not set - # CONFIG_NET_TULIP is not set - # CONFIG_HP100 is not set - CONFIG_IBM_NEW_EMAC=y -@@ -540,7 +556,6 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y - # - # CONFIG_WLAN_PRE80211 is not set - # CONFIG_WLAN_80211 is not set --# CONFIG_IWLWIFI_LEDS is not set - - # - # Enable WiMAX (Networking options) to see the WiMAX drivers -@@ -678,6 +693,7 @@ CONFIG_SSB_POSSIBLE=y - # CONFIG_EDAC is not set - # CONFIG_RTC_CLASS is not set - # CONFIG_DMADEVICES is not set -+# CONFIG_AUXDISPLAY is not set - # CONFIG_UIO is not set - # CONFIG_STAGING is not set - -@@ -706,6 +722,11 @@ CONFIG_INOTIFY_USER=y - # CONFIG_FUSE_FS is not set - - # -+# Caches -+# -+# CONFIG_FSCACHE is not set -+ -+# - # CD-ROM/DVD Filesystems - # - # CONFIG_ISO9660_FS is not set -@@ -749,6 +770,7 @@ CONFIG_CRAMFS=y - # CONFIG_ROMFS_FS is not set - # CONFIG_SYSV_FS is not set - # CONFIG_UFS_FS is not set -+# CONFIG_NILFS2_FS is not set - CONFIG_NETWORK_FILESYSTEMS=y - CONFIG_NFS_FS=y - CONFIG_NFS_V3=y -@@ -760,7 +782,6 @@ CONFIG_LOCKD=y - CONFIG_LOCKD_V4=y - CONFIG_NFS_COMMON=y - CONFIG_SUNRPC=y --# CONFIG_SUNRPC_REGISTER_V4 is not set - # CONFIG_RPCSEC_GSS_KRB5 is not set - # CONFIG_RPCSEC_GSS_SPKM3 is not set - # CONFIG_SMB_FS is not set -@@ -776,6 +797,7 @@ CONFIG_SUNRPC=y - CONFIG_MSDOS_PARTITION=y - # CONFIG_NLS is not set - # CONFIG_DLM is not set -+# CONFIG_BINARY_PRINTF is not set - - # - # Library routines -@@ -790,11 +812,12 @@ CONFIG_CRC32=y - # CONFIG_CRC7 is not set - # CONFIG_LIBCRC32C is not set - CONFIG_ZLIB_INFLATE=y --CONFIG_PLIST=y -+CONFIG_DECOMPRESS_GZIP=y - CONFIG_HAS_IOMEM=y - CONFIG_HAS_IOPORT=y - CONFIG_HAS_DMA=y - CONFIG_HAVE_LMB=y -+CONFIG_NLATTR=y - - # - # Kernel hacking -@@ -812,6 +835,9 @@ CONFIG_DEBUG_KERNEL=y - CONFIG_DETECT_SOFTLOCKUP=y - # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set - CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 -+CONFIG_DETECT_HUNG_TASK=y -+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 - CONFIG_SCHED_DEBUG=y - # CONFIG_SCHEDSTATS is not set - # CONFIG_TIMER_STATS is not set -@@ -841,9 +867,12 @@ CONFIG_DEBUG_BUGVERBOSE=y - # CONFIG_FAULT_INJECTION is not set - # CONFIG_LATENCYTOP is not set - CONFIG_SYSCTL_SYSCALL_CHECK=y -+# CONFIG_DEBUG_PAGEALLOC is not set - CONFIG_HAVE_FUNCTION_TRACER=y -+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y - CONFIG_HAVE_DYNAMIC_FTRACE=y - CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -+CONFIG_TRACING_SUPPORT=y - - # - # Tracers -@@ -851,17 +880,21 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y - # CONFIG_FUNCTION_TRACER is not set - # CONFIG_SCHED_TRACER is not set - # CONFIG_CONTEXT_SWITCH_TRACER is not set -+# CONFIG_EVENT_TRACER is not set - # CONFIG_BOOT_TRACER is not set - # CONFIG_TRACE_BRANCH_PROFILING is not set - # CONFIG_STACK_TRACER is not set --# CONFIG_DYNAMIC_PRINTK_DEBUG is not set -+# CONFIG_KMEMTRACE is not set -+# CONFIG_WORKQUEUE_TRACER is not set -+# CONFIG_BLK_DEV_IO_TRACE is not set -+# CONFIG_DYNAMIC_DEBUG is not set - # CONFIG_SAMPLES is not set - CONFIG_HAVE_ARCH_KGDB=y - # CONFIG_KGDB is not set - CONFIG_PRINT_STACK_DEPTH=64 - # CONFIG_DEBUG_STACKOVERFLOW is not set - # CONFIG_DEBUG_STACK_USAGE is not set --# CONFIG_DEBUG_PAGEALLOC is not set -+# CONFIG_PPC_EMULATED_STATS is not set - # CONFIG_CODE_PATCHING_SELFTEST is not set - # CONFIG_FTR_FIXUP_SELFTEST is not set - # CONFIG_MSI_BITMAP_SELFTEST is not set -@@ -892,10 +925,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y - CONFIG_CRYPTO_HASH=y - CONFIG_CRYPTO_HASH2=y - CONFIG_CRYPTO_RNG2=y -+CONFIG_CRYPTO_PCOMP=y - CONFIG_CRYPTO_MANAGER=y - CONFIG_CRYPTO_MANAGER2=y - # CONFIG_CRYPTO_GF128MUL is not set - # CONFIG_CRYPTO_NULL is not set -+CONFIG_CRYPTO_WORKQUEUE=y - # CONFIG_CRYPTO_CRYPTD is not set - # CONFIG_CRYPTO_AUTHENC is not set - # CONFIG_CRYPTO_TEST is not set -@@ -964,6 +999,7 @@ CONFIG_CRYPTO_DES=y - # Compression - # - # CONFIG_CRYPTO_DEFLATE is not set -+# CONFIG_CRYPTO_ZLIB is not set - # CONFIG_CRYPTO_LZO is not set - - # -@@ -972,5 +1008,6 @@ CONFIG_CRYPTO_DES=y - # CONFIG_CRYPTO_ANSI_CPRNG is not set - CONFIG_CRYPTO_HW=y - # CONFIG_CRYPTO_DEV_HIFN_795X is not set -+# CONFIG_CRYPTO_DEV_PPC4XX is not set - # CONFIG_PPC_CLOCK is not set - # CONFIG_VIRTUALIZATION is not set ---- a/arch/powerpc/platforms/40x/Kconfig -+++ b/arch/powerpc/platforms/40x/Kconfig -@@ -45,6 +45,7 @@ config KILAUEA - depends on 40x - default n - select 405EX -+ select PPC40x_SIMPLE - select PPC4xx_PCI_EXPRESS - help - This option enables support for the AMCC PPC405EX evaluation board. ---- a/arch/powerpc/platforms/40x/Makefile -+++ b/arch/powerpc/platforms/40x/Makefile -@@ -1,4 +1,3 @@ --obj-$(CONFIG_KILAUEA) += kilauea.o - obj-$(CONFIG_HCU4) += hcu4.o - obj-$(CONFIG_WALNUT) += walnut.o - obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD) += virtex.o ---- a/arch/powerpc/platforms/40x/kilauea.c -+++ /dev/null -@@ -1,60 +0,0 @@ --/* -- * Kilauea board specific routines -- * -- * Copyright 2007-2008 DENX Software Engineering, Stefan Roese <sr@denx.de> -- * -- * Based on the Walnut code by -- * Josh Boyer <jwboyer@linux.vnet.ibm.com> -- * Copyright 2007 IBM Corporation -- * -- * This program is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the -- * Free Software Foundation; either version 2 of the License, or (at your -- * option) any later version. -- */ --#include <linux/init.h> --#include <linux/of_platform.h> --#include <asm/machdep.h> --#include <asm/prom.h> --#include <asm/udbg.h> --#include <asm/time.h> --#include <asm/uic.h> --#include <asm/pci-bridge.h> --#include <asm/ppc4xx.h> -- --static __initdata struct of_device_id kilauea_of_bus[] = { -- { .compatible = "ibm,plb4", }, -- { .compatible = "ibm,opb", }, -- { .compatible = "ibm,ebc", }, -- {}, --}; -- --static int __init kilauea_device_probe(void) --{ -- of_platform_bus_probe(NULL, kilauea_of_bus, NULL); -- -- return 0; --} --machine_device_initcall(kilauea, kilauea_device_probe); -- --static int __init kilauea_probe(void) --{ -- unsigned long root = of_get_flat_dt_root(); -- -- if (!of_flat_dt_is_compatible(root, "amcc,kilauea")) -- return 0; -- -- ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC); -- -- return 1; --} -- --define_machine(kilauea) { -- .name = "Kilauea", -- .probe = kilauea_probe, -- .progress = udbg_progress, -- .init_IRQ = uic_init_tree, -- .get_irq = uic_get_irq, -- .restart = ppc4xx_reset_system, -- .calibrate_decr = generic_calibrate_decr, --}; ---- a/arch/powerpc/platforms/40x/ppc40x_simple.c -+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c -@@ -52,6 +52,8 @@ machine_device_initcall(ppc40x_simple, p - */ - static char *board[] __initdata = { - "amcc,acadia", -+ "amcc,haleakala", -+ "amcc,kilauea", - "amcc,makalu" - }; - diff --git a/target/linux/ppc40x/patches/004-magicbox.patch b/target/linux/ppc40x/patches/004-magicbox.patch index d6ce22d4a8..95736a1e0c 100644 --- a/target/linux/ppc40x/patches/004-magicbox.patch +++ b/target/linux/ppc40x/patches/004-magicbox.patch @@ -377,7 +377,7 @@ +}; --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -42,6 +42,7 @@ $(obj)/ebony.o: BOOTCFLAGS += -mcpu=440 +@@ -43,6 +43,7 @@ $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += - $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440 $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440 $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405 @@ -385,17 +385,18 @@ $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405 -@@ -75,7 +76,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82 +@@ -76,7 +77,8 @@ src-plat := of.c cuboot-52xx.c cuboot-82 cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.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-acadia.c cuboot-amigaone.c cuboot-magicbox.c +- cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c ++ cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \ ++ cuboot-magicbox.c src-boot := $(src-wlib) $(src-plat) empty.c src-boot := $(addprefix $(obj)/, $(src-boot)) -@@ -192,6 +193,7 @@ image-$(CONFIG_DEFAULT_UIMAGE) += uImag - image-$(CONFIG_EP405) += dtbImage.ep405 +@@ -194,6 +196,7 @@ image-$(CONFIG_EP405) += dtbImage.ep40 + image-$(CONFIG_HOTFOOT) += cuImage.hotfoot image-$(CONFIG_WALNUT) += treeImage.walnut image-$(CONFIG_ACADIA) += cuImage.acadia +image-$(CONFIG_MAGICBOX) += cuImage.magicbox @@ -404,7 +405,7 @@ image-$(CONFIG_EBONY) += treeImage.ebony cuImage.ebony --- a/arch/powerpc/platforms/40x/Kconfig +++ b/arch/powerpc/platforms/40x/Kconfig -@@ -50,6 +50,16 @@ config KILAUEA +@@ -60,6 +60,16 @@ config KILAUEA help This option enables support for the AMCC PPC405EX evaluation board. @@ -423,12 +424,12 @@ depends on 40x --- a/arch/powerpc/platforms/40x/ppc40x_simple.c +++ b/arch/powerpc/platforms/40x/ppc40x_simple.c -@@ -54,7 +54,8 @@ static char *board[] __initdata = { - "amcc,acadia", +@@ -55,7 +55,8 @@ static char *board[] __initdata = { "amcc,haleakala", "amcc,kilauea", -- "amcc,makalu" -+ "amcc,makalu", + "amcc,makalu", +- "est,hotfoot" ++ "est,hotfoot", + "magicbox" }; diff --git a/target/linux/ppc40x/patches/005-openrb.patch b/target/linux/ppc40x/patches/005-openrb.patch index 43407c2025..b6dff6eba5 100644 --- a/target/linux/ppc40x/patches/005-openrb.patch +++ b/target/linux/ppc40x/patches/005-openrb.patch @@ -353,7 +353,7 @@ +}; --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -43,6 +43,7 @@ $(obj)/cuboot-taishan.o: BOOTCFLAGS += - +@@ -44,6 +44,7 @@ $(obj)/cuboot-taishan.o: BOOTCFLAGS += - $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440 $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405 $(obj)/cuboot-magicbox.o: BOOTCFLAGS += -mcpu=405 @@ -361,17 +361,16 @@ $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405 -@@ -76,7 +77,8 @@ src-plat := of.c cuboot-52xx.c cuboot-82 - cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \ +@@ -78,7 +79,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82 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-magicbox.c -+ cuboot-acadia.c cuboot-amigaone.c cuboot-magicbox.c \ -+ cuboot-openrb.c + cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \ +- cuboot-magicbox.c ++ cuboot-magicbox.c cuboot-openrb.c src-boot := $(src-wlib) $(src-plat) empty.c src-boot := $(addprefix $(obj)/, $(src-boot)) -@@ -194,6 +196,7 @@ image-$(CONFIG_EP405) += dtbImage.ep40 +@@ -197,6 +198,7 @@ image-$(CONFIG_HOTFOOT) += cuImage.hot image-$(CONFIG_WALNUT) += treeImage.walnut image-$(CONFIG_ACADIA) += cuImage.acadia image-$(CONFIG_MAGICBOX) += cuImage.magicbox @@ -381,7 +380,7 @@ image-$(CONFIG_EBONY) += treeImage.ebony cuImage.ebony --- a/arch/powerpc/platforms/40x/Kconfig +++ b/arch/powerpc/platforms/40x/Kconfig -@@ -60,6 +60,16 @@ config MAGICBOX +@@ -70,6 +70,16 @@ config MAGICBOX help This option enables support for the Magicbox boards. @@ -400,10 +399,10 @@ depends on 40x --- a/arch/powerpc/platforms/40x/ppc40x_simple.c +++ b/arch/powerpc/platforms/40x/ppc40x_simple.c -@@ -55,7 +55,8 @@ static char *board[] __initdata = { - "amcc,haleakala", +@@ -56,7 +56,8 @@ static char *board[] __initdata = { "amcc,kilauea", "amcc,makalu", + "est,hotfoot", - "magicbox" + "magicbox", + "openrb" diff --git a/target/linux/ppc40x/patches/101-pata-magicbox-cf-driver.patch b/target/linux/ppc40x/patches/101-pata-magicbox-cf-driver.patch index f738f89685..3893587777 100644 --- a/target/linux/ppc40x/patches/101-pata-magicbox-cf-driver.patch +++ b/target/linux/ppc40x/patches/101-pata-magicbox-cf-driver.patch @@ -1,6 +1,6 @@ --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig -@@ -698,6 +698,16 @@ config PATA_IXP4XX_CF +@@ -745,6 +745,16 @@ config PATA_IXP4XX_CF If unsure, say N. @@ -19,14 +19,14 @@ depends on CPU_CAVIUM_OCTEON --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile -@@ -48,6 +48,7 @@ obj-$(CONFIG_PATA_OPTI) += pata_opti.o +@@ -49,6 +49,7 @@ obj-$(CONFIG_PATA_OPTI) += pata_opti.o obj-$(CONFIG_PATA_OPTIDMA) += pata_optidma.o obj-$(CONFIG_PATA_MPC52xx) += pata_mpc52xx.o obj-$(CONFIG_PATA_MARVELL) += pata_marvell.o +obj-$(CONFIG_PATA_MAGICBOX_CF) += pata_magicbox_cf.o obj-$(CONFIG_PATA_MPIIX) += pata_mpiix.o obj-$(CONFIG_PATA_OLDPIIX) += pata_oldpiix.o - obj-$(CONFIG_PATA_PCMCIA) += pata_pcmcia.o + obj-$(CONFIG_PATA_PALMLD) += pata_palmld.o --- /dev/null +++ b/drivers/ata/pata_magicbox_cf.c @@ -0,0 +1,404 @@ diff --git a/target/linux/ppc40x/patches/110-kilauea_openwrt_flashmap.patch b/target/linux/ppc40x/patches/110-kilauea_openwrt_flashmap.patch index 3244e2c933..5e5cc5298f 100644 --- a/target/linux/ppc40x/patches/110-kilauea_openwrt_flashmap.patch +++ b/target/linux/ppc40x/patches/110-kilauea_openwrt_flashmap.patch @@ -1,23 +1,15 @@ --- a/arch/powerpc/boot/dts/kilauea.dts +++ b/arch/powerpc/boot/dts/kilauea.dts -@@ -150,15 +150,15 @@ - #size-cells = <1>; - partition@0 { - label = "kernel"; -- reg = <0x00000000 0x00200000>; -+ reg = <0x00000000 0x001e0000>; +@@ -157,12 +157,8 @@ + reg = <0x001e0000 0x00020000>; }; -- partition@200000 { + partition@200000 { - label = "root"; - reg = <0x00200000 0x00200000>; -+ partition@1e0000 { -+ label = "device-tree"; -+ reg = <0x001e0000 0x0020000>; - }; +- }; - partition@400000 { - label = "user"; - reg = <0x00400000 0x03b60000>; -+ partition@200000 { + label = "rootfs"; + reg = <0x00200000 0x03d60000>; }; diff --git a/target/linux/ppc40x/patches/900-backport-fix-annotation-of-pcibios_claim_one_bus.patch b/target/linux/ppc40x/patches/900-backport-fix-annotation-of-pcibios_claim_one_bus.patch deleted file mode 100644 index 01a70c52cc..0000000000 --- a/target/linux/ppc40x/patches/900-backport-fix-annotation-of-pcibios_claim_one_bus.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Stephen Rothwell <sfr@canb.auug.org.au> -Date: Mon, 1 Jun 2009 14:53:53 +0000 (+0000) -Subject: powerpc/pci: Fix annotation of pcibios_claim_one_bus -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fbenh%2Fpowerpc.git;a=commitdiff_plain;h=baf75b0a42a1b3f6fca80f8949b6141eaff61b0d - -powerpc/pci: Fix annotation of pcibios_claim_one_bus - -It was __devinit, but it is also within a CONFIG_HOTPLUG guarded section -of code, so the __devinit does nothing but cause the following warning: - -WARNING: vmlinux.o(.text+0x107a8): Section mismatch in reference from the function pcibios_finish_adding_to_bus() to the function .devinit.text:pcibios_claim_one_bus() -The function pcibios_finish_adding_to_bus() references -the function __devinit pcibios_claim_one_bus(). -This is often because pcibios_finish_adding_to_bus lacks a __devinit -annotation or the annotation of pcibios_claim_one_bus is wrong. - -It is also only (externally) used in arch/powerpc/kernel/of_platform.c -which cannot be built as a module so don't export it. - -Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> -Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> ---- - ---- a/arch/powerpc/kernel/pci-common.c -+++ b/arch/powerpc/kernel/pci-common.c -@@ -1505,7 +1505,7 @@ void __init pcibios_resource_survey(void - * rest of the code later, for now, keep it as-is as our main - * resource allocation function doesn't deal with sub-trees yet. - */ --void __devinit pcibios_claim_one_bus(struct pci_bus *bus) -+void pcibios_claim_one_bus(struct pci_bus *bus) - { - struct pci_dev *dev; - struct pci_bus *child_bus; -@@ -1533,7 +1533,6 @@ void __devinit pcibios_claim_one_bus(str - list_for_each_entry(child_bus, &bus->children, node) - pcibios_claim_one_bus(child_bus); - } --EXPORT_SYMBOL_GPL(pcibios_claim_one_bus); - - - /* pcibios_finish_adding_to_bus |