From 463dda6daf9b05cc048861e04ea7e41fe337fab8 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Tue, 16 Feb 2010 21:30:11 +0000 Subject: [PATCH] upgrade to 2.6.32.8 SVN-Revision: 19672 --- target/linux/ppc44x/Makefile | 4 ++-- target/linux/ppc44x/config-default | 3 +++ .../patches/005-canyonlands_remove_nonexisting_uarts.patch | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile index 5b536adafb..8ba42d80ea 100644 --- a/target/linux/ppc44x/Makefile +++ b/target/linux/ppc44x/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2009 OpenWrt.org +# Copyright (C) 2007-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ BOARDNAME:=AMCC/IBM PPC44x FEATURES:=squashfs CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=440 -LINUX_VERSION:=2.6.30.10 +LINUX_VERSION:=2.6.32.8 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc44x/config-default b/target/linux/ppc44x/config-default index 313fd3c7fe..4a0b3e34ae 100644 --- a/target/linux/ppc44x/config-default +++ b/target/linux/ppc44x/config-default @@ -37,6 +37,7 @@ CONFIG_DEVPORT=y # CONFIG_E200 is not set CONFIG_EARLY_PRINTK=y # CONFIG_EBONY is not set +# CONFIG_EIGER is not set CONFIG_EXTRA_TARGETS="uImage" CONFIG_FORCE_MAX_ZONEORDER=11 # CONFIG_FSL_ULI1575 is not set @@ -128,6 +129,7 @@ CONFIG_PPC4xx_PCI_EXPRESS=y # CONFIG_PPC_85xx is not set # CONFIG_PPC_8xx is not set # CONFIG_PPC_970_NAP is not set +# CONFIG_PPC_BOOK3S_32 is not set # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_CLOCK is not set @@ -164,6 +166,7 @@ CONFIG_SERIAL_8250_EXTENDED=y # CONFIG_SERIAL_8250_RSA is not set CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SWIOTLB=y CONFIG_TAISHAN=y CONFIG_TASK_SIZE=0xc0000000 CONFIG_USB_EHCI_HCD_PPC_OF=y diff --git a/target/linux/ppc44x/patches/005-canyonlands_remove_nonexisting_uarts.patch b/target/linux/ppc44x/patches/005-canyonlands_remove_nonexisting_uarts.patch index b98b367120..5a240de9e3 100644 --- a/target/linux/ppc44x/patches/005-canyonlands_remove_nonexisting_uarts.patch +++ b/target/linux/ppc44x/patches/005-canyonlands_remove_nonexisting_uarts.patch @@ -1,6 +1,6 @@ --- a/arch/powerpc/boot/dts/canyonlands.dts +++ b/arch/powerpc/boot/dts/canyonlands.dts -@@ -239,28 +239,6 @@ +@@ -262,28 +262,6 @@ interrupts = <0x1 0x4>; };