aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/magicbox
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-01-27 21:20:06 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-01-27 21:20:06 +0000
commit59b5f8985640c0211dc57f491e975781c394679a (patch)
tree1422999eb40cbf059da06f578e79b32dded0ec17 /target/linux/magicbox
parent66997bfea83389fa38abe0e6ff2302747918f22f (diff)
downloadupstream-59b5f8985640c0211dc57f491e975781c394679a.tar.gz
upstream-59b5f8985640c0211dc57f491e975781c394679a.tar.bz2
upstream-59b5f8985640c0211dc57f491e975781c394679a.zip
* Upgrade Magicbox to 2.6.23
* Rename directories git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10286 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/magicbox')
-rw-r--r--target/linux/magicbox/Makefile4
-rw-r--r--target/linux/magicbox/config-default (renamed from target/linux/magicbox/config-2.6.22)5
-rw-r--r--target/linux/magicbox/files/arch/ppc/platforms/4xx/magicbox.c1
-rw-r--r--target/linux/magicbox/patches/001-magicbox_support.patch (renamed from target/linux/magicbox/patches-2.6.22/001-magicbox_support.patch)0
-rw-r--r--target/linux/magicbox/patches/100-cf_slot.patch (renamed from target/linux/magicbox/patches-2.6.22/100-cf_slot.patch)0
5 files changed, 7 insertions, 3 deletions
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
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 <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/001-magicbox_support.patch
index de7e86be80..de7e86be80 100644
--- a/target/linux/magicbox/patches-2.6.22/001-magicbox_support.patch
+++ b/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
index 3a5dde7709..3a5dde7709 100644
--- a/target/linux/magicbox/patches-2.6.22/100-cf_slot.patch
+++ b/target/linux/magicbox/patches/100-cf_slot.patch