Date:2010-05-02 13:23:58 (13 years 7 months ago)
Author:Lars C.
Commit:78fcab66df9812751f1085765663cb9c915a250b
Message:Merge commit 'backfire/master' into xburst

Conflicts:

feeds.conf.default
package/base-files/Makefile
package/block-extroot/Makefile
package/block-mount/Makefile
package/busybox/Makefile
package/busybox/config/util-linux/Config.in
package/dnsmasq/Makefile
package/dnsmasq/files/dnsmasq.init
package/uhttpd/Makefile
target/linux/adm5120/image/Makefile
target/linux/amazon/image/Makefile
target/linux/ar71xx/config-2.6.33
target/linux/ar71xx/config-2.6.34
target/linux/at91/image/Makefile
target/linux/atheros/patches-2.6.33/220-enet_micrel_workaround.patch
target/linux/coldfire/image/Makefile
target/linux/ep93xx/image/Makefile
target/linux/etrax/image/Makefile
target/linux/gemini/image/Makefile
target/linux/generic-2.6/config-2.6.33
target/linux/generic-2.6/config-2.6.34
target/linux/generic-2.6/patches-2.6.33/007-squashfs_make_lzma_available.patch
target/linux/generic-2.6/patches-2.6.33/014-samsung_flash
target/linux/generic-2.6/patches-2.6.33/020-mips_multi_machine_support.patch
target/linux/generic-2.6/patches-2.6.33/030-pci_disable_common_quirks.patch
target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch
target/linux/generic-2.6/patches-2.6.33/100-netfilter_layer7_2.21.patch
target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch
target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch
target/linux/generic-2.6/patches-2.6.33/202-mips_mem_functions_performance.patch
target/linux/generic-2.6/patches-2.6.33/203-slab_maxsize.patch
target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch
target/linux/generic-2.6/patches-2.6.33/210-mini_fo_2.6.25_fixes.patch
target/linux/generic-2.6/patches-2.6.33/212-mini_fo_2.6.26_fixes.patch
target/linux/generic-2.6/patches-2.6.33/400-ledtrig_morse.patch
target/linux/generic-2.6/patches-2.6.33/402-ledtrig_netdev.patch
target/linux/generic-2.6/patches-2.6.33/511-yaffs-cvs-2009-04-24.patch
target/linux/generic-2.6/patches-2.6.33/903-hostap_txpower.patch
target/linux/generic-2.6/patches-2.6.33/924-cs5535_gpio.patch
target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch
target/linux/generic-2.6/patches-2.6.33/971-ocf_20080917.patch
target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch
target/linux/generic-2.6/patches-2.6.33/998-openwrt_lzma_options.patch
target/linux/goldfish/image/Makefile
target/linux/iop32x/image/Makefile
target/linux/malta/Makefile
target/linux/malta/README
target/linux/malta/image/Makefile
target/linux/mpc52xx/image/Makefile
target/linux/mpc83xx/image/Makefile
target/linux/omap35xx/image/Makefile
target/linux/ppc40x/config-default
target/linux/ppc40x/patches/004-magicbox.patch
target/linux/ppc40x/patches/005-openrb.patch
target/linux/ps3/image/Makefile
target/linux/pxa/image/Makefile
target/linux/pxcab/image/Makefile
target/linux/ramips/image/Makefile
target/linux/ramips/rt288x/config-2.6.32
target/linux/ramips/rt305x/config-2.6.32
target/linux/s3c24xx/image/Makefile
target/linux/sibyte/image/Makefile
target/linux/ubicom32/image/Makefile
target/linux/x86/generic/config-default

