diff options
author | Felix Fietkau <nbd@openwrt.org> | 2007-06-28 20:42:21 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2007-06-28 20:42:21 +0000 |
commit | 1b4fc61eea3e3525f3de43e4bcc2aeece9bad0d9 (patch) | |
tree | 9d4f9902345dcb842da67213e184f100aa5a2f06 /target/linux/magicbox-2.6/patches-2.6.22/100-cf_slot.patch | |
parent | 83a487c4123bbc1a8da408648e5a567da52b6d6f (diff) | |
download | upstream-1b4fc61eea3e3525f3de43e4bcc2aeece9bad0d9.tar.gz upstream-1b4fc61eea3e3525f3de43e4bcc2aeece9bad0d9.tar.bz2 upstream-1b4fc61eea3e3525f3de43e4bcc2aeece9bad0d9.zip |
update magicbox target to 2.6.22-rc6, select gcc 4.2.0 as default for this target (4.1.2 segfaults at compile time)
SVN-Revision: 7762
Diffstat (limited to 'target/linux/magicbox-2.6/patches-2.6.22/100-cf_slot.patch')
-rw-r--r-- | target/linux/magicbox-2.6/patches-2.6.22/100-cf_slot.patch | 53 |
1 files changed, 53 insertions, 0 deletions
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 new file mode 100644 index 0000000000..3a5dde7709 --- /dev/null +++ b/target/linux/magicbox-2.6/patches-2.6.22/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 |