From: Imre Kaloz Date: Tue, 27 Oct 2009 19:20:31 +0000 (+0000) Subject: ppc40x: use version number-less patches and config X-Git-Tag: reboot~22045 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8bf0f955e709717a2f9ae8586017605062402741;p=oweals%2Fopenwrt.git ppc40x: use version number-less patches and config SVN-Revision: 18188 --- diff --git a/target/linux/ppc40x/config-2.6.30 b/target/linux/ppc40x/config-2.6.30 deleted file mode 100644 index 5de51b0426..0000000000 --- a/target/linux/ppc40x/config-2.6.30 +++ /dev/null @@ -1,190 +0,0 @@ -CONFIG_405EP=y -CONFIG_405EX=y -CONFIG_40x=y -# CONFIG_44x is not set -CONFIG_4xx=y -CONFIG_4xx_SOC=y -# CONFIG_6xx is not set -# CONFIG_ACADIA is not set -# CONFIG_ADVANCED_OPTIONS is not set -# CONFIG_AGP is not set -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y -CONFIG_ARCH_HAS_ILOG2_U32=y -CONFIG_ARCH_HAS_WALK_MEMORY=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_ARCH_NO_VIRT_TO_BUS is not set -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -CONFIG_ARCH_POPULATES_NODE_MAP=y -CONFIG_ARCH_REQUIRE_GPIOLIB=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_ARCH_SUPPORTS_MSI=y -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_AUDIT_ARCH=y -CONFIG_BASE_SMALL=0 -# CONFIG_BINARY_PRINTF is not set -CONFIG_BITREVERSE=y -# CONFIG_BOOKE_WDT is not set -CONFIG_BOUNCE=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd" -CONFIG_CMDLINE_BOOL=y -CONFIG_CONSISTENT_SIZE=0x00200000 -# CONFIG_CPU_FREQ is not set -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_WORKQUEUE=y -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_DECOMPRESS_LZMA=y -# CONFIG_DEFAULT_UIMAGE is not set -CONFIG_DEVPORT=y -CONFIG_DTC=y -# CONFIG_E200 is not set -CONFIG_EARLY_PRINTK=y -# CONFIG_EDAC is not set -# CONFIG_EP405 is not set -CONFIG_EXTRA_TARGETS="uImage" -CONFIG_FORCE_MAX_ZONEORDER=11 -# CONFIG_FSL_ULI1575 is not set -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_GENERIC_FIND_LAST_BIT=y -CONFIG_GENERIC_FIND_NEXT_BIT=y -CONFIG_GENERIC_GPIO=y -# CONFIG_GENERIC_IOMAP is not set -CONFIG_GENERIC_NVRAM=y -# CONFIG_GENERIC_TBSYNC is not set -CONFIG_GENERIC_TIME_VSYSCALL=y -# CONFIG_GEN_RTC is not set -CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -# CONFIG_HAS_RAPIDIO is not set -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set -CONFIG_HAVE_IDE=y -CONFIG_HAVE_IOREMAP_PROT=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_HAVE_LMB=y -CONFIG_HAVE_MLOCK=y -CONFIG_HAVE_OPROFILE=y -# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set -# CONFIG_HCU4 is not set -CONFIG_HW_RANDOM=y -CONFIG_HZ=250 -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y -# CONFIG_I2C is not set -CONFIG_IBM_NEW_EMAC=y -# CONFIG_IBM_NEW_EMAC_DEBUG is not set -CONFIG_IBM_NEW_EMAC_EMAC4=y -CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32 -CONFIG_IBM_NEW_EMAC_RGMII=y -CONFIG_IBM_NEW_EMAC_RXB=256 -CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256 -CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0 -CONFIG_IBM_NEW_EMAC_TXB=256 -CONFIG_INITRAMFS_SOURCE="" -# CONFIG_IOMMU_HELPER is not set -# CONFIG_IPIC is not set -# CONFIG_IRQSTACKS is not set -CONFIG_IRQ_PER_CPU=y -CONFIG_ISA_DMA_API=y -CONFIG_KERNEL_START=0xc0000000 -CONFIG_KILAUEA=y -# CONFIG_LEDS_GPIO is not set -# CONFIG_LEDS_GPIO_OF is not set -CONFIG_LOWMEM_SIZE=0x30000000 -# CONFIG_MACINTOSH_DRIVERS is not set -CONFIG_MAGICBOX=y -# CONFIG_MAKALU is not set -# CONFIG_MATH_EMULATION is not set -# CONFIG_MMIO_NVRAM is not set -# CONFIG_MPIC is not set -# CONFIG_MPIC_WEIRD is not set -CONFIG_MTD_CFI_ADV_OPTIONS=y -# CONFIG_MTD_CFI_GEOMETRY is not set -# CONFIG_MTD_CFI_INTELEXT is not set -CONFIG_MTD_OF_PARTS=y -CONFIG_MTD_PHYSMAP_OF=y -# CONFIG_NATSEMI is not set -CONFIG_NOT_COHERENT_CACHE=y -# CONFIG_NVRAM is not set -CONFIG_OF=y -CONFIG_OF_DEVICE=y -CONFIG_OF_GPIO=y -CONFIG_OPENRB=y -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_PAGE_OFFSET=0xc0000000 -CONFIG_PCI=y -CONFIG_PCIEAER=y -CONFIG_PCIEPORTBUS=y -CONFIG_PCI_DISABLE_COMMON_QUIRKS=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCI_MSI=y -CONFIG_PCI_SYSCALL=y -CONFIG_PHYSICAL_START=0x00000000 -CONFIG_PPC=y -CONFIG_PPC32=y -CONFIG_PPC40x_SIMPLE=y -CONFIG_PPC4xx_PCI_EXPRESS=y -# CONFIG_PPC64 is not set -# CONFIG_PPC_85xx is not set -# CONFIG_PPC_8xx is not set -# CONFIG_PPC_970_NAP is not set -# CONFIG_PPC_CELL is not set -# CONFIG_PPC_CELL_NATIVE is not set -# CONFIG_PPC_CLOCK is not set -CONFIG_PPC_DCR=y -# CONFIG_PPC_DCR_MMIO is not set -CONFIG_PPC_DCR_NATIVE=y -# CONFIG_PPC_EARLY_DEBUG is not set -# CONFIG_PPC_I8259 is not set -# CONFIG_PPC_INDIRECT_IO is not set -CONFIG_PPC_INDIRECT_PCI=y -CONFIG_PPC_MMU_NOHASH=y -# CONFIG_PPC_MM_SLICES is not set -# CONFIG_PPC_MPC106 is not set -CONFIG_PPC_NEED_DMA_SYNC_OPS=y -CONFIG_PPC_OF=y -CONFIG_PPC_PCI_CHOICE=y -# CONFIG_PPC_RTAS is not set -CONFIG_PPC_UDBG_16550=y -# CONFIG_PQ2ADS is not set -CONFIG_PRINT_STACK_DEPTH=64 -CONFIG_PROC_DEVICETREE=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_SCHED_HRTICK=y -CONFIG_SCHED_OMIT_FRAME_POINTER=y -# CONFIG_SCSI_DMA is not set -# CONFIG_SERIAL_8250_DETECT_IRQ is not set -CONFIG_SERIAL_8250_EXTENDED=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_SLOW_WORK is not set -CONFIG_SLUB=y -CONFIG_TASK_SIZE=0xc0000000 -CONFIG_TICK_ONESHOT=y -CONFIG_TRACING_SUPPORT=y -# CONFIG_WALNUT is not set -CONFIG_WORD_SIZE=32 -# CONFIG_XILINX_SYSACE is not set -# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set diff --git a/target/linux/ppc40x/config-default b/target/linux/ppc40x/config-default new file mode 100644 index 0000000000..5de51b0426 --- /dev/null +++ b/target/linux/ppc40x/config-default @@ -0,0 +1,190 @@ +CONFIG_405EP=y +CONFIG_405EX=y +CONFIG_40x=y +# CONFIG_44x is not set +CONFIG_4xx=y +CONFIG_4xx_SOC=y +# CONFIG_6xx is not set +# CONFIG_ACADIA is not set +# CONFIG_ADVANCED_OPTIONS is not set +# CONFIG_AGP is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_ARCH_HAS_ILOG2_U32=y +CONFIG_ARCH_HAS_WALK_MEMORY=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_ARCH_NO_VIRT_TO_BUS is not set +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +CONFIG_ARCH_POPULATES_NODE_MAP=y +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_AUDIT_ARCH=y +CONFIG_BASE_SMALL=0 +# CONFIG_BINARY_PRINTF is not set +CONFIG_BITREVERSE=y +# CONFIG_BOOKE_WDT is not set +CONFIG_BOUNCE=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd" +CONFIG_CMDLINE_BOOL=y +CONFIG_CONSISTENT_SIZE=0x00200000 +# CONFIG_CPU_FREQ is not set +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_WORKQUEUE=y +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DECOMPRESS_LZMA=y +# CONFIG_DEFAULT_UIMAGE is not set +CONFIG_DEVPORT=y +CONFIG_DTC=y +# CONFIG_E200 is not set +CONFIG_EARLY_PRINTK=y +# CONFIG_EDAC is not set +# CONFIG_EP405 is not set +CONFIG_EXTRA_TARGETS="uImage" +CONFIG_FORCE_MAX_ZONEORDER=11 +# CONFIG_FSL_ULI1575 is not set +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_GPIO=y +# CONFIG_GENERIC_IOMAP is not set +CONFIG_GENERIC_NVRAM=y +# CONFIG_GENERIC_TBSYNC is not set +CONFIG_GENERIC_TIME_VSYSCALL=y +# CONFIG_GEN_RTC is not set +CONFIG_GPIOLIB=y +CONFIG_GPIO_SYSFS=y +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +# CONFIG_HAS_RAPIDIO is not set +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_HAVE_IDE=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_HAVE_LMB=y +CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_OPROFILE=y +# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set +# CONFIG_HCU4 is not set +CONFIG_HW_RANDOM=y +CONFIG_HZ=250 +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_I2C is not set +CONFIG_IBM_NEW_EMAC=y +# CONFIG_IBM_NEW_EMAC_DEBUG is not set +CONFIG_IBM_NEW_EMAC_EMAC4=y +CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32 +CONFIG_IBM_NEW_EMAC_RGMII=y +CONFIG_IBM_NEW_EMAC_RXB=256 +CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256 +CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0 +CONFIG_IBM_NEW_EMAC_TXB=256 +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_IOMMU_HELPER is not set +# CONFIG_IPIC is not set +# CONFIG_IRQSTACKS is not set +CONFIG_IRQ_PER_CPU=y +CONFIG_ISA_DMA_API=y +CONFIG_KERNEL_START=0xc0000000 +CONFIG_KILAUEA=y +# CONFIG_LEDS_GPIO is not set +# CONFIG_LEDS_GPIO_OF is not set +CONFIG_LOWMEM_SIZE=0x30000000 +# CONFIG_MACINTOSH_DRIVERS is not set +CONFIG_MAGICBOX=y +# CONFIG_MAKALU is not set +# CONFIG_MATH_EMULATION is not set +# CONFIG_MMIO_NVRAM is not set +# CONFIG_MPIC is not set +# CONFIG_MPIC_WEIRD is not set +CONFIG_MTD_CFI_ADV_OPTIONS=y +# CONFIG_MTD_CFI_GEOMETRY is not set +# CONFIG_MTD_CFI_INTELEXT is not set +CONFIG_MTD_OF_PARTS=y +CONFIG_MTD_PHYSMAP_OF=y +# CONFIG_NATSEMI is not set +CONFIG_NOT_COHERENT_CACHE=y +# CONFIG_NVRAM is not set +CONFIG_OF=y +CONFIG_OF_DEVICE=y +CONFIG_OF_GPIO=y +CONFIG_OPENRB=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_PAGE_OFFSET=0xc0000000 +CONFIG_PCI=y +CONFIG_PCIEAER=y +CONFIG_PCIEPORTBUS=y +CONFIG_PCI_DISABLE_COMMON_QUIRKS=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_MSI=y +CONFIG_PCI_SYSCALL=y +CONFIG_PHYSICAL_START=0x00000000 +CONFIG_PPC=y +CONFIG_PPC32=y +CONFIG_PPC40x_SIMPLE=y +CONFIG_PPC4xx_PCI_EXPRESS=y +# CONFIG_PPC64 is not set +# CONFIG_PPC_85xx is not set +# CONFIG_PPC_8xx is not set +# CONFIG_PPC_970_NAP is not set +# CONFIG_PPC_CELL is not set +# CONFIG_PPC_CELL_NATIVE is not set +# CONFIG_PPC_CLOCK is not set +CONFIG_PPC_DCR=y +# CONFIG_PPC_DCR_MMIO is not set +CONFIG_PPC_DCR_NATIVE=y +# CONFIG_PPC_EARLY_DEBUG is not set +# CONFIG_PPC_I8259 is not set +# CONFIG_PPC_INDIRECT_IO is not set +CONFIG_PPC_INDIRECT_PCI=y +CONFIG_PPC_MMU_NOHASH=y +# CONFIG_PPC_MM_SLICES is not set +# CONFIG_PPC_MPC106 is not set +CONFIG_PPC_NEED_DMA_SYNC_OPS=y +CONFIG_PPC_OF=y +CONFIG_PPC_PCI_CHOICE=y +# CONFIG_PPC_RTAS is not set +CONFIG_PPC_UDBG_16550=y +# CONFIG_PQ2ADS is not set +CONFIG_PRINT_STACK_DEPTH=64 +CONFIG_PROC_DEVICETREE=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_SCHED_HRTICK=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +# CONFIG_SCSI_DMA is not set +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +CONFIG_SERIAL_8250_EXTENDED=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_SLOW_WORK is not set +CONFIG_SLUB=y +CONFIG_TASK_SIZE=0xc0000000 +CONFIG_TICK_ONESHOT=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_WALNUT is not set +CONFIG_WORD_SIZE=32 +# CONFIG_XILINX_SYSACE is not set +# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set 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 deleted file mode 100644 index d4497d8c15..0000000000 --- a/target/linux/ppc40x/patches-2.6.30/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 -- * -- * 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-kilauea_halekala_ppc40x_simple.patch b/target/linux/ppc40x/patches-2.6.30/002-kilauea_halekala_ppc40x_simple.patch deleted file mode 100644 index 0b17e1b81a..0000000000 --- a/target/linux/ppc40x/patches-2.6.30/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 -- * -- * 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/003-powerpc-add-EBC_BXCR_BW-defines.patch b/target/linux/ppc40x/patches-2.6.30/003-powerpc-add-EBC_BXCR_BW-defines.patch deleted file mode 100644 index 8e380c1c9c..0000000000 --- a/target/linux/ppc40x/patches-2.6.30/003-powerpc-add-EBC_BXCR_BW-defines.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/arch/powerpc/boot/dcr.h -+++ b/arch/powerpc/boot/dcr.h -@@ -57,6 +57,9 @@ static const unsigned long sdram_bxcr[] - #define EBC_BXCR_BU_WO 0x00010000 - #define EBC_BXCR_BU_RW 0x00018000 - #define EBC_BXCR_BW 0x00006000 -+#define EBC_BXCR_BW_8 0x00000000 -+#define EBC_BXCR_BW_16 0x00002000 -+#define EBC_BXCR_BW_32 0x00006000 - #define EBC_B0AP 0x10 - #define EBC_B1AP 0x11 - #define EBC_B2AP 0x12 diff --git a/target/linux/ppc40x/patches-2.6.30/004-magicbox.patch b/target/linux/ppc40x/patches-2.6.30/004-magicbox.patch deleted file mode 100644 index d6ce22d4a8..0000000000 --- a/target/linux/ppc40x/patches-2.6.30/004-magicbox.patch +++ /dev/null @@ -1,435 +0,0 @@ ---- /dev/null -+++ b/arch/powerpc/boot/cuboot-magicbox.c -@@ -0,0 +1,90 @@ -+/* -+ * Old U-boot compatibility for Magicbox boards -+ * -+ * Author: Imre Kaloz -+ * Gabor Juhos -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 as published -+ * by the Free Software Foundation. -+ */ -+ -+#include "ops.h" -+#include "io.h" -+#include "dcr.h" -+#include "stdio.h" -+#include "4xx.h" -+#include "44x.h" -+#include "cuboot.h" -+ -+#define TARGET_4xx -+#define TARGET_405EP -+#include "ppcboot.h" -+ -+static bd_t bd; -+ -+static void fixup_cf_card(void) -+{ -+#define DCRN_CPC0_PCI_BASE 0xf9 -+#define CF_CS0_BASE 0xff100000 -+#define CF_CS1_BASE 0xff200000 -+ -+ /* Turn on PerWE instead of PCIsomething */ -+ mtdcr(DCRN_CPC0_PCI_BASE, -+ mfdcr(DCRN_CPC0_PCI_BASE) | (0x80000000L >> 27)); -+ -+ /* PerCS1 (CF's CS0): base 0xff100000, 16-bit, rw */ -+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B1CR); -+ mtdcr(DCRN_EBC0_CFGDATA, CF_CS0_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16); -+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B1AP); -+ mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800); -+ -+ /* PerCS2 (CF's CS1): base 0xff200000, 16-bit, rw */ -+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B2CR); -+ mtdcr(DCRN_EBC0_CFGDATA, CF_CS1_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16); -+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B2AP); -+ mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800); -+ -+#undef DCRN_CPC0_PCI_BASE -+#undef CF_CS0_BASE -+#undef CF_CS1_BASE -+} -+ -+static void magicbox_fixups(void) -+{ -+ ibm405ep_fixup_clocks(bd.bi_procfreq / 8); -+ ibm4xx_sdram_fixup_memsize(); -+ -+ /* Magicbox v1 has only one ethernet, one serial and no -+ * CF slot -- detect it using it's fake enet1addr -+ */ -+ if ((bd.bi_enet1addr[0] == 0x00) && -+ (bd.bi_enet1addr[1] == 0x00) && -+ (bd.bi_enet1addr[2] == 0x02) && -+ (bd.bi_enet1addr[3] == 0xfa) && -+ (bd.bi_enet1addr[4] == 0xf0) && -+ (bd.bi_enet1addr[5] == 0x80)) { -+ void *devp; -+ -+ devp = finddevice("/plb/opb/ethernet@ef600900"); -+ del_node(devp); -+ devp = finddevice("/plb/opb/serial@ef600400"); -+ del_node(devp); -+ devp = finddevice("/plb/ebc/cf_card@ff100000"); -+ del_node(devp); -+ } else { -+ fixup_cf_card(); -+ } -+ -+ dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr); -+} -+ -+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, -+ unsigned long r6, unsigned long r7) -+{ -+ CUBOOT_INIT(); -+ platform_ops.fixups = magicbox_fixups; -+ platform_ops.exit = ibm40x_dbcr_reset; -+ fdt_init(_dtb_start); -+ serial_console_init(); -+} ---- /dev/null -+++ b/arch/powerpc/boot/dts/magicbox.dts -@@ -0,0 +1,281 @@ -+/* -+ * Device Tree Source for Magicbox boards -+ * -+ * Copyright 2008-2009 Imre Kaloz -+ * Copyright 2009 Gabor Juhos -+ * -+ * Based on walnut.dts -+ * -+ * This file is licensed under the terms of the GNU General Public -+ * License version 2. This program is licensed "as is" without -+ * any warranty of any kind, whether express or implied. -+ */ -+ -+/dts-v1/; -+ -+/ { -+ #address-cells = <1>; -+ #size-cells = <1>; -+ model = "magicbox"; -+ compatible = "magicbox"; -+ dcr-parent = <&{/cpus/cpu@0}>; -+ -+ aliases { -+ ethernet0 = &EMAC0; -+ ethernet1 = &EMAC1; -+ serial0 = &UART0; -+ serial1 = &UART1; -+ }; -+ -+ cpus { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ cpu@0 { -+ device_type = "cpu"; -+ model = "PowerPC,405EP"; -+ reg = <0x00000000>; -+ clock-frequency = <0>; /* Filled in by zImage */ -+ timebase-frequency = <0>; /* Filled in by zImage */ -+ i-cache-line-size = <0x20>; -+ d-cache-line-size = <0x20>; -+ i-cache-size = <0x4000>; -+ d-cache-size = <0x4000>; -+ dcr-controller; -+ dcr-access-method = "native"; -+ }; -+ }; -+ -+ memory { -+ device_type = "memory"; -+ reg = <0x00000000 0x00000000>; /* Filled in by zImage */ -+ }; -+ -+ UIC0: interrupt-controller { -+ compatible = "ibm,uic"; -+ interrupt-controller; -+ cell-index = <0>; -+ dcr-reg = <0x0c0 0x009>; -+ #address-cells = <0>; -+ #size-cells = <0>; -+ #interrupt-cells = <2>; -+ }; -+ -+ plb { -+ compatible = "ibm,plb3"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ ranges; -+ clock-frequency = <0>; /* Filled in by zImage */ -+ -+ SDRAM0: memory-controller { -+ compatible = "ibm,sdram-405ep"; -+ dcr-reg = <0x010 0x002>; -+ }; -+ -+ MAL: mcmal { -+ compatible = "ibm,mcmal-405ep", "ibm,mcmal"; -+ dcr-reg = <0x180 0x062>; -+ num-tx-chans = <4>; -+ num-rx-chans = <2>; -+ interrupt-parent = <&UIC0>; -+ interrupts = < -+ 0xb 0x4 /* TXEOB */ -+ 0xc 0x4 /* RXEOB */ -+ 0xa 0x4 /* SERR */ -+ 0xd 0x4 /* TXDE */ -+ 0xe 0x4 /* RXDE */>; -+ }; -+ -+ POB0: opb { -+ compatible = "ibm,opb-405ep", "ibm,opb"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ ranges = <0xef600000 0xef600000 0x00a00000>; -+ dcr-reg = <0x0a0 0x005>; -+ clock-frequency = <0>; /* Filled in by zImage */ -+ -+ UART0: serial@ef600300 { -+ device_type = "serial"; -+ compatible = "ns16550"; -+ reg = <0xef600300 0x00000008>; -+ virtual-reg = <0xef600300>; -+ clock-frequency = <0>; /* Filled in by zImage */ -+ current-speed = <115200>; -+ interrupt-parent = <&UIC0>; -+ interrupts = <0x0 0x4>; -+ }; -+ -+ UART1: serial@ef600400 { -+ device_type = "serial"; -+ compatible = "ns16550"; -+ reg = <0xef600400 0x00000008>; -+ virtual-reg = <0xef600400>; -+ clock-frequency = <0>; /* Filled in by zImage */ -+ current-speed = <115200>; -+ interrupt-parent = <&UIC0>; -+ interrupts = <0x1 0x4>; -+ }; -+ -+ IIC: i2c@ef600500 { -+ compatible = "ibm,iic-405ep", "ibm,iic"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <0xef600500 0x00000011>; -+ interrupt-parent = <&UIC0>; -+ interrupts = <0x2 0x4>; -+ -+ dtt@48 { -+ compatible = "national,lm75"; -+ reg = <0x48>; -+ }; -+ -+ eeprom@50 { -+ compatible = "at24,24c16"; -+ reg = <0x50>; -+ }; -+ }; -+ -+ GPIO0: gpio-controller@ef600700 { -+ compatible = "ibm,ppc4xx-gpio"; -+ reg = <0xef600700 0x00000020>; -+ #gpio-cells = <2>; -+ gpio-controller; -+ }; -+ -+ EMAC0: ethernet@ef600800 { -+ linux,network-index = <0x0>; -+ device_type = "network"; -+ compatible = "ibm,emac-405ep", "ibm,emac"; -+ interrupt-parent = <&UIC0>; -+ interrupts = < -+ 0xf 0x4 /* Ethernet */ -+ 0x9 0x4 /* Ethernet Wake Up */>; -+ local-mac-address = [000000000000]; /* Filled in by zImage */ -+ reg = <0xef600800 0x00000070>; -+ mal-device = <&MAL>; -+ mal-tx-channel = <0>; -+ mal-rx-channel = <0>; -+ cell-index = <0>; -+ max-frame-size = <0x5dc>; -+ rx-fifo-size = <0x1000>; -+ tx-fifo-size = <0x800>; -+ phy-mode = "mii"; -+ phy-map = <0x00000000>; -+ }; -+ -+ EMAC1: ethernet@ef600900 { -+ linux,network-index = <0x1>; -+ device_type = "network"; -+ compatible = "ibm,emac-405ep", "ibm,emac"; -+ interrupt-parent = <&UIC0>; -+ interrupts = < -+ 0x11 0x4 /* Ethernet */ -+ 0x09 0x4 /* Ethernet Wake Up */>; -+ local-mac-address = [000000000000]; /* Filled in by zImage */ -+ reg = <0xef600900 0x00000070>; -+ mal-device = <&MAL>; -+ mal-tx-channel = <2>; -+ mal-rx-channel = <1>; -+ cell-index = <1>; -+ max-frame-size = <0x5dc>; -+ rx-fifo-size = <0x1000>; -+ tx-fifo-size = <0x800>; -+ mdio-device = <&EMAC0>; -+ phy-mode = "mii"; -+ phy-map = <0x00000001>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ user { -+ label = "magicbox:red:user"; -+ gpios = <&GPIO0 2 1>; -+ }; -+ }; -+ }; -+ -+ EBC0: ebc { -+ compatible = "ibm,ebc-405ep", "ibm,ebc"; -+ dcr-reg = <0x012 0x002>; -+ #address-cells = <2>; -+ #size-cells = <1>; -+ /* The ranges property is supplied by the bootwrapper -+ * and is based on the firmware's configuration of the -+ * EBC bridge -+ */ -+ clock-frequency = <0>; /* Filled in by zImage */ -+ -+ cf_card@ff100000 { -+ compatible = "magicbox-cf", "pata-magicbox-cf"; -+ reg = <0x00000000 0xff100000 0x00001000 -+ 0x00000000 0xff200000 0x00001000>; -+ interrupt-parent = <&UIC0>; -+ interrupts = <0x19 0x1 /* IRQ_TYPE_EDGE_RISING */ >; -+ }; -+ -+ nor_flash@ffc00000 { -+ compatible = "cfi-flash"; -+ bank-width = <2>; -+ reg = <0x00000000 0xffc00000 0x00400000>; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ partition@0 { -+ label = "linux"; -+ reg = <0x0 0x120000>; -+ }; -+ partition@120000 { -+ label = "rootfs"; -+ reg = <0x120000 0x2a0000>; -+ }; -+ partition@3c0000 { -+ label = "u-boot"; -+ reg = <0x3c0000 0x30000>; -+ read-only; -+ }; -+ }; -+ }; -+ -+ PCI0: pci@ec000000 { -+ device_type = "pci"; -+ #interrupt-cells = <1>; -+ #size-cells = <2>; -+ #address-cells = <3>; -+ compatible = "ibm,plb405ep-pci", "ibm,plb-pci"; -+ primary; -+ reg = <0xeec00000 0x00000008 /* Config space access */ -+ 0xeed80000 0x00000004 /* IACK */ -+ 0xeed80000 0x00000004 /* Special cycle */ -+ 0xef480000 0x00000040>; /* Internal registers */ -+ -+ /* Outbound ranges, one memory and one IO, -+ * later cannot be changed. Chip supports a second -+ * IO range but we don't use it for now -+ */ -+ ranges = <0x02000000 0x00000000 0x80000000 0x80000000 0x00000000 0x20000000 -+ 0x01000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>; -+ -+ /* Inbound 2GB range starting at 0 */ -+ dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>; -+ -+ interrupt-map-mask = <0xf800 0x0 0x0 0x0>; -+ interrupt-map = < -+ /* IDSEL 1 */ -+ 0x800 0x0 0x0 0x0 &UIC0 0x1c 0x8 -+ -+ /* IDSEL 2 */ -+ 0x1000 0x0 0x0 0x0 &UIC0 0x1d 0x8 -+ -+ /* IDSEL 3 */ -+ 0x1800 0x0 0x0 0x0 &UIC0 0x1e 0x8 -+ -+ /* IDSEL 4 */ -+ 0x2000 0x0 0x0 0x0 &UIC0 0x1f 0x8 -+ >; -+ }; -+ }; -+ -+ chosen { -+ linux,stdout-path = "/plb/opb/serial@ef600300"; -+ }; -+}; ---- a/arch/powerpc/boot/Makefile -+++ b/arch/powerpc/boot/Makefile -@@ -42,6 +42,7 @@ $(obj)/ebony.o: BOOTCFLAGS += -mcpu=440 - $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440 - $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440 - $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405 -+$(obj)/cuboot-magicbox.o: BOOTCFLAGS += -mcpu=405 - $(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 - 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 - 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 - image-$(CONFIG_WALNUT) += treeImage.walnut - image-$(CONFIG_ACADIA) += cuImage.acadia -+image-$(CONFIG_MAGICBOX) += cuImage.magicbox - - # Board ports in arch/powerpc/platform/44x/Kconfig - 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 - help - This option enables support for the AMCC PPC405EX evaluation board. - -+config MAGICBOX -+ bool "Magicbox" -+ depends on 40x -+ default n -+ select PPC40x_SIMPLE -+ select 405EP -+ select PCI -+ help -+ This option enables support for the Magicbox boards. -+ - config MAKALU - bool "Makalu" - 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", - "amcc,haleakala", - "amcc,kilauea", -- "amcc,makalu" -+ "amcc,makalu", -+ "magicbox" - }; - - static int __init ppc40x_probe(void) diff --git a/target/linux/ppc40x/patches-2.6.30/005-openrb.patch b/target/linux/ppc40x/patches-2.6.30/005-openrb.patch deleted file mode 100644 index 43407c2025..0000000000 --- a/target/linux/ppc40x/patches-2.6.30/005-openrb.patch +++ /dev/null @@ -1,412 +0,0 @@ ---- /dev/null -+++ b/arch/powerpc/boot/cuboot-openrb.c -@@ -0,0 +1,71 @@ -+/* -+ * Old U-boot compatibility for OpenRB boards -+ * -+ * Author: Gabor Juhos -+ * Imre Kaloz -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 as published -+ * by the Free Software Foundation. -+ */ -+ -+#include "ops.h" -+#include "io.h" -+#include "dcr.h" -+#include "stdio.h" -+#include "4xx.h" -+#include "44x.h" -+#include "cuboot.h" -+ -+#define TARGET_4xx -+#define TARGET_405EP -+#include "ppcboot.h" -+ -+static bd_t bd; -+ -+static void fixup_cf_card(void) -+{ -+#define DCRN_CPC0_PCI_BASE 0xf9 -+#define CF_CS0_BASE 0xff100000 -+#define CF_CS1_BASE 0xff200000 -+ -+ /* Turn on PerWE instead of PCIsomething */ -+ mtdcr(DCRN_CPC0_PCI_BASE, -+ mfdcr(DCRN_CPC0_PCI_BASE) | (0x80000000L >> 27)); -+ -+ /* PerCS1 (CF's CS0): base 0xff100000, 16-bit, rw */ -+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B1CR); -+ mtdcr(DCRN_EBC0_CFGDATA, CF_CS0_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16); -+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B1AP); -+ mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800); -+ -+ /* PerCS2 (CF's CS1): base 0xff200000, 16-bit, rw */ -+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B2CR); -+ mtdcr(DCRN_EBC0_CFGDATA, CF_CS1_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16); -+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B2AP); -+ mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800); -+ -+#undef DCRN_CPC0_PCI_BASE -+#undef CF_CS0_BASE -+#undef CF_CS1_BASE -+} -+ -+static void openrb_fixups(void) -+{ -+ ibm405ep_fixup_clocks(bd.bi_procfreq / 8); -+ ibm4xx_sdram_fixup_memsize(); -+ -+ fixup_cf_card(); -+ -+ dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr); -+} -+ -+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, -+ unsigned long r6, unsigned long r7) -+{ -+ CUBOOT_INIT(); -+ platform_ops.fixups = openrb_fixups; -+ platform_ops.exit = ibm40x_dbcr_reset; -+ fdt_init(_dtb_start); -+ serial_console_init(); -+} ---- /dev/null -+++ b/arch/powerpc/boot/dts/openrb.dts -@@ -0,0 +1,276 @@ -+/* -+ * Device Tree Source for OpenRB boards -+ * -+ * Copyright 2009 Gabor Juhos -+ * Copyright 2009 Imre Kaloz -+ * -+ * Based on walnut.dts -+ * -+ * This file is licensed under the terms of the GNU General Public -+ * License version 2. This program is licensed "as is" without -+ * any warranty of any kind, whether express or implied. -+ */ -+ -+/dts-v1/; -+ -+/ { -+ #address-cells = <1>; -+ #size-cells = <1>; -+ model = "openrb"; -+ compatible = "openrb"; -+ dcr-parent = <&{/cpus/cpu@0}>; -+ -+ aliases { -+ ethernet0 = &EMAC0; -+ ethernet1 = &EMAC1; -+ serial0 = &UART0; -+ serial1 = &UART1; -+ }; -+ -+ cpus { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ cpu@0 { -+ device_type = "cpu"; -+ model = "PowerPC,405EP"; -+ reg = <0x00000000>; -+ clock-frequency = <0>; /* Filled in by zImage */ -+ timebase-frequency = <0>; /* Filled in by zImage */ -+ i-cache-line-size = <0x20>; -+ d-cache-line-size = <0x20>; -+ i-cache-size = <0x4000>; -+ d-cache-size = <0x4000>; -+ dcr-controller; -+ dcr-access-method = "native"; -+ }; -+ }; -+ -+ memory { -+ device_type = "memory"; -+ reg = <0x00000000 0x00000000>; /* Filled in by zImage */ -+ }; -+ -+ UIC0: interrupt-controller { -+ compatible = "ibm,uic"; -+ interrupt-controller; -+ cell-index = <0>; -+ dcr-reg = <0x0c0 0x009>; -+ #address-cells = <0>; -+ #size-cells = <0>; -+ #interrupt-cells = <2>; -+ }; -+ -+ plb { -+ compatible = "ibm,plb3"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ ranges; -+ clock-frequency = <0>; /* Filled in by zImage */ -+ -+ SDRAM0: memory-controller { -+ compatible = "ibm,sdram-405ep"; -+ dcr-reg = <0x010 0x002>; -+ }; -+ -+ MAL: mcmal { -+ compatible = "ibm,mcmal-405ep", "ibm,mcmal"; -+ dcr-reg = <0x180 0x062>; -+ num-tx-chans = <4>; -+ num-rx-chans = <2>; -+ interrupt-parent = <&UIC0>; -+ interrupts = < -+ 0xb 0x4 /* TXEOB */ -+ 0xc 0x4 /* RXEOB */ -+ 0xa 0x4 /* SERR */ -+ 0xd 0x4 /* TXDE */ -+ 0xe 0x4 /* RXDE */>; -+ }; -+ -+ POB0: opb { -+ compatible = "ibm,opb-405ep", "ibm,opb"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ ranges = <0xef600000 0xef600000 0x00a00000>; -+ dcr-reg = <0x0a0 0x005>; -+ clock-frequency = <0>; /* Filled in by zImage */ -+ -+ UART0: serial@ef600300 { -+ device_type = "serial"; -+ compatible = "ns16550"; -+ reg = <0xef600300 0x00000008>; -+ virtual-reg = <0xef600300>; -+ clock-frequency = <0>; /* Filled in by zImage */ -+ current-speed = <115200>; -+ interrupt-parent = <&UIC0>; -+ interrupts = <0x0 0x4>; -+ }; -+ -+ UART1: serial@ef600400 { -+ device_type = "serial"; -+ compatible = "ns16550"; -+ reg = <0xef600400 0x00000008>; -+ virtual-reg = <0xef600400>; -+ clock-frequency = <0>; /* Filled in by zImage */ -+ current-speed = <115200>; -+ interrupt-parent = <&UIC0>; -+ interrupts = <0x1 0x4>; -+ }; -+ -+ IIC: i2c@ef600500 { -+ compatible = "ibm,iic-405ep", "ibm,iic"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <0xef600500 0x00000011>; -+ interrupt-parent = <&UIC0>; -+ interrupts = <0x2 0x4>; -+ -+ eeprom@50 { -+ compatible = "at24,24c16"; -+ reg = <0x50>; -+ }; -+ }; -+ -+ GPIO0: gpio-controller@ef600700 { -+ compatible = "ibm,ppc4xx-gpio"; -+ reg = <0xef600700 0x00000020>; -+ #gpio-cells = <2>; -+ gpio-controller; -+ }; -+ -+ EMAC0: ethernet@ef600800 { -+ linux,network-index = <0x0>; -+ device_type = "network"; -+ compatible = "ibm,emac-405ep", "ibm,emac"; -+ interrupt-parent = <&UIC0>; -+ interrupts = < -+ 0xf 0x4 /* Ethernet */ -+ 0x9 0x4 /* Ethernet Wake Up */>; -+ local-mac-address = [000000000000]; /* Filled in by zImage */ -+ reg = <0xef600800 0x00000070>; -+ mal-device = <&MAL>; -+ mal-tx-channel = <0>; -+ mal-rx-channel = <0>; -+ cell-index = <0>; -+ max-frame-size = <0x5dc>; -+ rx-fifo-size = <0x1000>; -+ tx-fifo-size = <0x800>; -+ phy-mode = "mii"; -+ phy-map = <0x00000000>; -+ }; -+ -+ EMAC1: ethernet@ef600900 { -+ linux,network-index = <0x1>; -+ device_type = "network"; -+ compatible = "ibm,emac-405ep", "ibm,emac"; -+ interrupt-parent = <&UIC0>; -+ interrupts = < -+ 0x11 0x4 /* Ethernet */ -+ 0x09 0x4 /* Ethernet Wake Up */>; -+ local-mac-address = [000000000000]; /* Filled in by zImage */ -+ reg = <0xef600900 0x00000070>; -+ mal-device = <&MAL>; -+ mal-tx-channel = <2>; -+ mal-rx-channel = <1>; -+ cell-index = <1>; -+ max-frame-size = <0x5dc>; -+ rx-fifo-size = <0x1000>; -+ tx-fifo-size = <0x800>; -+ mdio-device = <&EMAC0>; -+ phy-mode = "mii"; -+ phy-map = <0x00000001>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ user { -+ label = "openrb:green:user"; -+ gpios = <&GPIO0 2 1>; -+ }; -+ }; -+ }; -+ -+ EBC0: ebc { -+ compatible = "ibm,ebc-405ep", "ibm,ebc"; -+ dcr-reg = <0x012 0x002>; -+ #address-cells = <2>; -+ #size-cells = <1>; -+ /* The ranges property is supplied by the bootwrapper -+ * and is based on the firmware's configuration of the -+ * EBC bridge -+ */ -+ clock-frequency = <0>; /* Filled in by zImage */ -+ -+ cf_card@ff100000 { -+ compatible = "magicbox-cf", "pata-magicbox-cf"; -+ reg = <0x00000000 0xff100000 0x00001000 -+ 0x00000000 0xff200000 0x00001000>; -+ interrupt-parent = <&UIC0>; -+ interrupts = <0x19 0x1 /* IRQ_TYPE_EDGE_RISING */ >; -+ }; -+ -+ nor_flash@ff800000 { -+ compatible = "cfi-flash"; -+ bank-width = <2>; -+ reg = <0x00000000 0xff800000 0x00800000>; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ partition@0 { -+ label = "linux"; -+ reg = <0x0 0x120000>; -+ }; -+ partition@120000 { -+ label = "rootfs"; -+ reg = <0x120000 0x6a0000>; -+ }; -+ partition@7c0000 { -+ label = "u-boot"; -+ reg = <0x7c0000 0x30000>; -+ read-only; -+ }; -+ }; -+ }; -+ -+ PCI0: pci@ec000000 { -+ device_type = "pci"; -+ #interrupt-cells = <1>; -+ #size-cells = <2>; -+ #address-cells = <3>; -+ compatible = "ibm,plb405ep-pci", "ibm,plb-pci"; -+ primary; -+ reg = <0xeec00000 0x00000008 /* Config space access */ -+ 0xeed80000 0x00000004 /* IACK */ -+ 0xeed80000 0x00000004 /* Special cycle */ -+ 0xef480000 0x00000040>; /* Internal registers */ -+ -+ /* Outbound ranges, one memory and one IO, -+ * later cannot be changed. Chip supports a second -+ * IO range but we don't use it for now -+ */ -+ ranges = <0x02000000 0x00000000 0x80000000 0x80000000 0x00000000 0x20000000 -+ 0x01000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>; -+ -+ /* Inbound 2GB range starting at 0 */ -+ dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>; -+ -+ interrupt-map-mask = <0xf800 0x0 0x0 0x0>; -+ interrupt-map = < -+ /* IDSEL 1 */ -+ 0x800 0x0 0x0 0x0 &UIC0 0x1c 0x8 -+ -+ /* IDSEL 2 */ -+ 0x1000 0x0 0x0 0x0 &UIC0 0x1d 0x8 -+ -+ /* IDSEL 3 */ -+ 0x1800 0x0 0x0 0x0 &UIC0 0x1e 0x8 -+ -+ /* IDSEL 4 */ -+ 0x2000 0x0 0x0 0x0 &UIC0 0x1f 0x8 -+ >; -+ }; -+ }; -+ -+ chosen { -+ linux,stdout-path = "/plb/opb/serial@ef600300"; -+ }; -+}; ---- a/arch/powerpc/boot/Makefile -+++ b/arch/powerpc/boot/Makefile -@@ -43,6 +43,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 -+$(obj)/cuboot-openrb.o: BOOTCFLAGS += -mcpu=405 - $(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 \ - 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 - src-boot := $(src-wlib) $(src-plat) empty.c - - src-boot := $(addprefix $(obj)/, $(src-boot)) -@@ -194,6 +196,7 @@ image-$(CONFIG_EP405) += dtbImage.ep40 - image-$(CONFIG_WALNUT) += treeImage.walnut - image-$(CONFIG_ACADIA) += cuImage.acadia - image-$(CONFIG_MAGICBOX) += cuImage.magicbox -+image-$(CONFIG_OPENRB) += cuImage.openrb - - # Board ports in arch/powerpc/platform/44x/Kconfig - 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 - help - This option enables support for the Magicbox boards. - -+config OPENRB -+ bool "OpenRB" -+ depends on 40x -+ default n -+ select PPC40x_SIMPLE -+ select 405EP -+ select PCI -+ help -+ This option enables support for the OpenRB boards. -+ - config MAKALU - bool "Makalu" - 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", - "amcc,kilauea", - "amcc,makalu", -- "magicbox" -+ "magicbox", -+ "openrb" - }; - - static int __init ppc40x_probe(void) diff --git a/target/linux/ppc40x/patches-2.6.30/100-magicbox-ide-driver.patch b/target/linux/ppc40x/patches-2.6.30/100-magicbox-ide-driver.patch deleted file mode 100644 index d6907f9828..0000000000 --- a/target/linux/ppc40x/patches-2.6.30/100-magicbox-ide-driver.patch +++ /dev/null @@ -1,320 +0,0 @@ ---- a/drivers/ide/Kconfig -+++ b/drivers/ide/Kconfig -@@ -717,6 +717,11 @@ config BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA - depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX - endchoice - -+config BLK_DEV_IDE_MAGICBOX -+ tristate "Magicbox CF card support" -+ depends on MAGICBOX || OPENRB_LIGHT -+ select IDE_XFER_MODE -+ - config BLK_DEV_IDE_TX4938 - tristate "TX4938 internal IDE support" - depends on SOC_TX4938 ---- a/drivers/ide/Makefile -+++ b/drivers/ide/Makefile -@@ -113,6 +113,7 @@ obj-$(CONFIG_BLK_DEV_IDE_RAPIDE) += rapi - obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710) += palm_bk3710.o - - obj-$(CONFIG_BLK_DEV_IDE_AU1XXX) += au1xxx-ide.o -+obj-$(CONFIG_BLK_DEV_IDE_MAGICBOX) += magicbox_ide.o - - obj-$(CONFIG_BLK_DEV_IDE_TX4938) += tx4938ide.o - obj-$(CONFIG_BLK_DEV_IDE_TX4939) += tx4939ide.o ---- /dev/null -+++ b/drivers/ide/magicbox_ide.c -@@ -0,0 +1,293 @@ -+/* -+ * IDE driver for the MagicBox 2.0 onboard CompactFlash slot. -+ * -+ * Copyright (C) 2009 Gabor Juhos -+ * -+ * Based on the original driver by Wojtek Kaniewski -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 as published -+ * by the Free Software Foundation. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define DRV_DESC "IDE driver for Magicbox 2.0 onboard CF slot" -+#define DRV_NAME "magicbox_cf" -+ -+static inline u8 magicbox_ide_inb(unsigned long port) -+{ -+ return (u8) (readw((void __iomem *) port) >> 8) & 0xff; -+} -+ -+static inline void magicbox_ide_outb(u8 value, unsigned long port) -+{ -+ writew(value << 8, (void __iomem *) port); -+} -+ -+static inline void magicbox_ide_insw(unsigned long port, void *addr, u32 count) -+{ -+ u16 *ptr; -+ -+ for (ptr = addr; count--; ptr++) -+ *ptr = readw((void __iomem *) port); -+} -+ -+static inline void magicbox_ide_insl(unsigned long port, void *addr, u32 count) -+{ -+ u32 *ptr; -+ -+ for (ptr = addr; count--; ptr++) -+ *ptr = readl((void __iomem *) port); -+} -+ -+static inline void magicbox_ide_outsw(unsigned long port, void *addr, -+ u32 count) -+{ -+ u16 *ptr; -+ -+ for (ptr = addr; count--; ptr++) -+ writew(*ptr, (void __iomem *) port); -+} -+ -+static inline void magicbox_ide_outsl(unsigned long port, void *addr, -+ u32 count) -+{ -+ u32 *ptr; -+ -+ for (ptr = addr; count--; ptr++) -+ writel(*ptr, (void __iomem *) port); -+} -+ -+static void magicbox_ide_exec_command(ide_hwif_t *hwif, u8 cmd) -+{ -+ magicbox_ide_outb(cmd, hwif->io_ports.command_addr); -+} -+ -+static u8 magicbox_ide_read_status(ide_hwif_t *hwif) -+{ -+ return magicbox_ide_inb(hwif->io_ports.status_addr); -+} -+ -+static u8 magicbox_ide_read_altstatus(ide_hwif_t *hwif) -+{ -+ return magicbox_ide_inb(hwif->io_ports.ctl_addr); -+} -+ -+static void magicbox_ide_write_devctl(ide_hwif_t *hwif, u8 ctl) -+{ -+ magicbox_ide_outb(ctl, hwif->io_ports.ctl_addr); -+} -+ -+static void magicbox_ide_tf_load(ide_drive_t *drive, struct ide_taskfile *tf, -+ u8 valid) -+{ -+ struct ide_io_ports *io_ports = &drive->hwif->io_ports; -+ -+ if (valid & IDE_VALID_FEATURE) -+ magicbox_ide_outb(tf->feature, io_ports->feature_addr); -+ if (valid & IDE_VALID_NSECT) -+ magicbox_ide_outb(tf->nsect, io_ports->nsect_addr); -+ if (valid & IDE_VALID_LBAL) -+ magicbox_ide_outb(tf->lbal, io_ports->lbal_addr); -+ if (valid & IDE_VALID_LBAM) -+ magicbox_ide_outb(tf->lbam, io_ports->lbam_addr); -+ if (valid & IDE_VALID_LBAH) -+ magicbox_ide_outb(tf->lbah, io_ports->lbah_addr); -+ -+ if (valid & IDE_VALID_DEVICE) -+ magicbox_ide_outb(tf->device, io_ports->device_addr); -+} -+ -+static void magicbox_ide_tf_read(ide_drive_t *drive, struct ide_taskfile *tf, -+ u8 valid) -+{ -+ struct ide_io_ports *io_ports = &drive->hwif->io_ports; -+ -+ if (valid & IDE_VALID_NSECT) -+ tf->nsect = magicbox_ide_inb(io_ports->nsect_addr); -+ if (valid & IDE_VALID_LBAL) -+ tf->lbal = magicbox_ide_inb(io_ports->lbal_addr); -+ if (valid & IDE_VALID_LBAM) -+ tf->lbam = magicbox_ide_inb(io_ports->lbam_addr); -+ if (valid & IDE_VALID_LBAH) -+ tf->lbah = magicbox_ide_inb(io_ports->lbah_addr); -+ if (valid & IDE_VALID_DEVICE) -+ tf->device = magicbox_ide_inb(io_ports->device_addr); -+} -+ -+static void magicbox_ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd, -+ void *buf, unsigned int len) -+{ -+ unsigned long port = drive->hwif->io_ports.data_addr; -+ -+ len++; -+ -+ if (drive->io_32bit) { -+ magicbox_ide_insl(port, buf, len / 4); -+ -+ if ((len & 3) >= 2) -+ magicbox_ide_insw(port, (u8 *)buf + (len & ~3), 1); -+ } else { -+ magicbox_ide_insw(port, buf, len / 2); -+ } -+} -+ -+static void magicbox_ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd, -+ void *buf, unsigned int len) -+{ -+ unsigned long port = drive->hwif->io_ports.data_addr; -+ -+ len++; -+ -+ if (drive->io_32bit) { -+ magicbox_ide_outsl(port, buf, len / 4); -+ -+ if ((len & 3) >= 2) -+ magicbox_ide_outsw(port, (u8 *)buf + (len & ~3), 1); -+ } else { -+ magicbox_ide_outsw(port, buf, len / 2); -+ } -+} -+ -+static void magicbox_ide_set_pio_mode(ide_drive_t *drive, const u8 pio) -+{ -+} -+ -+static u8 magicbox_ide_cable_detect(ide_hwif_t *hwif) -+{ -+ return ATA_CBL_PATA40; -+} -+ -+static const struct ide_tp_ops magicbox_ide_tp_ops = { -+ .exec_command = magicbox_ide_exec_command, -+ .read_status = magicbox_ide_read_status, -+ .read_altstatus = magicbox_ide_read_altstatus, -+ .write_devctl = magicbox_ide_write_devctl, -+ -+ .dev_select = ide_dev_select, -+ .tf_load = magicbox_ide_tf_load, -+ .tf_read = magicbox_ide_tf_read, -+ -+ .input_data = magicbox_ide_input_data, -+ .output_data = magicbox_ide_output_data, -+}; -+ -+static const struct ide_port_ops magicbox_ide_port_ops = { -+ .set_pio_mode = magicbox_ide_set_pio_mode, -+ .cable_detect = magicbox_ide_cable_detect, -+}; -+ -+static const struct ide_port_info magicbox_ide_port_info = { -+ .name = DRV_NAME, -+ .chipset = ide_generic, -+ .tp_ops = &magicbox_ide_tp_ops, -+ .port_ops = &magicbox_ide_port_ops, -+ .host_flags = IDE_HFLAG_SINGLE | -+ IDE_HFLAG_NO_DMA | -+ IDE_HFLAG_MMIO | -+ IDE_HFLAG_UNMASK_IRQS, -+ .pio_mask = ATA_PIO4, -+}; -+ -+static inline void magicbox_ide_setup_hw(hw_regs_t *hw, u16 __iomem *base, -+ u16 __iomem *ctrl, int irq) -+{ -+ unsigned long port = (unsigned long) base; -+ int i; -+ -+ memset(hw, 0, sizeof(*hw)); -+ for (i = 0; i <= 7; i++) -+ hw->io_ports_array[i] = port + i * 2; -+ -+ /* -+ * the IDE control register is at ATA address 6, -+ * with CS1 active instead of CS0 -+ */ -+ hw->io_ports.ctl_addr = (unsigned long)ctrl + (6 * 2); -+ hw->irq = irq; -+ hw->chipset = ide_generic; -+ hw->ack_intr = NULL; -+} -+ -+static int __devinit magicbox_ide_of_probe(struct of_device *op, -+ const struct of_device_id *match) -+{ -+ hw_regs_t hw; -+ hw_regs_t *hws[] = { &hw, NULL, NULL, NULL }; -+ struct ide_host *host; -+ u16 __iomem *base; -+ u16 __iomem *ctrl; -+ int irq; -+ int ret = 0; -+ -+ irq = irq_of_parse_and_map(op->node, 0); -+ if (irq < 0) { -+ dev_err(&op->dev, "invalid irq\n"); -+ ret = -EINVAL; -+ goto err_exit; -+ } -+ -+ base = of_iomap(op->node, 0); -+ if (base == NULL) { -+ ret = -ENOMEM; -+ goto err_exit; -+ } -+ -+ ctrl = of_iomap(op->node, 1); -+ if (ctrl == NULL) { -+ ret = -ENOMEM; -+ goto err_unmap_base; -+ } -+ -+ hw.dev = &op->dev; -+ magicbox_ide_setup_hw(&hw, base, ctrl, irq); -+ -+ ret = ide_host_add(&magicbox_ide_port_info, hws, &host); -+ if (ret) -+ goto err_unmap_ctrl; -+ -+ dev_set_drvdata(&op->dev, host); -+ -+ return 0; -+ -+ err_unmap_ctrl: -+ iounmap(ctrl); -+ err_unmap_base: -+ iounmap(base); -+ err_exit: -+ return ret; -+} -+ -+static struct of_device_id magicbox_ide_of_match[] = { -+ { .compatible = "magicbox-cf", }, -+ {}, -+}; -+ -+static struct of_platform_driver magicbox_ide_of_platform_driver = { -+ .owner = THIS_MODULE, -+ .name = DRV_NAME, -+ .match_table = magicbox_ide_of_match, -+ .probe = magicbox_ide_of_probe, -+ .driver = { -+ .name = DRV_NAME, -+ .owner = THIS_MODULE, -+ }, -+}; -+ -+static int __init magicbox_ide_init(void) -+{ -+ return of_register_platform_driver(&magicbox_ide_of_platform_driver); -+} -+ -+module_init(magicbox_ide_init); -+ -+MODULE_DESCRIPTION(DRV_DESC); -+MODULE_AUTHOR("Gabor Juhos "); -+MODULE_LICENSE("GPL v2"); -+MODULE_DEVICE_TABLE(of, magicbox_ide_of_match); diff --git a/target/linux/ppc40x/patches-2.6.30/101-pata-magicbox-cf-driver.patch b/target/linux/ppc40x/patches-2.6.30/101-pata-magicbox-cf-driver.patch deleted file mode 100644 index f738f89685..0000000000 --- a/target/linux/ppc40x/patches-2.6.30/101-pata-magicbox-cf-driver.patch +++ /dev/null @@ -1,436 +0,0 @@ ---- a/drivers/ata/Kconfig -+++ b/drivers/ata/Kconfig -@@ -698,6 +698,16 @@ config PATA_IXP4XX_CF - - If unsure, say N. - -+config PATA_MAGICBOX_CF -+ tristate "Magicbox/OpenRB Compact Flash support" -+ depends on MAGICBOX || OPENRB -+ help -+ This option enables support for a Compact Flash conected on -+ the ppc405ep expansion bus. This driver had been written for -+ the Magicbox v2 and OpenRB boards. -+ -+ If unsure, say N. -+ - config PATA_OCTEON_CF - tristate "OCTEON Boot Bus Compact Flash support" - depends on CPU_CAVIUM_OCTEON ---- a/drivers/ata/Makefile -+++ b/drivers/ata/Makefile -@@ -48,6 +48,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 ---- /dev/null -+++ b/drivers/ata/pata_magicbox_cf.c -@@ -0,0 +1,404 @@ -+/* -+ * PATA/CompactFlash driver for the MagicBox v2/OpenRB boards. -+ * -+ * Copyright (C) 2009 Gabor Juhos -+ * -+ * Based on the IDE driver by Wojtek Kaniewski -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 as published -+ * by the Free Software Foundation. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define DRV_DESC "PATA/CompactFlash driver for Magicbox/OpenRB boards" -+#define DRV_NAME "pata_magicbox_cf" -+#define DRV_VERSION "0.1.0" -+ -+#define MAGICBOX_CF_REG_CMD (2 * ATA_REG_CMD) -+#define MAGICBOX_CF_REG_DATA (2 * ATA_REG_DATA) -+#define MAGICBOX_CF_REG_ERR (2 * ATA_REG_ERR) -+#define MAGICBOX_CF_REG_FEATURE (2 * ATA_REG_FEATURE) -+#define MAGICBOX_CF_REG_NSECT (2 * ATA_REG_NSECT) -+#define MAGICBOX_CF_REG_LBAL (2 * ATA_REG_LBAL) -+#define MAGICBOX_CF_REG_LBAM (2 * ATA_REG_LBAM) -+#define MAGICBOX_CF_REG_LBAH (2 * ATA_REG_LBAH) -+#define MAGICBOX_CF_REG_DEVICE (2 * ATA_REG_DEVICE) -+#define MAGICBOX_CF_REG_STATUS (2 * ATA_REG_STATUS) -+#define MAGICBOX_CF_REG_ALTSTATUS (2 * 6) -+#define MAGICBOX_CF_REG_CTL (2 * 6) -+ -+#define MAGICBOX_CF_MAXPORTS 1 -+ -+struct magicbox_cf_info { -+ void __iomem *base; -+ void __iomem *ctrl; -+}; -+ -+static inline u8 magicbox_cf_inb(void __iomem *port) -+{ -+ return (u8) (readw(port) >> 8) & 0xff; -+} -+ -+static inline void magicbox_cf_outb(void __iomem *port, u8 value) -+{ -+ writew(value << 8, port); -+} -+ -+static int magicbox_cf_set_mode(struct ata_link *link, -+ struct ata_device **error) -+{ -+ struct ata_device *dev; -+ -+ ata_for_each_dev(dev, link, ENABLED) { -+ ata_dev_printk(dev, KERN_INFO, "configured for PIO0\n"); -+ dev->pio_mode = XFER_PIO_0; -+ dev->xfer_mode = XFER_PIO_0; -+ dev->xfer_shift = ATA_SHIFT_PIO; -+ dev->flags |= ATA_DFLAG_PIO; -+ } -+ -+ return 0; -+} -+ -+static void magicbox_cf_exec_command(struct ata_port *ap, -+ const struct ata_taskfile *tf) -+{ -+ DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command); -+ -+ magicbox_cf_outb(ap->ioaddr.command_addr, tf->command); -+ ata_sff_pause(ap); -+} -+ -+static u8 magicbox_cf_check_status(struct ata_port *ap) -+{ -+ u8 status; -+ -+ status = magicbox_cf_inb(ap->ioaddr.status_addr); -+ -+ DPRINTK("ata%u: status 0x%X, from %p\n", ap->print_id, status, -+ ap->ioaddr.status_addr); -+ -+ return status; -+} -+ -+static u8 magicbox_cf_check_altstatus(struct ata_port *ap) -+{ -+ u8 altstatus; -+ -+ altstatus = magicbox_cf_inb(ap->ioaddr.altstatus_addr); -+ -+ DPRINTK("ata%u: altstatus 0x%X, from %p\n", ap->print_id, -+ altstatus, ap->ioaddr.altstatus_addr); -+ -+ return altstatus; -+} -+ -+static void magicbox_cf_dev_select(struct ata_port *ap, unsigned int device) -+{ -+ /* Nothing to do. We are supporting one device only. */ -+} -+ -+static void magicbox_cf_tf_load(struct ata_port *ap, -+ const struct ata_taskfile *tf) -+{ -+ struct ata_ioports *ioaddr = &ap->ioaddr; -+ unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR; -+ -+ if (tf->ctl != ap->last_ctl) { -+ magicbox_cf_outb(ioaddr->ctl_addr, tf->ctl); -+ ap->last_ctl = tf->ctl; -+ ata_wait_idle(ap); -+ } -+ -+ if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) { -+ magicbox_cf_outb(ioaddr->feature_addr, tf->hob_feature); -+ magicbox_cf_outb(ioaddr->nsect_addr, tf->hob_nsect); -+ magicbox_cf_outb(ioaddr->lbal_addr, tf->hob_lbal); -+ magicbox_cf_outb(ioaddr->lbam_addr, tf->hob_lbam); -+ magicbox_cf_outb(ioaddr->lbah_addr, tf->hob_lbah); -+ VPRINTK("hob: feat 0x%X nsect 0x%X, lba 0x%X 0x%X 0x%X\n", -+ tf->hob_feature, -+ tf->hob_nsect, -+ tf->hob_lbal, -+ tf->hob_lbam, -+ tf->hob_lbah); -+ } -+ -+ if (is_addr) { -+ magicbox_cf_outb(ioaddr->feature_addr, tf->feature); -+ magicbox_cf_outb(ioaddr->nsect_addr, tf->nsect); -+ magicbox_cf_outb(ioaddr->lbal_addr, tf->lbal); -+ magicbox_cf_outb(ioaddr->lbam_addr, tf->lbam); -+ magicbox_cf_outb(ioaddr->lbah_addr, tf->lbah); -+ VPRINTK("feat 0x%X nsect 0x%X lba 0x%X 0x%X 0x%X\n", -+ tf->feature, -+ tf->nsect, -+ tf->lbal, -+ tf->lbam, -+ tf->lbah); -+ } -+ -+ if (tf->flags & ATA_TFLAG_DEVICE) { -+ magicbox_cf_outb(ioaddr->device_addr, tf->device); -+ VPRINTK("device 0x%X\n", tf->device); -+ } -+ -+ ata_wait_idle(ap); -+} -+ -+static void magicbox_cf_tf_read(struct ata_port *ap, struct ata_taskfile *tf) -+{ -+ struct ata_ioports *ioaddr = &ap->ioaddr; -+ -+ tf->command = magicbox_cf_inb(ap->ioaddr.status_addr); -+ tf->feature = magicbox_cf_inb(ioaddr->error_addr); -+ tf->nsect = magicbox_cf_inb(ioaddr->nsect_addr); -+ tf->lbal = magicbox_cf_inb(ioaddr->lbal_addr); -+ tf->lbam = magicbox_cf_inb(ioaddr->lbam_addr); -+ tf->lbah = magicbox_cf_inb(ioaddr->lbah_addr); -+ tf->device = magicbox_cf_inb(ioaddr->device_addr); -+ VPRINTK("feat 0x%X nsect 0x%X lba 0x%X 0x%X 0x%X\n", -+ tf->feature, -+ tf->nsect, -+ tf->lbal, -+ tf->lbam, -+ tf->lbah); -+ -+ if (tf->flags & ATA_TFLAG_LBA48) { -+ magicbox_cf_outb(ioaddr->ctl_addr, tf->ctl | ATA_HOB); -+ tf->hob_feature = magicbox_cf_inb(ioaddr->error_addr); -+ tf->hob_nsect = magicbox_cf_inb(ioaddr->nsect_addr); -+ tf->hob_lbal = magicbox_cf_inb(ioaddr->lbal_addr); -+ tf->hob_lbam = magicbox_cf_inb(ioaddr->lbam_addr); -+ tf->hob_lbah = magicbox_cf_inb(ioaddr->lbah_addr); -+ magicbox_cf_outb(ioaddr->ctl_addr, tf->ctl); -+ ap->last_ctl = tf->ctl; -+ VPRINTK("hob: feat 0x%X nsect 0x%X lba 0x%X 0x%X 0x%X\n", -+ tf->feature, -+ tf->nsect, -+ tf->lbal, -+ tf->lbam, -+ tf->lbah); -+ } -+} -+ -+static unsigned int magicbox_cf_data_xfer(struct ata_device *dev, -+ unsigned char *buf, -+ unsigned int buflen, int rw) -+{ -+ struct ata_port *ap = dev->link->ap; -+ unsigned int words = buflen >> 1; -+ unsigned int i; -+ u16 *buf16 = (u16 *) buf; -+ void __iomem *mmio = ap->ioaddr.data_addr; -+ -+ /* Transfer multiple of 2 bytes */ -+ if (rw == READ) -+ for (i = 0; i < words; i++) -+ buf16[i] = readw(mmio); -+ else -+ for (i = 0; i < words; i++) -+ writew(buf16[i], mmio); -+ -+ /* Transfer trailing 1 byte, if any. */ -+ if (unlikely(buflen & 0x01)) { -+ u16 align_buf[1] = { 0 }; -+ unsigned char *trailing_buf = buf + buflen - 1; -+ -+ if (rw == READ) { -+ align_buf[0] = readw(mmio); -+ memcpy(trailing_buf, align_buf, 1); -+ } else { -+ memcpy(align_buf, trailing_buf, 1); -+ writew(align_buf[0], mmio); -+ } -+ words++; -+ } -+ -+ return words << 1; -+} -+ -+static u8 magicbox_cf_irq_on(struct ata_port *ap) -+{ -+ /* Nothing to do. */ -+ return 0; -+} -+ -+static void magicbox_cf_irq_clear(struct ata_port *ap) -+{ -+ /* Nothing to do. */ -+} -+ -+static struct ata_port_operations magicbox_cf_port_ops = { -+ .inherits = &ata_sff_port_ops, -+ -+ .cable_detect = ata_cable_40wire, -+ .set_mode = magicbox_cf_set_mode, -+ -+ .sff_exec_command = magicbox_cf_exec_command, -+ .sff_check_status = magicbox_cf_check_status, -+ .sff_check_altstatus = magicbox_cf_check_altstatus, -+ .sff_dev_select = magicbox_cf_dev_select, -+ .sff_tf_load = magicbox_cf_tf_load, -+ .sff_tf_read = magicbox_cf_tf_read, -+ .sff_data_xfer = magicbox_cf_data_xfer, -+ -+ .sff_irq_on = magicbox_cf_irq_on, -+ .sff_irq_clear = magicbox_cf_irq_clear, -+ -+ .port_start = ATA_OP_NULL, -+}; -+ -+static struct scsi_host_template magicbox_cf_sht = { -+ ATA_PIO_SHT(DRV_NAME), -+}; -+ -+static inline void magicbox_cf_setup_port(struct ata_host *host) -+{ -+ struct magicbox_cf_info *info = host->private_data; -+ struct ata_port *ap; -+ -+ ap = host->ports[0]; -+ -+ ap->ops = &magicbox_cf_port_ops; -+ ap->pio_mask = ATA_PIO4; -+ ap->flags |= ATA_FLAG_MMIO | ATA_FLAG_NO_LEGACY | ATA_FLAG_NO_ATAPI; -+ -+ ap->ioaddr.cmd_addr = info->base + MAGICBOX_CF_REG_CMD; -+ ap->ioaddr.data_addr = info->base + MAGICBOX_CF_REG_DATA; -+ ap->ioaddr.error_addr = info->base + MAGICBOX_CF_REG_ERR; -+ ap->ioaddr.feature_addr = info->base + MAGICBOX_CF_REG_FEATURE; -+ ap->ioaddr.nsect_addr = info->base + MAGICBOX_CF_REG_NSECT; -+ ap->ioaddr.lbal_addr = info->base + MAGICBOX_CF_REG_LBAL; -+ ap->ioaddr.lbam_addr = info->base + MAGICBOX_CF_REG_LBAM; -+ ap->ioaddr.lbah_addr = info->base + MAGICBOX_CF_REG_LBAH; -+ ap->ioaddr.device_addr = info->base + MAGICBOX_CF_REG_DEVICE; -+ ap->ioaddr.status_addr = info->base + MAGICBOX_CF_REG_STATUS; -+ ap->ioaddr.command_addr = info->base + MAGICBOX_CF_REG_CMD; -+ -+ ap->ioaddr.altstatus_addr = info->ctrl + MAGICBOX_CF_REG_ALTSTATUS; -+ ap->ioaddr.ctl_addr = info->ctrl + MAGICBOX_CF_REG_CTL; -+ -+ ata_port_desc(ap, "cmd 0x%p ctl 0x%p", ap->ioaddr.cmd_addr, -+ ap->ioaddr.ctl_addr); -+} -+ -+static int __devinit magicbox_cf_of_probe(struct of_device *op, -+ const struct of_device_id *match) -+{ -+ struct magicbox_cf_info *info; -+ struct ata_host *host; -+ int irq; -+ int ret = 0; -+ -+ info = kzalloc(sizeof(struct magicbox_cf_info), GFP_KERNEL); -+ if (info == NULL) { -+ ret = -ENOMEM; -+ goto err_exit; -+ } -+ -+ irq = irq_of_parse_and_map(op->node, 0); -+ if (irq < 0) { -+ dev_err(&op->dev, "invalid irq\n"); -+ ret = -EINVAL; -+ goto err_free_info; -+ } -+ -+ info->base = of_iomap(op->node, 0); -+ if (info->base == NULL) { -+ ret = -ENOMEM; -+ goto err_free_info; -+ } -+ -+ info->ctrl = of_iomap(op->node, 1); -+ if (info->ctrl == NULL) { -+ ret = -ENOMEM; -+ goto err_unmap_base; -+ } -+ -+ host = ata_host_alloc(&op->dev, MAGICBOX_CF_MAXPORTS); -+ if (host == NULL) { -+ ret = -ENOMEM; -+ goto err_unmap_ctrl; -+ } -+ -+ host->private_data = info; -+ magicbox_cf_setup_port(host); -+ -+ ret = ata_host_activate(host, irq, ata_sff_interrupt, -+ IRQF_TRIGGER_RISING, &magicbox_cf_sht); -+ if (ret) -+ goto err_unmap_ctrl; -+ -+ dev_set_drvdata(&op->dev, host); -+ return 0; -+ -+ err_unmap_ctrl: -+ iounmap(info->ctrl); -+ err_unmap_base: -+ iounmap(info->base); -+ err_free_info: -+ kfree(info); -+ err_exit: -+ return ret; -+} -+ -+static __devexit int magicbox_cf_of_remove(struct of_device *op) -+{ -+ struct ata_host *host = dev_get_drvdata(&op->dev); -+ struct magicbox_cf_info *info = host->private_data; -+ -+ ata_host_detach(host); -+ iounmap(info->ctrl); -+ iounmap(info->base); -+ kfree(info); -+ -+ return 0; -+} -+ -+static struct of_device_id magicbox_cf_of_match[] = { -+ { .compatible = "pata-magicbox-cf", }, -+ {}, -+}; -+ -+static struct of_platform_driver magicbox_cf_of_platform_driver = { -+ .owner = THIS_MODULE, -+ .name = DRV_NAME, -+ .match_table = magicbox_cf_of_match, -+ .probe = magicbox_cf_of_probe, -+ .remove = __devexit_p(magicbox_cf_of_remove), -+ .driver = { -+ .name = DRV_NAME, -+ .owner = THIS_MODULE, -+ }, -+}; -+ -+static int __init magicbox_cf_init(void) -+{ -+ return of_register_platform_driver(&magicbox_cf_of_platform_driver); -+} -+ -+static void __exit magicbox_cf_exit(void) -+{ -+ of_unregister_platform_driver(&magicbox_cf_of_platform_driver); -+} -+ -+module_init(magicbox_cf_init); -+module_exit(magicbox_cf_exit); -+ -+MODULE_DESCRIPTION(DRV_DESC); -+MODULE_AUTHOR("Gabor Juhos "); -+MODULE_LICENSE("GPL v2"); -+MODULE_VERSION(DRV_VERSION); -+MODULE_DEVICE_TABLE(of, magicbox_cf_of_match); diff --git a/target/linux/ppc40x/patches-2.6.30/110-kilauea_openwrt_flashmap.patch b/target/linux/ppc40x/patches-2.6.30/110-kilauea_openwrt_flashmap.patch deleted file mode 100644 index 3244e2c933..0000000000 --- a/target/linux/ppc40x/patches-2.6.30/110-kilauea_openwrt_flashmap.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- 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>; - }; -- 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>; - }; - partition@3f60000 { - label = "env"; diff --git a/target/linux/ppc40x/patches-2.6.30/900-backport-fix-annotation-of-pcibios_claim_one_bus.patch b/target/linux/ppc40x/patches-2.6.30/900-backport-fix-annotation-of-pcibios_claim_one_bus.patch deleted file mode 100644 index 01a70c52cc..0000000000 --- a/target/linux/ppc40x/patches-2.6.30/900-backport-fix-annotation-of-pcibios_claim_one_bus.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Stephen Rothwell -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 -Signed-off-by: Benjamin Herrenschmidt ---- - ---- 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 diff --git a/target/linux/ppc40x/patches/001-makalu_ppc40x_simple.patch b/target/linux/ppc40x/patches/001-makalu_ppc40x_simple.patch new file mode 100644 index 0000000000..d4497d8c15 --- /dev/null +++ b/target/linux/ppc40x/patches/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/002-kilauea_halekala_ppc40x_simple.patch b/target/linux/ppc40x/patches/002-kilauea_halekala_ppc40x_simple.patch new file mode 100644 index 0000000000..0b17e1b81a --- /dev/null +++ b/target/linux/ppc40x/patches/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/003-powerpc-add-EBC_BXCR_BW-defines.patch b/target/linux/ppc40x/patches/003-powerpc-add-EBC_BXCR_BW-defines.patch new file mode 100644 index 0000000000..8e380c1c9c --- /dev/null +++ b/target/linux/ppc40x/patches/003-powerpc-add-EBC_BXCR_BW-defines.patch @@ -0,0 +1,12 @@ +--- a/arch/powerpc/boot/dcr.h ++++ b/arch/powerpc/boot/dcr.h +@@ -57,6 +57,9 @@ static const unsigned long sdram_bxcr[] + #define EBC_BXCR_BU_WO 0x00010000 + #define EBC_BXCR_BU_RW 0x00018000 + #define EBC_BXCR_BW 0x00006000 ++#define EBC_BXCR_BW_8 0x00000000 ++#define EBC_BXCR_BW_16 0x00002000 ++#define EBC_BXCR_BW_32 0x00006000 + #define EBC_B0AP 0x10 + #define EBC_B1AP 0x11 + #define EBC_B2AP 0x12 diff --git a/target/linux/ppc40x/patches/004-magicbox.patch b/target/linux/ppc40x/patches/004-magicbox.patch new file mode 100644 index 0000000000..d6ce22d4a8 --- /dev/null +++ b/target/linux/ppc40x/patches/004-magicbox.patch @@ -0,0 +1,435 @@ +--- /dev/null ++++ b/arch/powerpc/boot/cuboot-magicbox.c +@@ -0,0 +1,90 @@ ++/* ++ * Old U-boot compatibility for Magicbox boards ++ * ++ * Author: Imre Kaloz ++ * Gabor Juhos ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 as published ++ * by the Free Software Foundation. ++ */ ++ ++#include "ops.h" ++#include "io.h" ++#include "dcr.h" ++#include "stdio.h" ++#include "4xx.h" ++#include "44x.h" ++#include "cuboot.h" ++ ++#define TARGET_4xx ++#define TARGET_405EP ++#include "ppcboot.h" ++ ++static bd_t bd; ++ ++static void fixup_cf_card(void) ++{ ++#define DCRN_CPC0_PCI_BASE 0xf9 ++#define CF_CS0_BASE 0xff100000 ++#define CF_CS1_BASE 0xff200000 ++ ++ /* Turn on PerWE instead of PCIsomething */ ++ mtdcr(DCRN_CPC0_PCI_BASE, ++ mfdcr(DCRN_CPC0_PCI_BASE) | (0x80000000L >> 27)); ++ ++ /* PerCS1 (CF's CS0): base 0xff100000, 16-bit, rw */ ++ mtdcr(DCRN_EBC0_CFGADDR, EBC_B1CR); ++ mtdcr(DCRN_EBC0_CFGDATA, CF_CS0_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16); ++ mtdcr(DCRN_EBC0_CFGADDR, EBC_B1AP); ++ mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800); ++ ++ /* PerCS2 (CF's CS1): base 0xff200000, 16-bit, rw */ ++ mtdcr(DCRN_EBC0_CFGADDR, EBC_B2CR); ++ mtdcr(DCRN_EBC0_CFGDATA, CF_CS1_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16); ++ mtdcr(DCRN_EBC0_CFGADDR, EBC_B2AP); ++ mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800); ++ ++#undef DCRN_CPC0_PCI_BASE ++#undef CF_CS0_BASE ++#undef CF_CS1_BASE ++} ++ ++static void magicbox_fixups(void) ++{ ++ ibm405ep_fixup_clocks(bd.bi_procfreq / 8); ++ ibm4xx_sdram_fixup_memsize(); ++ ++ /* Magicbox v1 has only one ethernet, one serial and no ++ * CF slot -- detect it using it's fake enet1addr ++ */ ++ if ((bd.bi_enet1addr[0] == 0x00) && ++ (bd.bi_enet1addr[1] == 0x00) && ++ (bd.bi_enet1addr[2] == 0x02) && ++ (bd.bi_enet1addr[3] == 0xfa) && ++ (bd.bi_enet1addr[4] == 0xf0) && ++ (bd.bi_enet1addr[5] == 0x80)) { ++ void *devp; ++ ++ devp = finddevice("/plb/opb/ethernet@ef600900"); ++ del_node(devp); ++ devp = finddevice("/plb/opb/serial@ef600400"); ++ del_node(devp); ++ devp = finddevice("/plb/ebc/cf_card@ff100000"); ++ del_node(devp); ++ } else { ++ fixup_cf_card(); ++ } ++ ++ dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr); ++} ++ ++void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, ++ unsigned long r6, unsigned long r7) ++{ ++ CUBOOT_INIT(); ++ platform_ops.fixups = magicbox_fixups; ++ platform_ops.exit = ibm40x_dbcr_reset; ++ fdt_init(_dtb_start); ++ serial_console_init(); ++} +--- /dev/null ++++ b/arch/powerpc/boot/dts/magicbox.dts +@@ -0,0 +1,281 @@ ++/* ++ * Device Tree Source for Magicbox boards ++ * ++ * Copyright 2008-2009 Imre Kaloz ++ * Copyright 2009 Gabor Juhos ++ * ++ * Based on walnut.dts ++ * ++ * This file is licensed under the terms of the GNU General Public ++ * License version 2. This program is licensed "as is" without ++ * any warranty of any kind, whether express or implied. ++ */ ++ ++/dts-v1/; ++ ++/ { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ model = "magicbox"; ++ compatible = "magicbox"; ++ dcr-parent = <&{/cpus/cpu@0}>; ++ ++ aliases { ++ ethernet0 = &EMAC0; ++ ethernet1 = &EMAC1; ++ serial0 = &UART0; ++ serial1 = &UART1; ++ }; ++ ++ cpus { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ cpu@0 { ++ device_type = "cpu"; ++ model = "PowerPC,405EP"; ++ reg = <0x00000000>; ++ clock-frequency = <0>; /* Filled in by zImage */ ++ timebase-frequency = <0>; /* Filled in by zImage */ ++ i-cache-line-size = <0x20>; ++ d-cache-line-size = <0x20>; ++ i-cache-size = <0x4000>; ++ d-cache-size = <0x4000>; ++ dcr-controller; ++ dcr-access-method = "native"; ++ }; ++ }; ++ ++ memory { ++ device_type = "memory"; ++ reg = <0x00000000 0x00000000>; /* Filled in by zImage */ ++ }; ++ ++ UIC0: interrupt-controller { ++ compatible = "ibm,uic"; ++ interrupt-controller; ++ cell-index = <0>; ++ dcr-reg = <0x0c0 0x009>; ++ #address-cells = <0>; ++ #size-cells = <0>; ++ #interrupt-cells = <2>; ++ }; ++ ++ plb { ++ compatible = "ibm,plb3"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges; ++ clock-frequency = <0>; /* Filled in by zImage */ ++ ++ SDRAM0: memory-controller { ++ compatible = "ibm,sdram-405ep"; ++ dcr-reg = <0x010 0x002>; ++ }; ++ ++ MAL: mcmal { ++ compatible = "ibm,mcmal-405ep", "ibm,mcmal"; ++ dcr-reg = <0x180 0x062>; ++ num-tx-chans = <4>; ++ num-rx-chans = <2>; ++ interrupt-parent = <&UIC0>; ++ interrupts = < ++ 0xb 0x4 /* TXEOB */ ++ 0xc 0x4 /* RXEOB */ ++ 0xa 0x4 /* SERR */ ++ 0xd 0x4 /* TXDE */ ++ 0xe 0x4 /* RXDE */>; ++ }; ++ ++ POB0: opb { ++ compatible = "ibm,opb-405ep", "ibm,opb"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges = <0xef600000 0xef600000 0x00a00000>; ++ dcr-reg = <0x0a0 0x005>; ++ clock-frequency = <0>; /* Filled in by zImage */ ++ ++ UART0: serial@ef600300 { ++ device_type = "serial"; ++ compatible = "ns16550"; ++ reg = <0xef600300 0x00000008>; ++ virtual-reg = <0xef600300>; ++ clock-frequency = <0>; /* Filled in by zImage */ ++ current-speed = <115200>; ++ interrupt-parent = <&UIC0>; ++ interrupts = <0x0 0x4>; ++ }; ++ ++ UART1: serial@ef600400 { ++ device_type = "serial"; ++ compatible = "ns16550"; ++ reg = <0xef600400 0x00000008>; ++ virtual-reg = <0xef600400>; ++ clock-frequency = <0>; /* Filled in by zImage */ ++ current-speed = <115200>; ++ interrupt-parent = <&UIC0>; ++ interrupts = <0x1 0x4>; ++ }; ++ ++ IIC: i2c@ef600500 { ++ compatible = "ibm,iic-405ep", "ibm,iic"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <0xef600500 0x00000011>; ++ interrupt-parent = <&UIC0>; ++ interrupts = <0x2 0x4>; ++ ++ dtt@48 { ++ compatible = "national,lm75"; ++ reg = <0x48>; ++ }; ++ ++ eeprom@50 { ++ compatible = "at24,24c16"; ++ reg = <0x50>; ++ }; ++ }; ++ ++ GPIO0: gpio-controller@ef600700 { ++ compatible = "ibm,ppc4xx-gpio"; ++ reg = <0xef600700 0x00000020>; ++ #gpio-cells = <2>; ++ gpio-controller; ++ }; ++ ++ EMAC0: ethernet@ef600800 { ++ linux,network-index = <0x0>; ++ device_type = "network"; ++ compatible = "ibm,emac-405ep", "ibm,emac"; ++ interrupt-parent = <&UIC0>; ++ interrupts = < ++ 0xf 0x4 /* Ethernet */ ++ 0x9 0x4 /* Ethernet Wake Up */>; ++ local-mac-address = [000000000000]; /* Filled in by zImage */ ++ reg = <0xef600800 0x00000070>; ++ mal-device = <&MAL>; ++ mal-tx-channel = <0>; ++ mal-rx-channel = <0>; ++ cell-index = <0>; ++ max-frame-size = <0x5dc>; ++ rx-fifo-size = <0x1000>; ++ tx-fifo-size = <0x800>; ++ phy-mode = "mii"; ++ phy-map = <0x00000000>; ++ }; ++ ++ EMAC1: ethernet@ef600900 { ++ linux,network-index = <0x1>; ++ device_type = "network"; ++ compatible = "ibm,emac-405ep", "ibm,emac"; ++ interrupt-parent = <&UIC0>; ++ interrupts = < ++ 0x11 0x4 /* Ethernet */ ++ 0x09 0x4 /* Ethernet Wake Up */>; ++ local-mac-address = [000000000000]; /* Filled in by zImage */ ++ reg = <0xef600900 0x00000070>; ++ mal-device = <&MAL>; ++ mal-tx-channel = <2>; ++ mal-rx-channel = <1>; ++ cell-index = <1>; ++ max-frame-size = <0x5dc>; ++ rx-fifo-size = <0x1000>; ++ tx-fifo-size = <0x800>; ++ mdio-device = <&EMAC0>; ++ phy-mode = "mii"; ++ phy-map = <0x00000001>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ user { ++ label = "magicbox:red:user"; ++ gpios = <&GPIO0 2 1>; ++ }; ++ }; ++ }; ++ ++ EBC0: ebc { ++ compatible = "ibm,ebc-405ep", "ibm,ebc"; ++ dcr-reg = <0x012 0x002>; ++ #address-cells = <2>; ++ #size-cells = <1>; ++ /* The ranges property is supplied by the bootwrapper ++ * and is based on the firmware's configuration of the ++ * EBC bridge ++ */ ++ clock-frequency = <0>; /* Filled in by zImage */ ++ ++ cf_card@ff100000 { ++ compatible = "magicbox-cf", "pata-magicbox-cf"; ++ reg = <0x00000000 0xff100000 0x00001000 ++ 0x00000000 0xff200000 0x00001000>; ++ interrupt-parent = <&UIC0>; ++ interrupts = <0x19 0x1 /* IRQ_TYPE_EDGE_RISING */ >; ++ }; ++ ++ nor_flash@ffc00000 { ++ compatible = "cfi-flash"; ++ bank-width = <2>; ++ reg = <0x00000000 0xffc00000 0x00400000>; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ partition@0 { ++ label = "linux"; ++ reg = <0x0 0x120000>; ++ }; ++ partition@120000 { ++ label = "rootfs"; ++ reg = <0x120000 0x2a0000>; ++ }; ++ partition@3c0000 { ++ label = "u-boot"; ++ reg = <0x3c0000 0x30000>; ++ read-only; ++ }; ++ }; ++ }; ++ ++ PCI0: pci@ec000000 { ++ device_type = "pci"; ++ #interrupt-cells = <1>; ++ #size-cells = <2>; ++ #address-cells = <3>; ++ compatible = "ibm,plb405ep-pci", "ibm,plb-pci"; ++ primary; ++ reg = <0xeec00000 0x00000008 /* Config space access */ ++ 0xeed80000 0x00000004 /* IACK */ ++ 0xeed80000 0x00000004 /* Special cycle */ ++ 0xef480000 0x00000040>; /* Internal registers */ ++ ++ /* Outbound ranges, one memory and one IO, ++ * later cannot be changed. Chip supports a second ++ * IO range but we don't use it for now ++ */ ++ ranges = <0x02000000 0x00000000 0x80000000 0x80000000 0x00000000 0x20000000 ++ 0x01000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>; ++ ++ /* Inbound 2GB range starting at 0 */ ++ dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>; ++ ++ interrupt-map-mask = <0xf800 0x0 0x0 0x0>; ++ interrupt-map = < ++ /* IDSEL 1 */ ++ 0x800 0x0 0x0 0x0 &UIC0 0x1c 0x8 ++ ++ /* IDSEL 2 */ ++ 0x1000 0x0 0x0 0x0 &UIC0 0x1d 0x8 ++ ++ /* IDSEL 3 */ ++ 0x1800 0x0 0x0 0x0 &UIC0 0x1e 0x8 ++ ++ /* IDSEL 4 */ ++ 0x2000 0x0 0x0 0x0 &UIC0 0x1f 0x8 ++ >; ++ }; ++ }; ++ ++ chosen { ++ linux,stdout-path = "/plb/opb/serial@ef600300"; ++ }; ++}; +--- a/arch/powerpc/boot/Makefile ++++ b/arch/powerpc/boot/Makefile +@@ -42,6 +42,7 @@ $(obj)/ebony.o: BOOTCFLAGS += -mcpu=440 + $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440 + $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440 + $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405 ++$(obj)/cuboot-magicbox.o: BOOTCFLAGS += -mcpu=405 + $(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 + 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 + 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 + image-$(CONFIG_WALNUT) += treeImage.walnut + image-$(CONFIG_ACADIA) += cuImage.acadia ++image-$(CONFIG_MAGICBOX) += cuImage.magicbox + + # Board ports in arch/powerpc/platform/44x/Kconfig + 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 + help + This option enables support for the AMCC PPC405EX evaluation board. + ++config MAGICBOX ++ bool "Magicbox" ++ depends on 40x ++ default n ++ select PPC40x_SIMPLE ++ select 405EP ++ select PCI ++ help ++ This option enables support for the Magicbox boards. ++ + config MAKALU + bool "Makalu" + 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", + "amcc,haleakala", + "amcc,kilauea", +- "amcc,makalu" ++ "amcc,makalu", ++ "magicbox" + }; + + static int __init ppc40x_probe(void) diff --git a/target/linux/ppc40x/patches/005-openrb.patch b/target/linux/ppc40x/patches/005-openrb.patch new file mode 100644 index 0000000000..43407c2025 --- /dev/null +++ b/target/linux/ppc40x/patches/005-openrb.patch @@ -0,0 +1,412 @@ +--- /dev/null ++++ b/arch/powerpc/boot/cuboot-openrb.c +@@ -0,0 +1,71 @@ ++/* ++ * Old U-boot compatibility for OpenRB boards ++ * ++ * Author: Gabor Juhos ++ * Imre Kaloz ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 as published ++ * by the Free Software Foundation. ++ */ ++ ++#include "ops.h" ++#include "io.h" ++#include "dcr.h" ++#include "stdio.h" ++#include "4xx.h" ++#include "44x.h" ++#include "cuboot.h" ++ ++#define TARGET_4xx ++#define TARGET_405EP ++#include "ppcboot.h" ++ ++static bd_t bd; ++ ++static void fixup_cf_card(void) ++{ ++#define DCRN_CPC0_PCI_BASE 0xf9 ++#define CF_CS0_BASE 0xff100000 ++#define CF_CS1_BASE 0xff200000 ++ ++ /* Turn on PerWE instead of PCIsomething */ ++ mtdcr(DCRN_CPC0_PCI_BASE, ++ mfdcr(DCRN_CPC0_PCI_BASE) | (0x80000000L >> 27)); ++ ++ /* PerCS1 (CF's CS0): base 0xff100000, 16-bit, rw */ ++ mtdcr(DCRN_EBC0_CFGADDR, EBC_B1CR); ++ mtdcr(DCRN_EBC0_CFGDATA, CF_CS0_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16); ++ mtdcr(DCRN_EBC0_CFGADDR, EBC_B1AP); ++ mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800); ++ ++ /* PerCS2 (CF's CS1): base 0xff200000, 16-bit, rw */ ++ mtdcr(DCRN_EBC0_CFGADDR, EBC_B2CR); ++ mtdcr(DCRN_EBC0_CFGDATA, CF_CS1_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16); ++ mtdcr(DCRN_EBC0_CFGADDR, EBC_B2AP); ++ mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800); ++ ++#undef DCRN_CPC0_PCI_BASE ++#undef CF_CS0_BASE ++#undef CF_CS1_BASE ++} ++ ++static void openrb_fixups(void) ++{ ++ ibm405ep_fixup_clocks(bd.bi_procfreq / 8); ++ ibm4xx_sdram_fixup_memsize(); ++ ++ fixup_cf_card(); ++ ++ dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr); ++} ++ ++void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, ++ unsigned long r6, unsigned long r7) ++{ ++ CUBOOT_INIT(); ++ platform_ops.fixups = openrb_fixups; ++ platform_ops.exit = ibm40x_dbcr_reset; ++ fdt_init(_dtb_start); ++ serial_console_init(); ++} +--- /dev/null ++++ b/arch/powerpc/boot/dts/openrb.dts +@@ -0,0 +1,276 @@ ++/* ++ * Device Tree Source for OpenRB boards ++ * ++ * Copyright 2009 Gabor Juhos ++ * Copyright 2009 Imre Kaloz ++ * ++ * Based on walnut.dts ++ * ++ * This file is licensed under the terms of the GNU General Public ++ * License version 2. This program is licensed "as is" without ++ * any warranty of any kind, whether express or implied. ++ */ ++ ++/dts-v1/; ++ ++/ { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ model = "openrb"; ++ compatible = "openrb"; ++ dcr-parent = <&{/cpus/cpu@0}>; ++ ++ aliases { ++ ethernet0 = &EMAC0; ++ ethernet1 = &EMAC1; ++ serial0 = &UART0; ++ serial1 = &UART1; ++ }; ++ ++ cpus { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ cpu@0 { ++ device_type = "cpu"; ++ model = "PowerPC,405EP"; ++ reg = <0x00000000>; ++ clock-frequency = <0>; /* Filled in by zImage */ ++ timebase-frequency = <0>; /* Filled in by zImage */ ++ i-cache-line-size = <0x20>; ++ d-cache-line-size = <0x20>; ++ i-cache-size = <0x4000>; ++ d-cache-size = <0x4000>; ++ dcr-controller; ++ dcr-access-method = "native"; ++ }; ++ }; ++ ++ memory { ++ device_type = "memory"; ++ reg = <0x00000000 0x00000000>; /* Filled in by zImage */ ++ }; ++ ++ UIC0: interrupt-controller { ++ compatible = "ibm,uic"; ++ interrupt-controller; ++ cell-index = <0>; ++ dcr-reg = <0x0c0 0x009>; ++ #address-cells = <0>; ++ #size-cells = <0>; ++ #interrupt-cells = <2>; ++ }; ++ ++ plb { ++ compatible = "ibm,plb3"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges; ++ clock-frequency = <0>; /* Filled in by zImage */ ++ ++ SDRAM0: memory-controller { ++ compatible = "ibm,sdram-405ep"; ++ dcr-reg = <0x010 0x002>; ++ }; ++ ++ MAL: mcmal { ++ compatible = "ibm,mcmal-405ep", "ibm,mcmal"; ++ dcr-reg = <0x180 0x062>; ++ num-tx-chans = <4>; ++ num-rx-chans = <2>; ++ interrupt-parent = <&UIC0>; ++ interrupts = < ++ 0xb 0x4 /* TXEOB */ ++ 0xc 0x4 /* RXEOB */ ++ 0xa 0x4 /* SERR */ ++ 0xd 0x4 /* TXDE */ ++ 0xe 0x4 /* RXDE */>; ++ }; ++ ++ POB0: opb { ++ compatible = "ibm,opb-405ep", "ibm,opb"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges = <0xef600000 0xef600000 0x00a00000>; ++ dcr-reg = <0x0a0 0x005>; ++ clock-frequency = <0>; /* Filled in by zImage */ ++ ++ UART0: serial@ef600300 { ++ device_type = "serial"; ++ compatible = "ns16550"; ++ reg = <0xef600300 0x00000008>; ++ virtual-reg = <0xef600300>; ++ clock-frequency = <0>; /* Filled in by zImage */ ++ current-speed = <115200>; ++ interrupt-parent = <&UIC0>; ++ interrupts = <0x0 0x4>; ++ }; ++ ++ UART1: serial@ef600400 { ++ device_type = "serial"; ++ compatible = "ns16550"; ++ reg = <0xef600400 0x00000008>; ++ virtual-reg = <0xef600400>; ++ clock-frequency = <0>; /* Filled in by zImage */ ++ current-speed = <115200>; ++ interrupt-parent = <&UIC0>; ++ interrupts = <0x1 0x4>; ++ }; ++ ++ IIC: i2c@ef600500 { ++ compatible = "ibm,iic-405ep", "ibm,iic"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <0xef600500 0x00000011>; ++ interrupt-parent = <&UIC0>; ++ interrupts = <0x2 0x4>; ++ ++ eeprom@50 { ++ compatible = "at24,24c16"; ++ reg = <0x50>; ++ }; ++ }; ++ ++ GPIO0: gpio-controller@ef600700 { ++ compatible = "ibm,ppc4xx-gpio"; ++ reg = <0xef600700 0x00000020>; ++ #gpio-cells = <2>; ++ gpio-controller; ++ }; ++ ++ EMAC0: ethernet@ef600800 { ++ linux,network-index = <0x0>; ++ device_type = "network"; ++ compatible = "ibm,emac-405ep", "ibm,emac"; ++ interrupt-parent = <&UIC0>; ++ interrupts = < ++ 0xf 0x4 /* Ethernet */ ++ 0x9 0x4 /* Ethernet Wake Up */>; ++ local-mac-address = [000000000000]; /* Filled in by zImage */ ++ reg = <0xef600800 0x00000070>; ++ mal-device = <&MAL>; ++ mal-tx-channel = <0>; ++ mal-rx-channel = <0>; ++ cell-index = <0>; ++ max-frame-size = <0x5dc>; ++ rx-fifo-size = <0x1000>; ++ tx-fifo-size = <0x800>; ++ phy-mode = "mii"; ++ phy-map = <0x00000000>; ++ }; ++ ++ EMAC1: ethernet@ef600900 { ++ linux,network-index = <0x1>; ++ device_type = "network"; ++ compatible = "ibm,emac-405ep", "ibm,emac"; ++ interrupt-parent = <&UIC0>; ++ interrupts = < ++ 0x11 0x4 /* Ethernet */ ++ 0x09 0x4 /* Ethernet Wake Up */>; ++ local-mac-address = [000000000000]; /* Filled in by zImage */ ++ reg = <0xef600900 0x00000070>; ++ mal-device = <&MAL>; ++ mal-tx-channel = <2>; ++ mal-rx-channel = <1>; ++ cell-index = <1>; ++ max-frame-size = <0x5dc>; ++ rx-fifo-size = <0x1000>; ++ tx-fifo-size = <0x800>; ++ mdio-device = <&EMAC0>; ++ phy-mode = "mii"; ++ phy-map = <0x00000001>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ user { ++ label = "openrb:green:user"; ++ gpios = <&GPIO0 2 1>; ++ }; ++ }; ++ }; ++ ++ EBC0: ebc { ++ compatible = "ibm,ebc-405ep", "ibm,ebc"; ++ dcr-reg = <0x012 0x002>; ++ #address-cells = <2>; ++ #size-cells = <1>; ++ /* The ranges property is supplied by the bootwrapper ++ * and is based on the firmware's configuration of the ++ * EBC bridge ++ */ ++ clock-frequency = <0>; /* Filled in by zImage */ ++ ++ cf_card@ff100000 { ++ compatible = "magicbox-cf", "pata-magicbox-cf"; ++ reg = <0x00000000 0xff100000 0x00001000 ++ 0x00000000 0xff200000 0x00001000>; ++ interrupt-parent = <&UIC0>; ++ interrupts = <0x19 0x1 /* IRQ_TYPE_EDGE_RISING */ >; ++ }; ++ ++ nor_flash@ff800000 { ++ compatible = "cfi-flash"; ++ bank-width = <2>; ++ reg = <0x00000000 0xff800000 0x00800000>; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ partition@0 { ++ label = "linux"; ++ reg = <0x0 0x120000>; ++ }; ++ partition@120000 { ++ label = "rootfs"; ++ reg = <0x120000 0x6a0000>; ++ }; ++ partition@7c0000 { ++ label = "u-boot"; ++ reg = <0x7c0000 0x30000>; ++ read-only; ++ }; ++ }; ++ }; ++ ++ PCI0: pci@ec000000 { ++ device_type = "pci"; ++ #interrupt-cells = <1>; ++ #size-cells = <2>; ++ #address-cells = <3>; ++ compatible = "ibm,plb405ep-pci", "ibm,plb-pci"; ++ primary; ++ reg = <0xeec00000 0x00000008 /* Config space access */ ++ 0xeed80000 0x00000004 /* IACK */ ++ 0xeed80000 0x00000004 /* Special cycle */ ++ 0xef480000 0x00000040>; /* Internal registers */ ++ ++ /* Outbound ranges, one memory and one IO, ++ * later cannot be changed. Chip supports a second ++ * IO range but we don't use it for now ++ */ ++ ranges = <0x02000000 0x00000000 0x80000000 0x80000000 0x00000000 0x20000000 ++ 0x01000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>; ++ ++ /* Inbound 2GB range starting at 0 */ ++ dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>; ++ ++ interrupt-map-mask = <0xf800 0x0 0x0 0x0>; ++ interrupt-map = < ++ /* IDSEL 1 */ ++ 0x800 0x0 0x0 0x0 &UIC0 0x1c 0x8 ++ ++ /* IDSEL 2 */ ++ 0x1000 0x0 0x0 0x0 &UIC0 0x1d 0x8 ++ ++ /* IDSEL 3 */ ++ 0x1800 0x0 0x0 0x0 &UIC0 0x1e 0x8 ++ ++ /* IDSEL 4 */ ++ 0x2000 0x0 0x0 0x0 &UIC0 0x1f 0x8 ++ >; ++ }; ++ }; ++ ++ chosen { ++ linux,stdout-path = "/plb/opb/serial@ef600300"; ++ }; ++}; +--- a/arch/powerpc/boot/Makefile ++++ b/arch/powerpc/boot/Makefile +@@ -43,6 +43,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 ++$(obj)/cuboot-openrb.o: BOOTCFLAGS += -mcpu=405 + $(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 \ + 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 + src-boot := $(src-wlib) $(src-plat) empty.c + + src-boot := $(addprefix $(obj)/, $(src-boot)) +@@ -194,6 +196,7 @@ image-$(CONFIG_EP405) += dtbImage.ep40 + image-$(CONFIG_WALNUT) += treeImage.walnut + image-$(CONFIG_ACADIA) += cuImage.acadia + image-$(CONFIG_MAGICBOX) += cuImage.magicbox ++image-$(CONFIG_OPENRB) += cuImage.openrb + + # Board ports in arch/powerpc/platform/44x/Kconfig + 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 + help + This option enables support for the Magicbox boards. + ++config OPENRB ++ bool "OpenRB" ++ depends on 40x ++ default n ++ select PPC40x_SIMPLE ++ select 405EP ++ select PCI ++ help ++ This option enables support for the OpenRB boards. ++ + config MAKALU + bool "Makalu" + 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", + "amcc,kilauea", + "amcc,makalu", +- "magicbox" ++ "magicbox", ++ "openrb" + }; + + static int __init ppc40x_probe(void) diff --git a/target/linux/ppc40x/patches/100-magicbox-ide-driver.patch b/target/linux/ppc40x/patches/100-magicbox-ide-driver.patch new file mode 100644 index 0000000000..d6907f9828 --- /dev/null +++ b/target/linux/ppc40x/patches/100-magicbox-ide-driver.patch @@ -0,0 +1,320 @@ +--- a/drivers/ide/Kconfig ++++ b/drivers/ide/Kconfig +@@ -717,6 +717,11 @@ config BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA + depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX + endchoice + ++config BLK_DEV_IDE_MAGICBOX ++ tristate "Magicbox CF card support" ++ depends on MAGICBOX || OPENRB_LIGHT ++ select IDE_XFER_MODE ++ + config BLK_DEV_IDE_TX4938 + tristate "TX4938 internal IDE support" + depends on SOC_TX4938 +--- a/drivers/ide/Makefile ++++ b/drivers/ide/Makefile +@@ -113,6 +113,7 @@ obj-$(CONFIG_BLK_DEV_IDE_RAPIDE) += rapi + obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710) += palm_bk3710.o + + obj-$(CONFIG_BLK_DEV_IDE_AU1XXX) += au1xxx-ide.o ++obj-$(CONFIG_BLK_DEV_IDE_MAGICBOX) += magicbox_ide.o + + obj-$(CONFIG_BLK_DEV_IDE_TX4938) += tx4938ide.o + obj-$(CONFIG_BLK_DEV_IDE_TX4939) += tx4939ide.o +--- /dev/null ++++ b/drivers/ide/magicbox_ide.c +@@ -0,0 +1,293 @@ ++/* ++ * IDE driver for the MagicBox 2.0 onboard CompactFlash slot. ++ * ++ * Copyright (C) 2009 Gabor Juhos ++ * ++ * Based on the original driver by Wojtek Kaniewski ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 as published ++ * by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define DRV_DESC "IDE driver for Magicbox 2.0 onboard CF slot" ++#define DRV_NAME "magicbox_cf" ++ ++static inline u8 magicbox_ide_inb(unsigned long port) ++{ ++ return (u8) (readw((void __iomem *) port) >> 8) & 0xff; ++} ++ ++static inline void magicbox_ide_outb(u8 value, unsigned long port) ++{ ++ writew(value << 8, (void __iomem *) port); ++} ++ ++static inline void magicbox_ide_insw(unsigned long port, void *addr, u32 count) ++{ ++ u16 *ptr; ++ ++ for (ptr = addr; count--; ptr++) ++ *ptr = readw((void __iomem *) port); ++} ++ ++static inline void magicbox_ide_insl(unsigned long port, void *addr, u32 count) ++{ ++ u32 *ptr; ++ ++ for (ptr = addr; count--; ptr++) ++ *ptr = readl((void __iomem *) port); ++} ++ ++static inline void magicbox_ide_outsw(unsigned long port, void *addr, ++ u32 count) ++{ ++ u16 *ptr; ++ ++ for (ptr = addr; count--; ptr++) ++ writew(*ptr, (void __iomem *) port); ++} ++ ++static inline void magicbox_ide_outsl(unsigned long port, void *addr, ++ u32 count) ++{ ++ u32 *ptr; ++ ++ for (ptr = addr; count--; ptr++) ++ writel(*ptr, (void __iomem *) port); ++} ++ ++static void magicbox_ide_exec_command(ide_hwif_t *hwif, u8 cmd) ++{ ++ magicbox_ide_outb(cmd, hwif->io_ports.command_addr); ++} ++ ++static u8 magicbox_ide_read_status(ide_hwif_t *hwif) ++{ ++ return magicbox_ide_inb(hwif->io_ports.status_addr); ++} ++ ++static u8 magicbox_ide_read_altstatus(ide_hwif_t *hwif) ++{ ++ return magicbox_ide_inb(hwif->io_ports.ctl_addr); ++} ++ ++static void magicbox_ide_write_devctl(ide_hwif_t *hwif, u8 ctl) ++{ ++ magicbox_ide_outb(ctl, hwif->io_ports.ctl_addr); ++} ++ ++static void magicbox_ide_tf_load(ide_drive_t *drive, struct ide_taskfile *tf, ++ u8 valid) ++{ ++ struct ide_io_ports *io_ports = &drive->hwif->io_ports; ++ ++ if (valid & IDE_VALID_FEATURE) ++ magicbox_ide_outb(tf->feature, io_ports->feature_addr); ++ if (valid & IDE_VALID_NSECT) ++ magicbox_ide_outb(tf->nsect, io_ports->nsect_addr); ++ if (valid & IDE_VALID_LBAL) ++ magicbox_ide_outb(tf->lbal, io_ports->lbal_addr); ++ if (valid & IDE_VALID_LBAM) ++ magicbox_ide_outb(tf->lbam, io_ports->lbam_addr); ++ if (valid & IDE_VALID_LBAH) ++ magicbox_ide_outb(tf->lbah, io_ports->lbah_addr); ++ ++ if (valid & IDE_VALID_DEVICE) ++ magicbox_ide_outb(tf->device, io_ports->device_addr); ++} ++ ++static void magicbox_ide_tf_read(ide_drive_t *drive, struct ide_taskfile *tf, ++ u8 valid) ++{ ++ struct ide_io_ports *io_ports = &drive->hwif->io_ports; ++ ++ if (valid & IDE_VALID_NSECT) ++ tf->nsect = magicbox_ide_inb(io_ports->nsect_addr); ++ if (valid & IDE_VALID_LBAL) ++ tf->lbal = magicbox_ide_inb(io_ports->lbal_addr); ++ if (valid & IDE_VALID_LBAM) ++ tf->lbam = magicbox_ide_inb(io_ports->lbam_addr); ++ if (valid & IDE_VALID_LBAH) ++ tf->lbah = magicbox_ide_inb(io_ports->lbah_addr); ++ if (valid & IDE_VALID_DEVICE) ++ tf->device = magicbox_ide_inb(io_ports->device_addr); ++} ++ ++static void magicbox_ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd, ++ void *buf, unsigned int len) ++{ ++ unsigned long port = drive->hwif->io_ports.data_addr; ++ ++ len++; ++ ++ if (drive->io_32bit) { ++ magicbox_ide_insl(port, buf, len / 4); ++ ++ if ((len & 3) >= 2) ++ magicbox_ide_insw(port, (u8 *)buf + (len & ~3), 1); ++ } else { ++ magicbox_ide_insw(port, buf, len / 2); ++ } ++} ++ ++static void magicbox_ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd, ++ void *buf, unsigned int len) ++{ ++ unsigned long port = drive->hwif->io_ports.data_addr; ++ ++ len++; ++ ++ if (drive->io_32bit) { ++ magicbox_ide_outsl(port, buf, len / 4); ++ ++ if ((len & 3) >= 2) ++ magicbox_ide_outsw(port, (u8 *)buf + (len & ~3), 1); ++ } else { ++ magicbox_ide_outsw(port, buf, len / 2); ++ } ++} ++ ++static void magicbox_ide_set_pio_mode(ide_drive_t *drive, const u8 pio) ++{ ++} ++ ++static u8 magicbox_ide_cable_detect(ide_hwif_t *hwif) ++{ ++ return ATA_CBL_PATA40; ++} ++ ++static const struct ide_tp_ops magicbox_ide_tp_ops = { ++ .exec_command = magicbox_ide_exec_command, ++ .read_status = magicbox_ide_read_status, ++ .read_altstatus = magicbox_ide_read_altstatus, ++ .write_devctl = magicbox_ide_write_devctl, ++ ++ .dev_select = ide_dev_select, ++ .tf_load = magicbox_ide_tf_load, ++ .tf_read = magicbox_ide_tf_read, ++ ++ .input_data = magicbox_ide_input_data, ++ .output_data = magicbox_ide_output_data, ++}; ++ ++static const struct ide_port_ops magicbox_ide_port_ops = { ++ .set_pio_mode = magicbox_ide_set_pio_mode, ++ .cable_detect = magicbox_ide_cable_detect, ++}; ++ ++static const struct ide_port_info magicbox_ide_port_info = { ++ .name = DRV_NAME, ++ .chipset = ide_generic, ++ .tp_ops = &magicbox_ide_tp_ops, ++ .port_ops = &magicbox_ide_port_ops, ++ .host_flags = IDE_HFLAG_SINGLE | ++ IDE_HFLAG_NO_DMA | ++ IDE_HFLAG_MMIO | ++ IDE_HFLAG_UNMASK_IRQS, ++ .pio_mask = ATA_PIO4, ++}; ++ ++static inline void magicbox_ide_setup_hw(hw_regs_t *hw, u16 __iomem *base, ++ u16 __iomem *ctrl, int irq) ++{ ++ unsigned long port = (unsigned long) base; ++ int i; ++ ++ memset(hw, 0, sizeof(*hw)); ++ for (i = 0; i <= 7; i++) ++ hw->io_ports_array[i] = port + i * 2; ++ ++ /* ++ * the IDE control register is at ATA address 6, ++ * with CS1 active instead of CS0 ++ */ ++ hw->io_ports.ctl_addr = (unsigned long)ctrl + (6 * 2); ++ hw->irq = irq; ++ hw->chipset = ide_generic; ++ hw->ack_intr = NULL; ++} ++ ++static int __devinit magicbox_ide_of_probe(struct of_device *op, ++ const struct of_device_id *match) ++{ ++ hw_regs_t hw; ++ hw_regs_t *hws[] = { &hw, NULL, NULL, NULL }; ++ struct ide_host *host; ++ u16 __iomem *base; ++ u16 __iomem *ctrl; ++ int irq; ++ int ret = 0; ++ ++ irq = irq_of_parse_and_map(op->node, 0); ++ if (irq < 0) { ++ dev_err(&op->dev, "invalid irq\n"); ++ ret = -EINVAL; ++ goto err_exit; ++ } ++ ++ base = of_iomap(op->node, 0); ++ if (base == NULL) { ++ ret = -ENOMEM; ++ goto err_exit; ++ } ++ ++ ctrl = of_iomap(op->node, 1); ++ if (ctrl == NULL) { ++ ret = -ENOMEM; ++ goto err_unmap_base; ++ } ++ ++ hw.dev = &op->dev; ++ magicbox_ide_setup_hw(&hw, base, ctrl, irq); ++ ++ ret = ide_host_add(&magicbox_ide_port_info, hws, &host); ++ if (ret) ++ goto err_unmap_ctrl; ++ ++ dev_set_drvdata(&op->dev, host); ++ ++ return 0; ++ ++ err_unmap_ctrl: ++ iounmap(ctrl); ++ err_unmap_base: ++ iounmap(base); ++ err_exit: ++ return ret; ++} ++ ++static struct of_device_id magicbox_ide_of_match[] = { ++ { .compatible = "magicbox-cf", }, ++ {}, ++}; ++ ++static struct of_platform_driver magicbox_ide_of_platform_driver = { ++ .owner = THIS_MODULE, ++ .name = DRV_NAME, ++ .match_table = magicbox_ide_of_match, ++ .probe = magicbox_ide_of_probe, ++ .driver = { ++ .name = DRV_NAME, ++ .owner = THIS_MODULE, ++ }, ++}; ++ ++static int __init magicbox_ide_init(void) ++{ ++ return of_register_platform_driver(&magicbox_ide_of_platform_driver); ++} ++ ++module_init(magicbox_ide_init); ++ ++MODULE_DESCRIPTION(DRV_DESC); ++MODULE_AUTHOR("Gabor Juhos "); ++MODULE_LICENSE("GPL v2"); ++MODULE_DEVICE_TABLE(of, magicbox_ide_of_match); diff --git a/target/linux/ppc40x/patches/101-pata-magicbox-cf-driver.patch b/target/linux/ppc40x/patches/101-pata-magicbox-cf-driver.patch new file mode 100644 index 0000000000..f738f89685 --- /dev/null +++ b/target/linux/ppc40x/patches/101-pata-magicbox-cf-driver.patch @@ -0,0 +1,436 @@ +--- a/drivers/ata/Kconfig ++++ b/drivers/ata/Kconfig +@@ -698,6 +698,16 @@ config PATA_IXP4XX_CF + + If unsure, say N. + ++config PATA_MAGICBOX_CF ++ tristate "Magicbox/OpenRB Compact Flash support" ++ depends on MAGICBOX || OPENRB ++ help ++ This option enables support for a Compact Flash conected on ++ the ppc405ep expansion bus. This driver had been written for ++ the Magicbox v2 and OpenRB boards. ++ ++ If unsure, say N. ++ + config PATA_OCTEON_CF + tristate "OCTEON Boot Bus Compact Flash support" + depends on CPU_CAVIUM_OCTEON +--- a/drivers/ata/Makefile ++++ b/drivers/ata/Makefile +@@ -48,6 +48,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 +--- /dev/null ++++ b/drivers/ata/pata_magicbox_cf.c +@@ -0,0 +1,404 @@ ++/* ++ * PATA/CompactFlash driver for the MagicBox v2/OpenRB boards. ++ * ++ * Copyright (C) 2009 Gabor Juhos ++ * ++ * Based on the IDE driver by Wojtek Kaniewski ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 as published ++ * by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define DRV_DESC "PATA/CompactFlash driver for Magicbox/OpenRB boards" ++#define DRV_NAME "pata_magicbox_cf" ++#define DRV_VERSION "0.1.0" ++ ++#define MAGICBOX_CF_REG_CMD (2 * ATA_REG_CMD) ++#define MAGICBOX_CF_REG_DATA (2 * ATA_REG_DATA) ++#define MAGICBOX_CF_REG_ERR (2 * ATA_REG_ERR) ++#define MAGICBOX_CF_REG_FEATURE (2 * ATA_REG_FEATURE) ++#define MAGICBOX_CF_REG_NSECT (2 * ATA_REG_NSECT) ++#define MAGICBOX_CF_REG_LBAL (2 * ATA_REG_LBAL) ++#define MAGICBOX_CF_REG_LBAM (2 * ATA_REG_LBAM) ++#define MAGICBOX_CF_REG_LBAH (2 * ATA_REG_LBAH) ++#define MAGICBOX_CF_REG_DEVICE (2 * ATA_REG_DEVICE) ++#define MAGICBOX_CF_REG_STATUS (2 * ATA_REG_STATUS) ++#define MAGICBOX_CF_REG_ALTSTATUS (2 * 6) ++#define MAGICBOX_CF_REG_CTL (2 * 6) ++ ++#define MAGICBOX_CF_MAXPORTS 1 ++ ++struct magicbox_cf_info { ++ void __iomem *base; ++ void __iomem *ctrl; ++}; ++ ++static inline u8 magicbox_cf_inb(void __iomem *port) ++{ ++ return (u8) (readw(port) >> 8) & 0xff; ++} ++ ++static inline void magicbox_cf_outb(void __iomem *port, u8 value) ++{ ++ writew(value << 8, port); ++} ++ ++static int magicbox_cf_set_mode(struct ata_link *link, ++ struct ata_device **error) ++{ ++ struct ata_device *dev; ++ ++ ata_for_each_dev(dev, link, ENABLED) { ++ ata_dev_printk(dev, KERN_INFO, "configured for PIO0\n"); ++ dev->pio_mode = XFER_PIO_0; ++ dev->xfer_mode = XFER_PIO_0; ++ dev->xfer_shift = ATA_SHIFT_PIO; ++ dev->flags |= ATA_DFLAG_PIO; ++ } ++ ++ return 0; ++} ++ ++static void magicbox_cf_exec_command(struct ata_port *ap, ++ const struct ata_taskfile *tf) ++{ ++ DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command); ++ ++ magicbox_cf_outb(ap->ioaddr.command_addr, tf->command); ++ ata_sff_pause(ap); ++} ++ ++static u8 magicbox_cf_check_status(struct ata_port *ap) ++{ ++ u8 status; ++ ++ status = magicbox_cf_inb(ap->ioaddr.status_addr); ++ ++ DPRINTK("ata%u: status 0x%X, from %p\n", ap->print_id, status, ++ ap->ioaddr.status_addr); ++ ++ return status; ++} ++ ++static u8 magicbox_cf_check_altstatus(struct ata_port *ap) ++{ ++ u8 altstatus; ++ ++ altstatus = magicbox_cf_inb(ap->ioaddr.altstatus_addr); ++ ++ DPRINTK("ata%u: altstatus 0x%X, from %p\n", ap->print_id, ++ altstatus, ap->ioaddr.altstatus_addr); ++ ++ return altstatus; ++} ++ ++static void magicbox_cf_dev_select(struct ata_port *ap, unsigned int device) ++{ ++ /* Nothing to do. We are supporting one device only. */ ++} ++ ++static void magicbox_cf_tf_load(struct ata_port *ap, ++ const struct ata_taskfile *tf) ++{ ++ struct ata_ioports *ioaddr = &ap->ioaddr; ++ unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR; ++ ++ if (tf->ctl != ap->last_ctl) { ++ magicbox_cf_outb(ioaddr->ctl_addr, tf->ctl); ++ ap->last_ctl = tf->ctl; ++ ata_wait_idle(ap); ++ } ++ ++ if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) { ++ magicbox_cf_outb(ioaddr->feature_addr, tf->hob_feature); ++ magicbox_cf_outb(ioaddr->nsect_addr, tf->hob_nsect); ++ magicbox_cf_outb(ioaddr->lbal_addr, tf->hob_lbal); ++ magicbox_cf_outb(ioaddr->lbam_addr, tf->hob_lbam); ++ magicbox_cf_outb(ioaddr->lbah_addr, tf->hob_lbah); ++ VPRINTK("hob: feat 0x%X nsect 0x%X, lba 0x%X 0x%X 0x%X\n", ++ tf->hob_feature, ++ tf->hob_nsect, ++ tf->hob_lbal, ++ tf->hob_lbam, ++ tf->hob_lbah); ++ } ++ ++ if (is_addr) { ++ magicbox_cf_outb(ioaddr->feature_addr, tf->feature); ++ magicbox_cf_outb(ioaddr->nsect_addr, tf->nsect); ++ magicbox_cf_outb(ioaddr->lbal_addr, tf->lbal); ++ magicbox_cf_outb(ioaddr->lbam_addr, tf->lbam); ++ magicbox_cf_outb(ioaddr->lbah_addr, tf->lbah); ++ VPRINTK("feat 0x%X nsect 0x%X lba 0x%X 0x%X 0x%X\n", ++ tf->feature, ++ tf->nsect, ++ tf->lbal, ++ tf->lbam, ++ tf->lbah); ++ } ++ ++ if (tf->flags & ATA_TFLAG_DEVICE) { ++ magicbox_cf_outb(ioaddr->device_addr, tf->device); ++ VPRINTK("device 0x%X\n", tf->device); ++ } ++ ++ ata_wait_idle(ap); ++} ++ ++static void magicbox_cf_tf_read(struct ata_port *ap, struct ata_taskfile *tf) ++{ ++ struct ata_ioports *ioaddr = &ap->ioaddr; ++ ++ tf->command = magicbox_cf_inb(ap->ioaddr.status_addr); ++ tf->feature = magicbox_cf_inb(ioaddr->error_addr); ++ tf->nsect = magicbox_cf_inb(ioaddr->nsect_addr); ++ tf->lbal = magicbox_cf_inb(ioaddr->lbal_addr); ++ tf->lbam = magicbox_cf_inb(ioaddr->lbam_addr); ++ tf->lbah = magicbox_cf_inb(ioaddr->lbah_addr); ++ tf->device = magicbox_cf_inb(ioaddr->device_addr); ++ VPRINTK("feat 0x%X nsect 0x%X lba 0x%X 0x%X 0x%X\n", ++ tf->feature, ++ tf->nsect, ++ tf->lbal, ++ tf->lbam, ++ tf->lbah); ++ ++ if (tf->flags & ATA_TFLAG_LBA48) { ++ magicbox_cf_outb(ioaddr->ctl_addr, tf->ctl | ATA_HOB); ++ tf->hob_feature = magicbox_cf_inb(ioaddr->error_addr); ++ tf->hob_nsect = magicbox_cf_inb(ioaddr->nsect_addr); ++ tf->hob_lbal = magicbox_cf_inb(ioaddr->lbal_addr); ++ tf->hob_lbam = magicbox_cf_inb(ioaddr->lbam_addr); ++ tf->hob_lbah = magicbox_cf_inb(ioaddr->lbah_addr); ++ magicbox_cf_outb(ioaddr->ctl_addr, tf->ctl); ++ ap->last_ctl = tf->ctl; ++ VPRINTK("hob: feat 0x%X nsect 0x%X lba 0x%X 0x%X 0x%X\n", ++ tf->feature, ++ tf->nsect, ++ tf->lbal, ++ tf->lbam, ++ tf->lbah); ++ } ++} ++ ++static unsigned int magicbox_cf_data_xfer(struct ata_device *dev, ++ unsigned char *buf, ++ unsigned int buflen, int rw) ++{ ++ struct ata_port *ap = dev->link->ap; ++ unsigned int words = buflen >> 1; ++ unsigned int i; ++ u16 *buf16 = (u16 *) buf; ++ void __iomem *mmio = ap->ioaddr.data_addr; ++ ++ /* Transfer multiple of 2 bytes */ ++ if (rw == READ) ++ for (i = 0; i < words; i++) ++ buf16[i] = readw(mmio); ++ else ++ for (i = 0; i < words; i++) ++ writew(buf16[i], mmio); ++ ++ /* Transfer trailing 1 byte, if any. */ ++ if (unlikely(buflen & 0x01)) { ++ u16 align_buf[1] = { 0 }; ++ unsigned char *trailing_buf = buf + buflen - 1; ++ ++ if (rw == READ) { ++ align_buf[0] = readw(mmio); ++ memcpy(trailing_buf, align_buf, 1); ++ } else { ++ memcpy(align_buf, trailing_buf, 1); ++ writew(align_buf[0], mmio); ++ } ++ words++; ++ } ++ ++ return words << 1; ++} ++ ++static u8 magicbox_cf_irq_on(struct ata_port *ap) ++{ ++ /* Nothing to do. */ ++ return 0; ++} ++ ++static void magicbox_cf_irq_clear(struct ata_port *ap) ++{ ++ /* Nothing to do. */ ++} ++ ++static struct ata_port_operations magicbox_cf_port_ops = { ++ .inherits = &ata_sff_port_ops, ++ ++ .cable_detect = ata_cable_40wire, ++ .set_mode = magicbox_cf_set_mode, ++ ++ .sff_exec_command = magicbox_cf_exec_command, ++ .sff_check_status = magicbox_cf_check_status, ++ .sff_check_altstatus = magicbox_cf_check_altstatus, ++ .sff_dev_select = magicbox_cf_dev_select, ++ .sff_tf_load = magicbox_cf_tf_load, ++ .sff_tf_read = magicbox_cf_tf_read, ++ .sff_data_xfer = magicbox_cf_data_xfer, ++ ++ .sff_irq_on = magicbox_cf_irq_on, ++ .sff_irq_clear = magicbox_cf_irq_clear, ++ ++ .port_start = ATA_OP_NULL, ++}; ++ ++static struct scsi_host_template magicbox_cf_sht = { ++ ATA_PIO_SHT(DRV_NAME), ++}; ++ ++static inline void magicbox_cf_setup_port(struct ata_host *host) ++{ ++ struct magicbox_cf_info *info = host->private_data; ++ struct ata_port *ap; ++ ++ ap = host->ports[0]; ++ ++ ap->ops = &magicbox_cf_port_ops; ++ ap->pio_mask = ATA_PIO4; ++ ap->flags |= ATA_FLAG_MMIO | ATA_FLAG_NO_LEGACY | ATA_FLAG_NO_ATAPI; ++ ++ ap->ioaddr.cmd_addr = info->base + MAGICBOX_CF_REG_CMD; ++ ap->ioaddr.data_addr = info->base + MAGICBOX_CF_REG_DATA; ++ ap->ioaddr.error_addr = info->base + MAGICBOX_CF_REG_ERR; ++ ap->ioaddr.feature_addr = info->base + MAGICBOX_CF_REG_FEATURE; ++ ap->ioaddr.nsect_addr = info->base + MAGICBOX_CF_REG_NSECT; ++ ap->ioaddr.lbal_addr = info->base + MAGICBOX_CF_REG_LBAL; ++ ap->ioaddr.lbam_addr = info->base + MAGICBOX_CF_REG_LBAM; ++ ap->ioaddr.lbah_addr = info->base + MAGICBOX_CF_REG_LBAH; ++ ap->ioaddr.device_addr = info->base + MAGICBOX_CF_REG_DEVICE; ++ ap->ioaddr.status_addr = info->base + MAGICBOX_CF_REG_STATUS; ++ ap->ioaddr.command_addr = info->base + MAGICBOX_CF_REG_CMD; ++ ++ ap->ioaddr.altstatus_addr = info->ctrl + MAGICBOX_CF_REG_ALTSTATUS; ++ ap->ioaddr.ctl_addr = info->ctrl + MAGICBOX_CF_REG_CTL; ++ ++ ata_port_desc(ap, "cmd 0x%p ctl 0x%p", ap->ioaddr.cmd_addr, ++ ap->ioaddr.ctl_addr); ++} ++ ++static int __devinit magicbox_cf_of_probe(struct of_device *op, ++ const struct of_device_id *match) ++{ ++ struct magicbox_cf_info *info; ++ struct ata_host *host; ++ int irq; ++ int ret = 0; ++ ++ info = kzalloc(sizeof(struct magicbox_cf_info), GFP_KERNEL); ++ if (info == NULL) { ++ ret = -ENOMEM; ++ goto err_exit; ++ } ++ ++ irq = irq_of_parse_and_map(op->node, 0); ++ if (irq < 0) { ++ dev_err(&op->dev, "invalid irq\n"); ++ ret = -EINVAL; ++ goto err_free_info; ++ } ++ ++ info->base = of_iomap(op->node, 0); ++ if (info->base == NULL) { ++ ret = -ENOMEM; ++ goto err_free_info; ++ } ++ ++ info->ctrl = of_iomap(op->node, 1); ++ if (info->ctrl == NULL) { ++ ret = -ENOMEM; ++ goto err_unmap_base; ++ } ++ ++ host = ata_host_alloc(&op->dev, MAGICBOX_CF_MAXPORTS); ++ if (host == NULL) { ++ ret = -ENOMEM; ++ goto err_unmap_ctrl; ++ } ++ ++ host->private_data = info; ++ magicbox_cf_setup_port(host); ++ ++ ret = ata_host_activate(host, irq, ata_sff_interrupt, ++ IRQF_TRIGGER_RISING, &magicbox_cf_sht); ++ if (ret) ++ goto err_unmap_ctrl; ++ ++ dev_set_drvdata(&op->dev, host); ++ return 0; ++ ++ err_unmap_ctrl: ++ iounmap(info->ctrl); ++ err_unmap_base: ++ iounmap(info->base); ++ err_free_info: ++ kfree(info); ++ err_exit: ++ return ret; ++} ++ ++static __devexit int magicbox_cf_of_remove(struct of_device *op) ++{ ++ struct ata_host *host = dev_get_drvdata(&op->dev); ++ struct magicbox_cf_info *info = host->private_data; ++ ++ ata_host_detach(host); ++ iounmap(info->ctrl); ++ iounmap(info->base); ++ kfree(info); ++ ++ return 0; ++} ++ ++static struct of_device_id magicbox_cf_of_match[] = { ++ { .compatible = "pata-magicbox-cf", }, ++ {}, ++}; ++ ++static struct of_platform_driver magicbox_cf_of_platform_driver = { ++ .owner = THIS_MODULE, ++ .name = DRV_NAME, ++ .match_table = magicbox_cf_of_match, ++ .probe = magicbox_cf_of_probe, ++ .remove = __devexit_p(magicbox_cf_of_remove), ++ .driver = { ++ .name = DRV_NAME, ++ .owner = THIS_MODULE, ++ }, ++}; ++ ++static int __init magicbox_cf_init(void) ++{ ++ return of_register_platform_driver(&magicbox_cf_of_platform_driver); ++} ++ ++static void __exit magicbox_cf_exit(void) ++{ ++ of_unregister_platform_driver(&magicbox_cf_of_platform_driver); ++} ++ ++module_init(magicbox_cf_init); ++module_exit(magicbox_cf_exit); ++ ++MODULE_DESCRIPTION(DRV_DESC); ++MODULE_AUTHOR("Gabor Juhos "); ++MODULE_LICENSE("GPL v2"); ++MODULE_VERSION(DRV_VERSION); ++MODULE_DEVICE_TABLE(of, magicbox_cf_of_match); diff --git a/target/linux/ppc40x/patches/110-kilauea_openwrt_flashmap.patch b/target/linux/ppc40x/patches/110-kilauea_openwrt_flashmap.patch new file mode 100644 index 0000000000..3244e2c933 --- /dev/null +++ b/target/linux/ppc40x/patches/110-kilauea_openwrt_flashmap.patch @@ -0,0 +1,25 @@ +--- 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>; + }; +- 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>; + }; + partition@3f60000 { + label = "env"; 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 new file mode 100644 index 0000000000..01a70c52cc --- /dev/null +++ b/target/linux/ppc40x/patches/900-backport-fix-annotation-of-pcibios_claim_one_bus.patch @@ -0,0 +1,42 @@ +From: Stephen Rothwell +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 +Signed-off-by: Benjamin Herrenschmidt +--- + +--- 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