diff --cc feeds.conf.default
index 5759575,5901fff..924bc71
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@@ -1,9 -1,8 +1,9 @@@
src-svn packages svn://svn.openwrt.org/openwrt/packages
- #src-svn xwrt http://x-wrt.googlecode.com/svn/trunk/package
- #src-svn luci http://svn.luci.subsignal.org/luci/branches/luci-0.9/contrib/package
-src-svn xwrt http://x-wrt.googlecode.com/svn/branches/backfire_10.03/package
-src-svn luci http://svn.luci.subsignal.org/luci/tags/0.9.0/contrib/package
-#src-svn phone svn://svn.openwrt.org/openwrt/feeds/phone
-#src-svn efl svn://svn.openwrt.org/openwrt/feeds/efl
-#src-svn desktop svn://svn.openwrt.org/openwrt/feeds/desktop
-#src-svn xfce svn://svn.openwrt.org/openwrt/feeds/xfce
++#src-svn xwrt http://x-wrt.googlecode.com/svn/branches/backfire_10.03/package
++#src-svn luci http://svn.luci.subsignal.org/luci/tags/0.9.0/contrib/package
+src-svn phone svn://svn.openwrt.org/openwrt/feeds/phone
+src-svn efl svn://svn.openwrt.org/openwrt/feeds/efl
+src-svn desktop svn://svn.openwrt.org/openwrt/feeds/desktop
+src-svn xfce svn://svn.openwrt.org/openwrt/feeds/xfce
+src-git qipackages git://projects.qi-hardware.com/openwrt-packages.git
#src-link custom /usr/src/openwrt/custom-feed
diff --cc package/kernel/modules/other.mk
index a000656,68d9c88..97ce3d3
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@@ -798,10 -799,10 +799,10 @@@ $(eval $(call KernelPackage,mmc-atmelmc
define KernelPackage/cs5535-gpio
SUBMENU:=$(OTHER_MENU)
TITLE:=AMD CS5535/CS5536 GPIO driver
- DEPENDS:=@TARGET_x86||@TARGET_olpc
+ DEPENDS:=@TARGET_x86
KCONFIG:=CONFIG_CS5535_GPIO
FILES:=$(LINUX_DIR)/drivers/char/cs5535_gpio.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,90,cs5535_gpio)
+ AUTOLOAD:=$(call AutoLoad,50,cs5535_gpio)
endef

define KernelPackage/cs5535-gpio/description
diff --cc target/linux/ppc40x/config-default
index c2410f3,bedc42d..0000000
deleted file mode 100644,100644
--- a/target/linux/ppc40x/config-default
+++ /dev/null
@@@ -1,184 -1,197 +1,0 @@@
--CONFIG_405EP=y
--CONFIG_405EX=y
--CONFIG_40x=y
--# CONFIG_44x is not set
--CONFIG_4xx=y
--CONFIG_4xx_SOC=y
--# CONFIG_ACADIA is not set
--# CONFIG_ADVANCED_OPTIONS 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_BITREVERSE=y
--# CONFIG_BOOKE_WDT is not set
--CONFIG_BOUNCE=y
--CONFIG_CC_OPTIMIZE_FOR_SIZE=y
--CONFIG_CFG80211_DEFAULT_PS_VALUE=0
--CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd"
--CONFIG_CMDLINE_BOOL=y
--CONFIG_CONSISTENT_SIZE=0x00200000
--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_EP405 is not set
--CONFIG_EXTRA_TARGETS="uImage"
--CONFIG_FORCE_MAX_ZONEORDER=11
--# CONFIG_FSL_ULI1575 is not set
--# CONFIG_FSNOTIFY is not set
--CONFIG_GENERIC_ATOMIC64=y
--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_HARDIRQS_NO__DO_IRQ=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_DMA_API_DEBUG=y
--CONFIG_HAVE_DMA_ATTRS=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_OPROFILE=y
--CONFIG_HAVE_PERF_EVENTS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--# CONFIG_HCU4 is not set
--# CONFIG_HOTFOOT is not set
--CONFIG_HW_RANDOM=y
--CONFIG_HZ=250
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--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=y
--# CONFIG_IPIC is not set
--# CONFIG_IRQSTACKS is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_ISA_DMA_API=y
--# CONFIG_ISDN_CAPI is not set
--# CONFIG_ISDN_I4L is not set
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_KILAUEA=y
- # CONFIG_LEDS_GPIO is not set
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_OF=y
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_MAGICBOX=y
--# CONFIG_MAKALU is not set
--# CONFIG_MATH_EMULATION is not set
--CONFIG_MAX_ACTIVE_REGIONS=32
--# 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_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
-CONFIG_NLS=m
--CONFIG_NOT_COHERENT_CACHE=y
--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_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_BOOK3S_32 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_MMU_NOHASH_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_PPC_MPC106 is not set
--CONFIG_PPC_OF=y
--CONFIG_PPC_PCI_CHOICE=y
--# CONFIG_PPC_RTAS is not set
--CONFIG_PPC_UDBG_16550=y
--CONFIG_PPC_WERROR=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_SLUB=y
--CONFIG_SWIOTLB=y
--CONFIG_TASK_SIZE=0xc0000000
--# CONFIG_TREE_PREEMPT_RCU is not set
--CONFIG_TREE_RCU=y
-CONFIG_USB=m
-# CONFIG_USB_EHCI_HCD is not set
-CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=y
-CONFIG_USB_OHCI_HCD_PPC_OF=y
-CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
-CONFIG_USB_SUPPORT=y
-# CONFIG_USB_UHCI_HCD is not set
--# CONFIG_WALNUT is not set
--CONFIG_WORD_SIZE=32
--# CONFIG_XILINX_SYSACE is not set
--# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
diff --cc target/linux/ppc40x/patches/004-magicbox.patch
index 0f9e192,78653af..0000000
deleted file mode 100644,100644
--- a/target/linux/ppc40x/patches/004-magicbox.patch
+++ /dev/null
@@@ -1,440 -1,448 +1,0 @@@
----- /dev/null
--+++ b/arch/powerpc/boot/cuboot-magicbox.c
- @@ -0,0 +1,90 @@
-@@ -0,0 +1,98 @@
--+/*
--+ * Old U-boot compatibility for Magicbox boards
--+ *
--+ * Author: Imre Kaloz <kaloz@openwrt.org>
--+ * Gabor Juhos <juhosg@openwrt.org>
--+ *
--+ * 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)
-+static void fixup_perwe(void)
--+{
--+#define DCRN_CPC0_PCI_BASE 0xf9
- +#define CF_CS0_BASE 0xff100000
- +#define CF_CS1_BASE 0xff200000
--+
- + /* Turn on PerWE instead of PCIsomething */
-+ /* Turn on PerWE instead of PCIINT */
--+ mtdcr(DCRN_CPC0_PCI_BASE,
--+ mfdcr(DCRN_CPC0_PCI_BASE) | (0x80000000L >> 27));
-+
-+#undef DCRN_CPC0_PCI_BASE
-+}
-+
-+static void fixup_cf_card(void)
-+{
-+#define CF_CS0_BASE 0xff100000
-+#define CF_CS1_BASE 0xff200000
--+
--+ /* 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_CFGDATA, CF_CS0_BASE | EBC_BXCR_BS_1M |
-+ 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_CFGDATA, CF_CS1_BASE | EBC_BXCR_BS_1M |
-+ 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_perwe();
--+ 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,285 @@
--+/*
--+ * Device Tree Source for Magicbox boards
--+ *
--+ * Copyright 2008-2009 Imre Kaloz <kaloz@openwrt.org>
--+ * Copyright 2009 Gabor Juhos <juhosg@openwrt.org>
--+ *
--+ * 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>;
--+ partition0@0 {
--+ label = "linux";
--+ reg = <0x0 0x140000>;
--+ };
--+ partition1@120000 {
--+ label = "rootfs";
- + reg = <0x140000 0x680000>;
-+ reg = <0x140000 0x280000>;
--+ };
- + partition2@7c0000 {
-+ partition2@3c0000 {
--+ label = "u-boot";
- + reg = <0x7c0000 0x30000>;
-+ reg = <0x3c0000 0x30000>;
--+ read-only;
--+ };
--+ partition3@0 {
--+ label = "firmware";
- + reg = <0x0 0x7c0000>;
-+ reg = <0x0 0x3c0000>;
--+ };
--+ };
--+ };
--+
--+ 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-hotfoot.o: BOOTCFLAGS += -
-- $(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
--
--@@ -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-kilauea.c
--+ cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \
--+ cuboot-magicbox.c
-- src-boot := $(src-wlib) $(src-plat) empty.c
--
-- src-boot := $(addprefix $(obj)/, $(src-boot))
--@@ -194,6 +196,7 @@ image-$(CONFIG_EP405) += dtbImage.ep40
-- image-$(CONFIG_HOTFOOT) += cuImage.hotfoot
-- image-$(CONFIG_WALNUT) += treeImage.walnut
-- image-$(CONFIG_ACADIA) += cuImage.acadia
--+image-$(CONFIG_MAGICBOX) += cuImage.magicbox
--
-- # 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 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
--@@ -55,7 +55,8 @@ static char *board[] __initdata = {
-- "amcc,haleakala",
-- "amcc,kilauea",
-- "amcc,makalu",
--- "est,hotfoot"
--+ "est,hotfoot",
--+ "magicbox"
-- };
--
-- static int __init ppc40x_probe(void)
diff --cc target/linux/ppc40x/patches/005-openrb.patch
index a90fba8,638c81d..0000000
deleted file mode 100644,100644
--- a/target/linux/ppc40x/patches/005-openrb.patch
+++ /dev/null
@@@ -1,415 -1,449 +1,0 @@@
----- /dev/null
--+++ b/arch/powerpc/boot/cuboot-openrb.c
- @@ -0,0 +1,71 @@
-@@ -0,0 +1,94 @@
--+/*
--+ * Old U-boot compatibility for OpenRB boards
--+ *
--+ * Author: Gabor Juhos <juhosg@openwrt.org>
--+ * Imre Kaloz <kaloz@openwrt.org>
--+ *
--+ * 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)
-+static void fixup_perwe(void)
--+{
--+#define DCRN_CPC0_PCI_BASE 0xf9
- +#define CF_CS0_BASE 0xff100000
- +#define CF_CS1_BASE 0xff200000
--+
- + /* Turn on PerWE instead of PCIsomething */
-+ /* Turn on PerWE instead of PCIINT */
--+ mtdcr(DCRN_CPC0_PCI_BASE,
--+ mfdcr(DCRN_CPC0_PCI_BASE) | (0x80000000L >> 27));
-+
-+#undef DCRN_CPC0_PCI_BASE
-+}
-+
-+static void fixup_cf_card(void)
-+{
-+#define CF_CS0_BASE 0xff100000
-+#define CF_CS1_BASE 0xff200000
--+
--+ /* 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_CFGDATA, CF_CS0_BASE | EBC_BXCR_BS_1M |
-+ 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_CFGDATA, CF_CS1_BASE | EBC_BXCR_BS_1M |
-+ 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 fixup_isp116x(void)
-+{
-+#define ISP116X_CS_BASE 0xf0000000
-+
-+ /* PerCS3 (ISP1160's CS): base 0xf0000000, size 32MB, 16-bit, rw */
-+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B3CR);
-+ mtdcr(DCRN_EBC0_CFGDATA, ISP116X_CS_BASE | EBC_BXCR_BS_32M |
-+ EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
-+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B3AP);
-+ mtdcr(DCRN_EBC0_CFGDATA, 0x03016600);
-+
-+#undef ISP116X_CS_BASE
--+}
--+
--+static void openrb_fixups(void)
--+{
--+ ibm405ep_fixup_clocks(bd.bi_procfreq / 8);
--+ ibm4xx_sdram_fixup_memsize();
--+
-+ fixup_perwe();
--+ fixup_cf_card();
-+ fixup_isp116x();
--+
--+ 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,280 @@
-@@ -0,0 +1,291 @@
--+/*
--+ * Device Tree Source for OpenRB boards
--+ *
--+ * Copyright 2009 Gabor Juhos <juhosg@openwrt.org>
--+ * Copyright 2009 Imre Kaloz <kaloz@openwrt.org>
--+ *
--+ * 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 */
-+
-+ isp116x@f0000000 {
-+ compatible = "isp116x-hcd";
-+ oc_enable;
-+ int_act_high;
-+ int_edge_triggered;
-+ reg = <0x00000000 0xf0000000 0x00000002 /* data */
-+ 0x00000000 0xf1000000 0x00000002 /* addr */ >;
-+ interrupt-parent = <&UIC0>;
-+ interrupts = <0x1b 0x1 /* IRQ_TYPE_EDGE_RISING */ >;
-+ };
--+
--+ 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>;
--+ partition0@0 {
--+ label = "linux";
--+ reg = <0x0 0x140000>;
--+ };
--+ partition1@120000 {
--+ label = "rootfs";
--+ reg = <0x140000 0x680000>;
--+ };
--+ partition2@7c0000 {
--+ label = "u-boot";
--+ reg = <0x7c0000 0x30000>;
--+ read-only;
--+ };
--+ partition3@0 {
--+ label = "firmware";
--+ reg = <0x0 0x7c0000>;
--+ };
--+ };
--+ };
--+
--+ 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
--@@ -44,6 +44,7 @@ $(obj)/cuboot-taishan.o: BOOTCFLAGS += -
-- $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
-- $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
-- $(obj)/cuboot-magicbox.o: BOOTCFLAGS += -mcpu=405
--+$(obj)/cuboot-openrb.o: BOOTCFLAGS += -mcpu=405
-- $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
-- $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
--
--@@ -78,7 +79,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82
-- cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
-- virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
-- cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \
--- cuboot-magicbox.c
--+ cuboot-magicbox.c cuboot-openrb.c
-- src-boot := $(src-wlib) $(src-plat) empty.c
--
-- src-boot := $(addprefix $(obj)/, $(src-boot))
--@@ -197,6 +198,7 @@ image-$(CONFIG_HOTFOOT) += cuImage.hot
-- 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
--@@ -70,6 +70,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
--@@ -56,7 +56,8 @@ static char *board[] __initdata = {
-- "amcc,kilauea",
-- "amcc,makalu",
-- "est,hotfoot",
--- "magicbox"
--+ "magicbox",
--+ "openrb"
-- };
--
-- static int __init ppc40x_probe(void)

Branches:
backfire
history
master
release_2010-11-17
release_2010-12-14
release_2011-02-23
release_2011-05-28
release_2011-08-27
release_2011-11-13
release_2012-03-18
release_2012-04-09
release_2012-10-11
uclibc_nptl



interactive