From 684281b4fdec56ba884710714f65c1f4b8f6744e Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Mon, 27 Jul 2009 06:27:42 +0000 Subject: [PATCH] kilauea uses ppc40x_simple now SVN-Revision: 17025 --- .../001-makalu_ppc40x_simple.patch | 443 ++++++++++++++++++ .../002-disable_emac_loopback_mode.patch | 25 - .../002-kilauea_halekala_ppc40x_simple.patch | 440 +++++++++++++++++ .../ppc40x/patches-2.6.30/004-magicbox.patch | 14 +- .../ppc40x/patches-2.6.30/005-openrb.patch | 10 +- ...tch => 110-kilauea_openwrt_flashmap.patch} | 0 6 files changed, 895 insertions(+), 37 deletions(-) create mode 100644 target/linux/ppc40x/patches-2.6.30/001-makalu_ppc40x_simple.patch delete mode 100644 target/linux/ppc40x/patches-2.6.30/002-disable_emac_loopback_mode.patch create mode 100644 target/linux/ppc40x/patches-2.6.30/002-kilauea_halekala_ppc40x_simple.patch rename target/linux/ppc40x/patches-2.6.30/{001-kilauea_openwrt_flashmap.patch => 110-kilauea_openwrt_flashmap.patch} (100%) diff --git a/target/linux/ppc40x/patches-2.6.30/001-makalu_ppc40x_simple.patch b/target/linux/ppc40x/patches-2.6.30/001-makalu_ppc40x_simple.patch new file mode 100644 index 0000000000..d4497d8c15 --- /dev/null +++ b/target/linux/ppc40x/patches-2.6.30/001-makalu_ppc40x_simple.patch @@ -0,0 +1,443 @@ +--- 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 +- * +- * Based on the Walnut code by +- * Josh Boyer +- * 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 +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +- +-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-2.6.30/002-disable_emac_loopback_mode.patch b/target/linux/ppc40x/patches-2.6.30/002-disable_emac_loopback_mode.patch deleted file mode 100644 index a82a7a1320..0000000000 --- a/target/linux/ppc40x/patches-2.6.30/002-disable_emac_loopback_mode.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/arch/powerpc/platforms/40x/kilauea.c -+++ b/arch/powerpc/platforms/40x/kilauea.c -@@ -21,6 +21,8 @@ - #include - #include - #include -+#include -+#include - - static __initdata struct of_device_id kilauea_of_bus[] = { - { .compatible = "ibm,plb4", }, -@@ -46,6 +48,13 @@ static int __init kilauea_probe(void) - - ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC); - -+ /* -+ * 405EX(r) has SDR0_MFR[E0CS/E1CS] set after reset. This selects -+ * the internal loopback mode. Clear these bits so that both EMACs -+ * don't use loopback mode as deafult. -+ */ -+ mtdcri(SDR0, SDR0_MFR, mfdcri(SDR0, SDR0_MFR) & ~0x0c000000); -+ - return 1; - } - diff --git a/target/linux/ppc40x/patches-2.6.30/002-kilauea_halekala_ppc40x_simple.patch b/target/linux/ppc40x/patches-2.6.30/002-kilauea_halekala_ppc40x_simple.patch new file mode 100644 index 0000000000..0b17e1b81a --- /dev/null +++ b/target/linux/ppc40x/patches-2.6.30/002-kilauea_halekala_ppc40x_simple.patch @@ -0,0 +1,440 @@ +--- 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 +- * +- * Based on the Walnut code by +- * Josh Boyer +- * 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 +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +- +-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-2.6.30/004-magicbox.patch b/target/linux/ppc40x/patches-2.6.30/004-magicbox.patch index a1a9da8b4c..d997186989 100644 --- a/target/linux/ppc40x/patches-2.6.30/004-magicbox.patch +++ b/target/linux/ppc40x/patches-2.6.30/004-magicbox.patch @@ -396,7 +396,7 @@ image-$(CONFIG_EBONY) += treeImage.ebony cuImage.ebony --- a/arch/powerpc/platforms/40x/Kconfig +++ b/arch/powerpc/platforms/40x/Kconfig -@@ -49,6 +49,16 @@ config KILAUEA +@@ -50,6 +50,16 @@ config KILAUEA help This option enables support for the AMCC PPC405EX evaluation board. @@ -415,12 +415,12 @@ depends on 40x --- 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", +@@ -54,7 +54,8 @@ static char *board[] __initdata = { + "amcc,acadia", + "amcc,haleakala", + "amcc,kilauea", +- "amcc,makalu" ++ "amcc,makalu", + "magicbox" }; diff --git a/target/linux/ppc40x/patches-2.6.30/005-openrb.patch b/target/linux/ppc40x/patches-2.6.30/005-openrb.patch index 0ad6740195..1f0d1a66b4 100644 --- a/target/linux/ppc40x/patches-2.6.30/005-openrb.patch +++ b/target/linux/ppc40x/patches-2.6.30/005-openrb.patch @@ -373,7 +373,7 @@ image-$(CONFIG_EBONY) += treeImage.ebony cuImage.ebony --- a/arch/powerpc/platforms/40x/Kconfig +++ b/arch/powerpc/platforms/40x/Kconfig -@@ -59,6 +59,16 @@ config MAGICBOX +@@ -60,6 +60,16 @@ config MAGICBOX help This option enables support for the Magicbox boards. @@ -392,10 +392,10 @@ depends on 40x --- a/arch/powerpc/platforms/40x/ppc40x_simple.c +++ b/arch/powerpc/platforms/40x/ppc40x_simple.c -@@ -52,7 +52,8 @@ machine_device_initcall(ppc40x_simple, p - */ - static char *board[] __initdata = { - "amcc,acadia", +@@ -55,7 +55,8 @@ static char *board[] __initdata = { + "amcc,haleakala", + "amcc,kilauea", + "amcc,makalu", - "magicbox" + "magicbox", + "openrb" diff --git a/target/linux/ppc40x/patches-2.6.30/001-kilauea_openwrt_flashmap.patch b/target/linux/ppc40x/patches-2.6.30/110-kilauea_openwrt_flashmap.patch similarity index 100% rename from target/linux/ppc40x/patches-2.6.30/001-kilauea_openwrt_flashmap.patch rename to target/linux/ppc40x/patches-2.6.30/110-kilauea_openwrt_flashmap.patch -- 2.30.2