From 9d127a9846e26f2d6d0b289fcfd0395483aecaff Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Sun, 27 Jan 2008 21:20:06 +0000 Subject: [PATCH] * Upgrade Magicbox to 2.6.23 * Rename directories SVN-Revision: 10286 --- target/linux/magicbox/Makefile | 4 ++-- target/linux/magicbox/{config-2.6.22 => config-default} | 5 ++++- .../linux/magicbox/files/arch/ppc/platforms/4xx/magicbox.c | 1 + .../{patches-2.6.22 => patches}/001-magicbox_support.patch | 0 .../magicbox/{patches-2.6.22 => patches}/100-cf_slot.patch | 0 5 files changed, 7 insertions(+), 3 deletions(-) rename target/linux/magicbox/{config-2.6.22 => config-default} (97%) rename target/linux/magicbox/{patches-2.6.22 => patches}/001-magicbox_support.patch (100%) rename target/linux/magicbox/{patches-2.6.22 => patches}/100-cf_slot.patch (100%) diff --git a/target/linux/magicbox/Makefile b/target/linux/magicbox/Makefile index 15f035a82e..b7839b13d6 100644 --- 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-default similarity index 97% rename from target/linux/magicbox/config-2.6.22 rename to target/linux/magicbox/config-default index 32b33a9792..895742a4fb 100644 --- a/target/linux/magicbox/config-2.6.22 +++ b/target/linux/magicbox/config-default @@ -37,6 +37,7 @@ CONFIG_CONSISTENT_START=0xff100000 # 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 @@ -75,7 +76,7 @@ CONFIG_KERNEL_START=0xc0000000 CONFIG_LOWMEM_SIZE=0x30000000 # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_MAGICBOX=y -# CONFIG_MATH_EMULATION is not set +CONFIG_MATH_EMULATION=y CONFIG_MINI_FO=y CONFIG_MTD=y # CONFIG_MTD_ABSENT is not set @@ -165,9 +166,11 @@ 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 18c67ab5f6..e6df7f6408 100644 --- 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 #include #include +#include #include #include #include diff --git a/target/linux/magicbox/patches-2.6.22/001-magicbox_support.patch b/target/linux/magicbox/patches/001-magicbox_support.patch similarity index 100% rename from target/linux/magicbox/patches-2.6.22/001-magicbox_support.patch rename to target/linux/magicbox/patches/001-magicbox_support.patch diff --git a/target/linux/magicbox/patches-2.6.22/100-cf_slot.patch b/target/linux/magicbox/patches/100-cf_slot.patch similarity index 100% rename from target/linux/magicbox/patches-2.6.22/100-cf_slot.patch rename to target/linux/magicbox/patches/100-cf_slot.patch