aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ppc44x
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-08-07 21:05:32 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-08-07 21:05:32 +0000
commit31ed4e54ca9186511d0c5de41f1383d2709501d2 (patch)
treef914a364e1f10a0b56f4a9ca11cf926d2a4eee33 /target/linux/ppc44x
parent45bdf3402086ee7cbd9993caf098c7e808f42b27 (diff)
downloadupstream-31ed4e54ca9186511d0c5de41f1383d2709501d2.tar.gz
upstream-31ed4e54ca9186511d0c5de41f1383d2709501d2.tar.bz2
upstream-31ed4e54ca9186511d0c5de41f1383d2709501d2.zip
upgrade ppc44x to 2.6.26.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12244 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ppc44x')
-rw-r--r--target/linux/ppc44x/Makefile2
-rw-r--r--target/linux/ppc44x/config-default8
-rw-r--r--target/linux/ppc44x/patches/001-taishan_openwrt_flashmap.patch8
3 files changed, 12 insertions, 6 deletions
diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile
index 90921e097d..fa8ec11ea4 100644
--- a/target/linux/ppc44x/Makefile
+++ b/target/linux/ppc44x/Makefile
@@ -11,7 +11,7 @@ BOARD:=ppc44x
BOARDNAME:=AMCC/IBM PPC44x
FEATURES:=squashfs
-LINUX_VERSION:=2.6.24.7
+LINUX_VERSION:=2.6.26.2
LINUX_KARCH:=powerpc
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ppc44x/config-default b/target/linux/ppc44x/config-default
index e11c4ecbc9..75cf9ac937 100644
--- a/target/linux/ppc44x/config-default
+++ b/target/linux/ppc44x/config-default
@@ -22,13 +22,16 @@ CONFIG_CMDLINE="console=ttyS1,115200 root=/dev/mtdblock1 rootfstype=squashfs,jff
CONFIG_CMDLINE_BOOL=y
CONFIG_CONSISTENT_SIZE=0x00200000
CONFIG_CONSISTENT_START=0xff100000
+# CONFIG_CANYONLANDS is not set
# CONFIG_CPU_FREQ is not set
# CONFIG_DEBUG_BUGVERBOSE is not set
CONFIG_DEVICE_TREE="taishan.dts"
+# CONFIG_DMADEVICES is not set
# CONFIG_E200 is not set
# CONFIG_E500 is not set
# CONFIG_EBONY is not set
# CONFIG_EDAC is not set
+CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_FS_POSIX_ACL=y
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -53,6 +56,7 @@ CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
CONFIG_IBM_OCP=y
# CONFIG_IDE is not set
CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_IRQSTACKS is not set
CONFIG_ISA_DMA_API=y
# CONFIG_KATMAI is not set
CONFIG_KERNEL_START=0xc0000000
@@ -104,6 +108,7 @@ CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_PHRAM is not set
# CONFIG_MTD_PHYSMAP is not set
CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_OF_PARTS=y
# CONFIG_MTD_PLATRAM is not set
# CONFIG_MTD_PMC551 is not set
# CONFIG_MTD_RAM is not set
@@ -159,6 +164,8 @@ CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_TAISHAN=y
CONFIG_TASK_SIZE=0x80000000
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
# CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_USER_NS is not set
# CONFIG_VIA_RHINE is not set
@@ -166,5 +173,6 @@ CONFIG_WANT_EARLY_SERIAL=y
# CONFIG_WARP is not set
# CONFIG_WINDFARM is not set
# CONFIG_XILINX_SYSACE is not set
+# CONFIG_YOSEMITE is not set
# CONFIG_YUCCA is not set
# CONFIG_PATA_OF_PLATFORM is not set
diff --git a/target/linux/ppc44x/patches/001-taishan_openwrt_flashmap.patch b/target/linux/ppc44x/patches/001-taishan_openwrt_flashmap.patch
index dc3abd7273..cae9af30a0 100644
--- a/target/linux/ppc44x/patches/001-taishan_openwrt_flashmap.patch
+++ b/target/linux/ppc44x/patches/001-taishan_openwrt_flashmap.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.24.7/arch/powerpc/boot/dts/taishan.dts
-===================================================================
---- linux-2.6.24.7.orig/arch/powerpc/boot/dts/taishan.dts
-+++ linux-2.6.24.7/arch/powerpc/boot/dts/taishan.dts
-@@ -175,6 +175,34 @@
+--- a/arch/powerpc/boot/dts/taishan.dts
++++ b/arch/powerpc/boot/dts/taishan.dts
+@@ -185,6 +185,34 @@
interrupt-parent = <&UIC1>;
/* TODO: Add other EBC devices */