strip the kernel version suffix from target directories, except for brcm-2.4 (the -2.4 will be included in the board name here). CONFIG_LINUX_<ver>_<board> becomes CONFIG_TARGET_<board>, same for profiles.

SVN-Revision: 8653

8 files changed, 0 insertions, 851 deletions

diff --git a/target/linux/magicbox-2.6/Makefile b/target/linux/magicbox-2.6/Makefile
deleted file mode 100644
index e003330f05..0000000000
--- a/target/linux/magicbox-2.6/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=powerpc
-BOARD:=magicbox
-BOARDNAME:=Magicbox
-FEATURES:=squashfs jffs2
-
-LINUX_VERSION:=2.6.22.4
-
-include $(INCLUDE_DIR)/kernel-build.mk
-
-# include the profiles
--include profiles/*.mk
-
-$(eval $(call BuildKernel))
diff --git a/target/linux/magicbox-2.6/config/default b/target/linux/magicbox-2.6/config/default
deleted file mode 100644
index 3e36514e94..0000000000
--- a/target/linux/magicbox-2.6/config/default
+++ /dev/null
@@ -1,174 +0,0 @@
-CONFIG_405EP=y
-CONFIG_40x=y
-# CONFIG_44x is not set
-CONFIG_4xx=y
-# CONFIG_6xx is not set
-# CONFIG_8139TOO is not set
-# CONFIG_8xx is not set
-# CONFIG_ADVANCED_OPTIONS is not set
-# CONFIG_AGP is not set
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_ATM_DRIVERS is not set
-# CONFIG_B44 is not set
-CONFIG_BASE_SMALL=0
-CONFIG_BIOS_FIXUP=y
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_IDE=m
-# CONFIG_BLK_DEV_IDECD is not set
-CONFIG_BLK_DEV_IDEDISK=m
-# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_MAGICBOX_IDE=y
-# CONFIG_BOOKE_WDT is not set
-CONFIG_BOOT_LOAD=0x00400000
-# CONFIG_BT is not set
-# CONFIG_BUBINGA is not set
-CONFIG_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CONSISTENT_SIZE=0x00200000
-CONFIG_CONSISTENT_START=0xff100000
-# CONFIG_CPCI405 is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_E200 is not set
-# CONFIG_E500 is not set
-# CONFIG_EP405 is not set
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_NVRAM=y
-# CONFIG_GEN_RTC is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_HIGHMEM_START=0xfe000000
-CONFIG_HW_RANDOM=y
-CONFIG_HZ=100
-CONFIG_HZ_100=y
-# CONFIG_HZ_250 is not set
-# CONFIG_I2C is not set
-CONFIG_IBM_EMAC=y
-# CONFIG_IBM_EMAC_DEBUG is not set
-# CONFIG_IBM_EMAC_PHY_RX_CLK_FIX is not set
-CONFIG_IBM_EMAC_POLL_WEIGHT=32
-CONFIG_IBM_EMAC_RXB=64
-CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
-CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0
-CONFIG_IBM_EMAC_TXB=8
-CONFIG_IBM_OCP=y
-CONFIG_IDE=m
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_IDE_ARM is not set
-CONFIG_IDE_GENERIC=m
-CONFIG_IDE_MAX_HWIFS=4
-# CONFIG_IDE_PROC_FS is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_ISA_DMA_API=y
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_KERNEL_START=0xc0000000
-# CONFIG_KEXEC is not set
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-CONFIG_LOWMEM_SIZE=0x30000000
-# CONFIG_MACINTOSH_DRIVERS is not set
-CONFIG_MAGICBOX=y
-CONFIG_MATH_EMULATION=y
-CONFIG_MINI_FO=y
-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_GEOMETRY is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OTP is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PHRAM is not set
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-CONFIG_MTD_PHYSMAP_LEN=0
-CONFIG_MTD_PHYSMAP_START=0xffc00000
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NETDEV_1000=y
-CONFIG_NOT_COHERENT_CACHE=y
-# CONFIG_NVRAM is not set
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PC_KEYBOARD is not set
-# CONFIG_PM is not set
-CONFIG_PPC=y
-CONFIG_PPC32=y
-CONFIG_PPC4xx_DMA=y
-CONFIG_PPC4xx_EDMA=y
-CONFIG_PPC_GEN550=y
-# CONFIG_PPC_I8259 is not set
-CONFIG_PPC_INDIRECT_PCI=y
-CONFIG_PPC_OCP=y
-# CONFIG_REDWOOD_5 is not set
-# CONFIG_REDWOOD_6 is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SECCOMP is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SERIAL_TEXT_DEBUG is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOUND is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SYCAMORE is not set
-CONFIG_TASK_SIZE=0x80000000
-CONFIG_UART0_TTYS0=y
-# CONFIG_UART0_TTYS1 is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USB is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_WALNUT is not set
-CONFIG_WANT_EARLY_SERIAL=y
-# CONFIG_WINDFARM is not set
-# CONFIG_XILINX_ML300 is not set
-# CONFIG_XILINX_ML403 is not set
diff --git a/target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx/magicbox.c b/target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx/magicbox.c
deleted file mode 100644
index 18c67ab5f6..0000000000
--- a/target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx/magicbox.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Support for IBM PPC 405EP-based MagicBox board 
- * Copyright (C) 2006  Karol Lewandowski
- *
- * Heavily based on bubinga.c
- *
- * Author: SAW (IBM), derived from walnut.c.
- *         Maintained by MontaVista Software <source@mvista.com>
- *
- * 2003 (c) MontaVista Softare Inc.  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.
- */
-
-#include <linux/init.h>
-#include <linux/smp.h>
-#include <linux/threads.h>
-#include <linux/param.h>
-#include <linux/string.h>
-#include <linux/blkdev.h>
-#include <linux/pci.h>
-#include <linux/tty.h>
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-
-#include <asm/system.h>
-#include <asm/pci-bridge.h>
-#include <asm/processor.h>
-#include <asm/machdep.h>
-#include <asm/page.h>
-#include <asm/time.h>
-#include <asm/io.h>
-#include <asm/kgdb.h>
-#include <asm/ocp.h>
-#include <asm/ibm_ocp_pci.h>
-
-#include <platforms/4xx/ibm405ep.h>
-
-#undef DEBUG
-
-#ifdef DEBUG
-#define DBG(x...) printk(x)
-#else
-#define DBG(x...)
-#endif
-
-extern bd_t __res;
-
-/* Some IRQs unique to the board
- * Used by the generic 405 PCI setup functions in ppc4xx_pci.c
- */
-int __init
-ppc405_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
-{
-	static char pci_irq_table[][4] =
-	    /*
-	     *      PCI IDSEL/INTPIN->INTLINE
-	     *      A       B       C       D
-	     */
-	{
-		{28, 28, 28, 28},	/* IDSEL 1 - PCI slot 1 */
-		{29, 29, 29, 29},	/* IDSEL 2 - PCI slot 2 */
-		{30, 30, 30, 30},	/* IDSEL 3 - PCI slot 3 */
-		{31, 31, 31, 31},	/* IDSEL 4 - PCI slot 4 */
-	};
-
-	const long min_idsel = 1, max_idsel = 4, irqs_per_slot = 4;
-	return PCI_IRQ_TABLE_LOOKUP;
-};
-
-/* The serial clock for the chip is an internal clock determined by
- * different clock speeds/dividers.
- * Calculate the proper input baud rate and setup the serial driver.
- */
-static void __init
-magicbox_early_serial_map(void)
-{
-	u32 uart_div;
-	int uart_clock;
-	struct uart_port port;
-
-         /* Calculate the serial clock input frequency
-          *
-          * The base baud is the PLL OUTA (provided in the board info
-          * structure) divided by the external UART Divisor, divided
-          * by 16.
-          */
-	uart_div = (mfdcr(DCRN_CPC0_UCR_BASE) & DCRN_CPC0_UCR_U0DIV);
-	uart_clock = __res.bi_procfreq / uart_div;
-
-	/* Setup serial port access */
-	memset(&port, 0, sizeof(port));
-	port.membase = (void*)ACTING_UART0_IO_BASE;
-	port.irq = ACTING_UART0_INT;
-	port.uartclk = uart_clock;
-	port.regshift = 0;
-	port.iotype = UPIO_MEM;
-	port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
-	port.line = 0;
-
-	if (early_serial_setup(&port) != 0) {
-		printk("Early serial init of port 0 failed\n");
-	}
-
-	port.membase = (void*)ACTING_UART1_IO_BASE;
-	port.irq = ACTING_UART1_INT;
-	port.line = 1;
-
-	if (early_serial_setup(&port) != 0) {
-		printk("Early serial init of port 1 failed\n");
-	}
-}
-
-void __init
-bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
-{
-#ifdef CONFIG_PCI
-
-	unsigned int bar_response, bar;
-	/*
-	 * Expected PCI mapping:
-	 *
-	 *  PLB addr             PCI memory addr
-	 *  ---------------------       ---------------------
-	 *  0000'0000 - 7fff'ffff <---  0000'0000 - 7fff'ffff
-	 *  8000'0000 - Bfff'ffff --->  8000'0000 - Bfff'ffff
-	 *
-	 *  PLB addr             PCI io addr
-	 *  ---------------------       ---------------------
-	 *  e800'0000 - e800'ffff --->  0000'0000 - 0001'0000
-	 *
-	 * The following code is simplified by assuming that the bootrom
-	 * has been well behaved in following this mapping.
-	 */
-
-#ifdef DEBUG
-	int i;
-
-	printk("ioremap PCLIO_BASE = 0x%x\n", pcip);
-	printk("PCI bridge regs before fixup \n");
-	for (i = 0; i <= 3; i++) {
-		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].ma)));
-		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].la)));
-		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].pcila)));
-		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].pciha)));
-	}
-	printk(" ptm1ms\t0x%x\n", in_le32(&(pcip->ptm1ms)));
-	printk(" ptm1la\t0x%x\n", in_le32(&(pcip->ptm1la)));
-	printk(" ptm2ms\t0x%x\n", in_le32(&(pcip->ptm2ms)));
-	printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la)));
-
-#endif
-
-	/* added for IBM boot rom version 1.15 bios bar changes  -AK */
-
-	/* Disable region first */
-	out_le32((void *) &(pcip->pmm[0].ma), 0x00000000);
-	/* PLB starting addr, PCI: 0x80000000 */
-	out_le32((void *) &(pcip->pmm[0].la), 0x80000000);
-	/* PCI start addr, 0x80000000 */
-	out_le32((void *) &(pcip->pmm[0].pcila), PPC405_PCI_MEM_BASE);
-	/* 512MB range of PLB to PCI */
-	out_le32((void *) &(pcip->pmm[0].pciha), 0x00000000);
-	/* Enable no pre-fetch, enable region */
-	out_le32((void *) &(pcip->pmm[0].ma), ((0xffffffff -
-						(PPC405_PCI_UPPER_MEM -
-						 PPC405_PCI_MEM_BASE)) | 0x01));
-
-	/* Disable region one */
-	out_le32((void *) &(pcip->pmm[1].ma), 0x00000000);
-	out_le32((void *) &(pcip->pmm[1].la), 0x00000000);
-	out_le32((void *) &(pcip->pmm[1].pcila), 0x00000000);
-	out_le32((void *) &(pcip->pmm[1].pciha), 0x00000000);
-	out_le32((void *) &(pcip->pmm[1].ma), 0x00000000);
-	out_le32((void *) &(pcip->ptm1ms), 0x00000001);
-
-	/* Disable region two */
-	out_le32((void *) &(pcip->pmm[2].ma), 0x00000000);
-	out_le32((void *) &(pcip->pmm[2].la), 0x00000000);
-	out_le32((void *) &(pcip->pmm[2].pcila), 0x00000000);
-	out_le32((void *) &(pcip->pmm[2].pciha), 0x00000000);
-	out_le32((void *) &(pcip->pmm[2].ma), 0x00000000);
-	out_le32((void *) &(pcip->ptm2ms), 0x00000000);
-	out_le32((void *) &(pcip->ptm2la), 0x00000000);
-
-	/* Zero config bars */
-	for (bar = PCI_BASE_ADDRESS_1; bar <= PCI_BASE_ADDRESS_2; bar += 4) {
-		early_write_config_dword(hose, hose->first_busno,
-					 PCI_FUNC(hose->first_busno), bar,
-					 0x00000000);
-		early_read_config_dword(hose, hose->first_busno,
-					PCI_FUNC(hose->first_busno), bar,
-					&bar_response);
-		DBG("BUS %d, device %d, Function %d bar 0x%8.8x is 0x%8.8x\n",
-		    hose->first_busno, PCI_SLOT(hose->first_busno),
-		    PCI_FUNC(hose->first_busno), bar, bar_response);
-	}
-	/* end workaround */
-
-#ifdef DEBUG
-	printk("PCI bridge regs after fixup \n");
-	for (i = 0; i <= 3; i++) {
-		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].ma)));
-		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].la)));
-		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].pcila)));
-		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].pciha)));
-	}
-	printk(" ptm1ms\t0x%x\n", in_le32(&(pcip->ptm1ms)));
-	printk(" ptm1la\t0x%x\n", in_le32(&(pcip->ptm1la)));
-	printk(" ptm2ms\t0x%x\n", in_le32(&(pcip->ptm2ms)));
-	printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la)));
-
-#endif
-#endif
-}
-
-static struct resource magicbox_flash_resource = {
-	.start = 0xffc00000,
-	.end   = 0xffffffffULL,
-	.flags = IORESOURCE_MEM,
-};
-
-static struct mtd_partition magicbox_flash_parts[] = {
-	{
-		.name = "linux",
-		.offset = 0x0,
-		.size = 0x3c0000,
-	},
-	{
-		.name = "rootfs",
-		.offset = 0x100000,
-		.size = 0x2c0000,
-	}
-};
-
-static struct physmap_flash_data magicbox_flash_data = {
-	.width		= 2,
-	.parts		= magicbox_flash_parts,
-	.nr_parts	= ARRAY_SIZE(magicbox_flash_parts),
-};
-
-static struct platform_device magicbox_flash_device = {
-	.name		= "physmap-flash",
-	.id		= 0,
-	.dev = {
-			.platform_data = &magicbox_flash_data,
-		},
-	.num_resources	= 1,
-	.resource	= &magicbox_flash_resource,
-};
-
-static int magicbox_setup_flash(void)
-{
-	platform_device_register(&magicbox_flash_device);
-
-	return 0;
-};
-
-arch_initcall (magicbox_setup_flash);
-
-void __init
-magicbox_setup_arch(void)
-{
-	ppc4xx_setup_arch();
-
-	ibm_ocp_set_emac(0, 1);
-
-	magicbox_early_serial_map();
-
-	/* Identify the system */
-	printk("MagicBox port (C) 2005 Karol Lewandowski <kl@jasmine.eu.org>\n");
-}
-
-void __init
-magicbox_map_io(void)
-{
-	ppc4xx_map_io();
-}
-
-void __init
-platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-	      unsigned long r6, unsigned long r7)
-{
-	ppc4xx_init(r3, r4, r5, r6, r7);
-
-	ppc_md.setup_arch = magicbox_setup_arch;
-	ppc_md.setup_io_mappings = magicbox_map_io;
-
-#ifdef CONFIG_KGDB
-	ppc_md.early_serial_map = bubinga_early_serial_map;
-#endif
-}
-
diff --git a/target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx/magicbox.h b/target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx/magicbox.h
deleted file mode 100644
index 50b8d411b2..0000000000
--- a/target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx/magicbox.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Support for IBM PPC 405EP-based MagicBox board
- *
- * Heavily based on bubinga.h
- *
- *
- * Author: SAW (IBM), derived from walnut.h.
- *         Maintained by MontaVista Software <source@mvista.com>
- *
- * 2003 (c) MontaVista Softare Inc.  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.
- */
-
-#ifdef __KERNEL__
-#ifndef __MAGICBOX_H__
-#define __MAGICBOX_H__
-
-#include <platforms/4xx/ibm405ep.h>
-#include <asm/ppcboot.h>
-
-/* Memory map for the "MagicBox" 405EP evaluation board -- generic 4xx. */
-
-/* The UART clock is based off an internal clock -
- * define BASE_BAUD based on the internal clock and divider(s).
- * Since BASE_BAUD must be a constant, we will initialize it
- * using clock/divider values which OpenBIOS initializes
- * for typical configurations at various CPU speeds.
- * The base baud is calculated as (FWDA / EXT UART DIV / 16)
- */
-#define BASE_BAUD		0
-
-/* Flash */
-#define PPC40x_FPGA_BASE	0xF0300000
-#define PPC40x_FPGA_REG_OFFS	1	/* offset to flash map reg */
-#define PPC40x_FLASH_ONBD_N(x)	(x & 0x02)
-#define PPC40x_FLASH_SRAM_SEL(x) (x & 0x01)
-#define PPC40x_FLASH_LOW	0xFFF00000
-#define PPC40x_FLASH_HIGH	0xFFF80000
-#define PPC40x_FLASH_SIZE	0x80000
-
-#define PPC4xx_MACHINE_NAME	"MagicBox"
-
-#endif /* __MAGICBOX_H__ */
-#endif /* __KERNEL__ */
diff --git a/target/linux/magicbox-2.6/files/drivers/ide/ppc/magicbox_ide.c b/target/linux/magicbox-2.6/files/drivers/ide/ppc/magicbox_ide.c
deleted file mode 100644
index 2e29e8380a..0000000000
--- a/target/linux/magicbox-2.6/files/drivers/ide/ppc/magicbox_ide.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Driver for MagicBox 2.0 onboard CompactFlash adapter.
- * Written by Wojtek Kaniewski <wojtekka@toxygen.net>
- *
- * GNU General Public License.
- */
-
-#include <linux/version.h>
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <linux/blkdev.h>
-#include <linux/hdreg.h>
-#include <linux/ide.h>
-#include <linux/delay.h>
-#include <linux/platform_device.h>
-
-
-#define UIC0_PR 0xc4
-#define UIC0_TR 0xc5
-#define IRQ 25
-
-static int ide_offsets[IDE_NR_PORTS] = {0, 2, 4, 6, 8, 10, 12, 14, -1, -1};
-
-static u8 magicbox_ide_inb (unsigned long port)
-{
-	return (u8) (readw((void __iomem *) port) >> 8) & 255;
-}
-
-static u16 magicbox_ide_inw (unsigned long port)
-{
-	return (u16) readw((void __iomem *) port);
-}
-
-static void magicbox_ide_insw (unsigned long port, void *addr, u32 count)
-{
-	u16 *ptr;
-
-	for (ptr = addr; count--; ptr++)
-		*ptr = readw((void __iomem *) port);
-}
-
-static u32 magicbox_ide_inl (unsigned long port)
-{
-	return (u32) readl((void __iomem *) port);
-}
-
-static void magicbox_ide_insl (unsigned long port, void *addr, u32 count)
-{
-	u32 *ptr;
-
-	for (ptr = addr; count--; ptr++)
-		*ptr = readl((void __iomem *) port);
-}
-
-static void magicbox_ide_outb (u8 value, unsigned long port)
-{
-	writew(value << 8, (void __iomem *) port);
-}
-
-static void magicbox_ide_outbsync (ide_drive_t *drive, u8 value, unsigned long port)
-{
-	writew(value << 8, (void __iomem *) port);
-}
-
-static void magicbox_ide_outw (u16 value, unsigned long port)
-{
-	writew(value, (void __iomem *) port);
-}
-
-static void magicbox_ide_outsw (unsigned long port, void *addr, u32 count)
-{
-	u16 *ptr;
-
-	for (ptr = addr; count--; ptr++)
-		writew(*ptr, (void __iomem *) port);
-}
-
-static void magicbox_ide_outl (u32 value, unsigned long port)
-{
-	writel(value, (void __iomem *) port);
-}
-
-static 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 __init ide_magicbox_register(unsigned long addr,
-					 unsigned long caddr, int irq)
-{
-	hw_regs_t hw;
-	ide_hwif_t *hwif;
-
-  	memset(&hw, 0, sizeof(hw));
-	ide_setup_ports(&hw, addr, ide_offsets, caddr + 12, 0, NULL,irq);
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
-	if (ide_register_hw(&hw, &hwif) != -1)
-#else
-	if (ide_register_hw(&hw, 1, &hwif) != -1)
-#endif
-	{
-		printk(KERN_NOTICE "magicbox-ide: Registered IDE-CF driver\n");
-		hwif->mmio = 2;
-		hwif->drives[0].unmask = 1;
-		hwif->OUTB = magicbox_ide_outb;
-		hwif->OUTBSYNC = magicbox_ide_outbsync;
-		hwif->OUTW = magicbox_ide_outw;
-		hwif->OUTSW = magicbox_ide_outsw;
-		hwif->OUTSL = magicbox_ide_outsl;
-		hwif->INB = magicbox_ide_inb;
-		hwif->INW = magicbox_ide_inw;
-		hwif->INSW = magicbox_ide_insw;
-		hwif->INSL = magicbox_ide_insl;
-	}
-}
-
-void __init ide_magicbox_init(void)
-{
-	volatile u16 *addr;
-	volatile u16 *caddr;
-
-	/* 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_EBC_BASE, 1);
-	mtdcr(DCRN_EBC_BASE + 1, 0xff11a000);
-	mtdcr(DCRN_EBC_BASE, 0x11);
-	mtdcr(DCRN_EBC_BASE + 1, 0x080bd800);
-
-	/* PerCS2 (CF's CS1): base 0xff200000, 16-bit, rw */
-	mtdcr(DCRN_EBC_BASE, 2);
-	mtdcr(DCRN_EBC_BASE + 1, 0xff21a000);
-	mtdcr(DCRN_EBC_BASE, 0x12);
-	mtdcr(DCRN_EBC_BASE + 1, 0x080bd800);
-
-	/* Remap physical address space */
-	addr = ioremap_nocache(0xff100000, 4096);
-	caddr = ioremap_nocache(0xff200000, 4096);
-
-	/* Set interrupt to low-to-high-edge-triggered */
-	mtdcr(UIC0_TR, mfdcr(UIC0_TR) & ~(0x80000000L >> IRQ));
-	mtdcr(UIC0_PR, mfdcr(UIC0_PR) | (0x80000000L >> IRQ));
-
-	ide_magicbox_register((unsigned long)addr, (unsigned long)caddr, IRQ);
-}
-
diff --git a/target/linux/magicbox-2.6/image/Makefile b/target/linux/magicbox-2.6/image/Makefile
deleted file mode 100644
index f99590f1ea..0000000000
--- a/target/linux/magicbox-2.6/image/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-define Image/Prepare
-	cp $(LINUX_DIR)/arch/ppc/boot/images/uImage $(KDIR)/uImage
-endef
-
-define Image/BuildKernel
-	cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-uImage
-endef
-
-define Image/Build
-	$(call Image/Build/$(1),$(1))
-endef
-
-define Image/Build/jffs2-64k
-	( \
-		dd if=$(KDIR)/uImage bs=1024k conv=sync; \
-		dd if=$(KDIR)/root.$(1) bs=65536 conv=sync; \
-	) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img
-endef
-
-define Image/Build/squashfs
-	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-	( \
-		dd if=$(LINUX_DIR)/arch/ppc/boot/images/uImage bs=1024k conv=sync; \
-		dd if=$(KDIR)/root.$(1) bs=65536 conv=sync; \
-	) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/magicbox-2.6/patches-2.6.22/001-magicbox_support.patch b/target/linux/magicbox-2.6/patches-2.6.22/001-magicbox_support.patch
deleted file mode 100644
index de7e86be80..0000000000
--- a/target/linux/magicbox-2.6/patches-2.6.22/001-magicbox_support.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Index: linux-2.6.22-rc6/arch/ppc/platforms/4xx/Kconfig
-===================================================================
---- linux-2.6.22-rc6.orig/arch/ppc/platforms/4xx/Kconfig	2007-06-28 08:23:13.508980416 +0200
-+++ linux-2.6.22-rc6/arch/ppc/platforms/4xx/Kconfig	2007-06-28 08:23:15.637656808 +0200
-@@ -53,6 +53,12 @@
- 	help
- 	  This option enables support for the IBM PPC405GP evaluation board.
- 
-+config MAGICBOX
-+	bool "MagicBox"
-+	select WANT_EARLY_SERIAL
-+	help
-+	  This option enables support for the IBM PPC405EP evaluation board.
-+
- config XILINX_ML300
- 	bool "Xilinx-ML300"
- 	select XILINX_VIRTEX_II_PRO
-@@ -184,7 +190,7 @@
- 
- config IBM_OCP
- 	bool
--	depends on ASH || BAMBOO || BUBINGA || CPCI405 || EBONY || EP405 || LUAN || YUCCA || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || TAISHAN || WALNUT
-+	depends on ASH || BAMBOO || BUBINGA || CPCI405 || EBONY || EP405 || LUAN || YUCCA || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || TAISHAN || WALNUT || MAGICBOX
- 	default y
- 
- config IBM_EMAC4
-@@ -194,7 +200,7 @@
- 
- config BIOS_FIXUP
- 	bool
--	depends on BUBINGA || EP405 || SYCAMORE || WALNUT || CPCI405
-+	depends on BUBINGA || EP405 || SYCAMORE || WALNUT || CPCI405 || MAGICBOX
- 	default y
- 
- # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
-@@ -205,7 +211,7 @@
- 
- config 405EP
- 	bool
--	depends on BUBINGA
-+	depends on BUBINGA || MAGICBOX
- 	default y
- 
- config 405GP
-Index: linux-2.6.22-rc6/arch/ppc/platforms/4xx/Makefile
-===================================================================
---- linux-2.6.22-rc6.orig/arch/ppc/platforms/4xx/Makefile	2007-06-28 08:23:13.516979200 +0200
-+++ linux-2.6.22-rc6/arch/ppc/platforms/4xx/Makefile	2007-06-28 08:23:15.637656808 +0200
-@@ -14,6 +14,7 @@
- obj-$(CONFIG_SYCAMORE)		+= sycamore.o
- obj-$(CONFIG_TAISHAN)		+= taishan.o
- obj-$(CONFIG_WALNUT)		+= walnut.o
-+obj-$(CONFIG_MAGICBOX)		+= magicbox.o
- obj-$(CONFIG_XILINX_ML300)	+= xilinx_ml300.o
- obj-$(CONFIG_XILINX_ML403)	+= xilinx_ml403.o
- 
-Index: linux-2.6.22-rc6/include/asm-ppc/ibm4xx.h
-===================================================================
---- linux-2.6.22-rc6.orig/include/asm-ppc/ibm4xx.h	2007-06-28 08:23:13.526977680 +0200
-+++ linux-2.6.22-rc6/include/asm-ppc/ibm4xx.h	2007-06-28 08:23:15.637656808 +0200
-@@ -19,6 +19,10 @@
- 
- #ifdef CONFIG_40x
- 
-+#if defined(CONFIG_MAGICBOX)
-+#include <platforms/4xx/magicbox.h>
-+#endif
-+
- #if defined(CONFIG_BUBINGA)
- #include <platforms/4xx/bubinga.h>
- #endif
diff --git a/target/linux/magicbox-2.6/patches-2.6.22/100-cf_slot.patch b/target/linux/magicbox-2.6/patches-2.6.22/100-cf_slot.patch
deleted file mode 100644
index 3a5dde7709..0000000000
--- a/target/linux/magicbox-2.6/patches-2.6.22/100-cf_slot.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: linux-2.6.22-rc6/drivers/ide/ide.c
-===================================================================
---- linux-2.6.22-rc6.orig/drivers/ide/ide.c	2007-06-28 08:23:49.463514496 +0200
-+++ linux-2.6.22-rc6/drivers/ide/ide.c	2007-06-28 08:23:54.658724704 +0200
-@@ -1604,6 +1604,7 @@
- extern void __init pnpide_init(void);
- extern void __exit pnpide_exit(void);
- extern void __init h8300_ide_init(void);
-+extern void __init ide_magicbox_init(void);
- 
- /*
-  * probe_for_hwifs() finds/initializes "known" IDE interfaces
-@@ -1668,6 +1669,9 @@
- #ifdef CONFIG_H8300
- 	h8300_ide_init();
- #endif
-+#ifdef CONFIG_BLK_DEV_MAGICBOX_IDE
-+	ide_magicbox_init();
-+#endif
- }
- 
- /*
-Index: linux-2.6.22-rc6/drivers/ide/Kconfig
-===================================================================
---- linux-2.6.22-rc6.orig/drivers/ide/Kconfig	2007-06-28 08:23:49.470513432 +0200
-+++ linux-2.6.22-rc6/drivers/ide/Kconfig	2007-06-28 08:23:54.658724704 +0200
-@@ -946,6 +946,14 @@
- 
- 	  If unsure, say N.
- 
-+config BLK_DEV_MAGICBOX_IDE
-+	bool "MagicBox 2.0 CF IDE support"
-+	depends on 4xx && IDE
-+	help
-+	  This option provides support for IDE on MagicBox 2.0 boards.
-+
-+	  If unsure, say N.
-+
- choice
- 	prompt "Type of MPC8xx IDE interface"
- 	depends on BLK_DEV_MPC8xx_IDE
-Index: linux-2.6.22-rc6/drivers/ide/Makefile
-===================================================================
---- linux-2.6.22-rc6.orig/drivers/ide/Makefile	2007-06-28 08:23:49.478512216 +0200
-+++ linux-2.6.22-rc6/drivers/ide/Makefile	2007-06-28 08:23:54.659724552 +0200
-@@ -37,6 +37,7 @@
- # built-in only drivers from ppc/
- ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE)	+= ppc/mpc8xx.o
- ide-core-$(CONFIG_BLK_DEV_IDE_PMAC)	+= ppc/pmac.o
-+ide-core-$(CONFIG_BLK_DEV_MAGICBOX_IDE)	+= ppc/magicbox_ide.o
- 
- # built-in only drivers from h8300/
- ide-core-$(CONFIG_H8300)		+= h8300/ide-h8300.o