* Upgrade Magicbox to 2.6.23 * Rename directories

SVN-Revision: 10286

diff --git a/target/linux/magicbox/Makefile b/target/linux/magicbox/Makefile
index 15f035a82e25c0a846ed801b1a799d2390cee102..b7839b13d67cbccbf011292b6f51ce4c3321350d 100644 (file)
--- a/target/linux/magicbox/Makefile
+++ b/target/linux/magicbox/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 ARCH:=powerpc
 BOARD:=magicbox
 BOARDNAME:=Magicbox
-FEATURES:=squashfs jffs2
+FEATURES:=squashfs jffs2 pci
 
-LINUX_VERSION:=2.6.22.4
+LINUX_VERSION:=2.6.23.14
 LINUX_KARCH:=ppc
 
 include $(INCLUDE_DIR)/target.mk

diff --git a/target/linux/magicbox/config-2.6.22 b/target/linux/magicbox/config-2.6.22
deleted file mode 100644 (file)
index 32b33a9..0000000
--- a/target/linux/magicbox/config-2.6.22
+++ /dev/null
@@ -1,173 +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_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 is not set
-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/config-default b/target/linux/magicbox/config-default
new file mode 100644 (file)
index 0000000..895742a
--- /dev/null
+++ b/target/linux/magicbox/config-default
@@ -0,0 +1,176 @@
+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_EDAC 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_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_USER_NS 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
+# CONFIG_XILINX_SYSACE is not set

diff --git a/target/linux/magicbox/files/arch/ppc/platforms/4xx/magicbox.c b/target/linux/magicbox/files/arch/ppc/platforms/4xx/magicbox.c
index 18c67ab5f68dfba9250dc6fefee96e1147fdb105..e6df7f6408d34b56516626dd3c3b212c99af0c26 100644 (file)
--- a/target/linux/magicbox/files/arch/ppc/platforms/4xx/magicbox.c
+++ b/target/linux/magicbox/files/arch/ppc/platforms/4xx/magicbox.c
@@ -23,6 +23,7 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>

diff --git a/target/linux/magicbox/patches-2.6.22/001-magicbox_support.patch b/target/linux/magicbox/patches-2.6.22/001-magicbox_support.patch
deleted file mode 100644 (file)
index de7e86b..0000000
--- a/target/linux/magicbox/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/patches-2.6.22/100-cf_slot.patch b/target/linux/magicbox/patches-2.6.22/100-cf_slot.patch
deleted file mode 100644 (file)
index 3a5dde7..0000000
--- a/target/linux/magicbox/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

diff --git a/target/linux/magicbox/patches/001-magicbox_support.patch b/target/linux/magicbox/patches/001-magicbox_support.patch
new file mode 100644 (file)
index 0000000..de7e86b
--- /dev/null
+++ b/target/linux/magicbox/patches/001-magicbox_support.patch
@@ -0,0 +1,71 @@
+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/patches/100-cf_slot.patch b/target/linux/magicbox/patches/100-cf_slot.patch
new file mode 100644 (file)
index 0000000..3a5dde7
--- /dev/null
+++ b/target/linux/magicbox/patches/100-cf_slot.patch
@@ -0,0 +1,53 @@
+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