From 8fd383ae2e8a2d7669e7e5d6ed19a5ff90a8665c Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Tue, 24 Apr 2012 09:25:38 +0000 Subject: [PATCH] kernel: update linux 3.3 to 3.3.3 SVN-Revision: 31460 --- include/kernel-version.mk | 4 ++-- target/linux/ar71xx/Makefile | 2 +- target/linux/at91/Makefile | 2 +- target/linux/at91/patches/700-tqma9263-support.patch | 6 +++--- .../at91/patches/805-free_some_portc_pins.patch | 2 +- ...0-AT91-Add-external-RTC-for-Flexibity-board.patch | 12 +++++------- ...01-AT91-flexibity-default-leds-to-heartbeat.patch | 8 +++----- target/linux/avr32/Makefile | 2 +- target/linux/cns21xx/Makefile | 2 +- .../811-pci_disable_usb_common_quirks.patch | 2 +- target/linux/malta/Makefile | 2 +- target/linux/mpc52xx/Makefile | 2 +- target/linux/ppc40x/Makefile | 2 +- target/linux/ramips/Makefile | 2 +- target/linux/uml/Makefile | 2 +- .../patches-3.3/901-lib_zlib_deflate_visible.patch | 2 +- target/linux/x86/geos/target.mk | 2 +- 17 files changed, 26 insertions(+), 30 deletions(-) mode change 100755 => 100644 target/linux/at91/patches/805-free_some_portc_pins.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 1dd70f6c5d0..cb8691a40ea 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -38,8 +38,8 @@ endif ifeq ($(LINUX_VERSION),3.2.16) LINUX_KERNEL_MD5SUM:=246e6bd28ea44c90ec66c7f8b56e4803 endif -ifeq ($(LINUX_VERSION),3.3.2) - LINUX_KERNEL_MD5SUM:=cb5f959dfb3009bcc2a6e4ebf162174e +ifeq ($(LINUX_VERSION),3.3.3) + LINUX_KERNEL_MD5SUM:=a6897310b4785b5f912c567cdc93402e endif # disable the md5sum check for unknown kernel versions diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index ae7fe1cd62e..c7eb8e2dff9 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 targz CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves SUBTARGETS:=generic nand -LINUX_VERSION:=3.3.2 +LINUX_VERSION:=3.3.3 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index 71b967c07d7..3151fb88fd1 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -14,7 +14,7 @@ FEATURES:=squashfs jffs2 targz ext2 usb CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves SUBTARGETS:=9g20 9260 9263 -LINUX_VERSION:=3.3.2 +LINUX_VERSION:=3.3.3 DEVICE_TYPE= include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/at91/patches/700-tqma9263-support.patch b/target/linux/at91/patches/700-tqma9263-support.patch index 649d0d77da5..321fe59a4f4 100644 --- a/target/linux/at91/patches/700-tqma9263-support.patch +++ b/target/linux/at91/patches/700-tqma9263-support.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig -@@ -318,6 +318,12 @@ config MACH_NEOCORE926 +@@ -335,6 +335,12 @@ config MACH_NEOCORE926 help Select this if you are using the Adeneo Neocore 926 board. @@ -15,9 +15,9 @@ # ---------------------------------------------------------- --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile -@@ -56,6 +56,7 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += boar +@@ -58,6 +58,7 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += boar obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o - obj-$(CONFIG_MACH_USB_A9263) += board-usb-a9263.o + obj-$(CONFIG_MACH_USB_A9263) += board-usb-a926x.o obj-$(CONFIG_MACH_NEOCORE926) += board-neocore926.o +obj-$(CONFIG_MACH_TQMA9263) += board-tqma9263.o diff --git a/target/linux/at91/patches/805-free_some_portc_pins.patch b/target/linux/at91/patches/805-free_some_portc_pins.patch old mode 100755 new mode 100644 index e3d6ffd5a3b..df8e50a038e --- a/target/linux/at91/patches/805-free_some_portc_pins.patch +++ b/target/linux/at91/patches/805-free_some_portc_pins.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c -@@ -571,7 +571,7 @@ static struct platform_device at91sam926 +@@ -579,7 +579,7 @@ static struct platform_device at91sam926 .num_resources = ARRAY_SIZE(spi1_resources), }; diff --git a/target/linux/at91/patches/900-AT91-Add-external-RTC-for-Flexibity-board.patch b/target/linux/at91/patches/900-AT91-Add-external-RTC-for-Flexibity-board.patch index 3216969a7d3..2b67be1e4ea 100644 --- a/target/linux/at91/patches/900-AT91-Add-external-RTC-for-Flexibity-board.patch +++ b/target/linux/at91/patches/900-AT91-Add-external-RTC-for-Flexibity-board.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.37.6/arch/arm/mach-at91/board-flexibity.c -=================================================================== ---- linux-2.6.37.6.orig/arch/arm/mach-at91/board-flexibity.c 2011-05-07 10:07:03.112684983 +0100 -+++ linux-2.6.37.6/arch/arm/mach-at91/board-flexibity.c 2011-05-07 10:07:33.480684982 +0100 +--- a/arch/arm/mach-at91/board-flexibity.c ++++ b/arch/arm/mach-at91/board-flexibity.c @@ -1,7 +1,7 @@ /* * linux/arch/arm/mach-at91/board-flexibity.c @@ -11,8 +9,8 @@ Index: linux-2.6.37.6/arch/arm/mach-at91/board-flexibity.c * Copyright (C) 2005 SAN People * Copyright (C) 2006 Atmel * -@@ -65,6 +65,13 @@ - .pullup_pin = 0, /* pull-up driven by UDC */ +@@ -62,6 +62,13 @@ static struct at91_udc_data __initdata f + .pullup_pin = -EINVAL, /* pull-up driven by UDC */ }; +/* I2C devices */ @@ -25,7 +23,7 @@ Index: linux-2.6.37.6/arch/arm/mach-at91/board-flexibity.c /* SPI devices */ static struct spi_board_info flexibity_spi_devices[] = { { /* DataFlash chip */ -@@ -143,6 +150,9 @@ +@@ -141,6 +148,9 @@ static void __init flexibity_board_init( at91_add_device_usbh(&flexibity_usbh_data); /* USB Device */ at91_add_device_udc(&flexibity_udc_data); diff --git a/target/linux/at91/patches/901-AT91-flexibity-default-leds-to-heartbeat.patch b/target/linux/at91/patches/901-AT91-flexibity-default-leds-to-heartbeat.patch index de7a8dca3db..59f9bb30ee1 100644 --- a/target/linux/at91/patches/901-AT91-flexibity-default-leds-to-heartbeat.patch +++ b/target/linux/at91/patches/901-AT91-flexibity-default-leds-to-heartbeat.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.39/arch/arm/mach-at91/board-flexibity.c -=================================================================== ---- linux-2.6.39.orig/arch/arm/mach-at91/board-flexibity.c 2011-06-17 11:02:11.335016002 +0100 -+++ linux-2.6.39/arch/arm/mach-at91/board-flexibity.c 2011-06-17 11:02:20.395016002 +0100 -@@ -96,49 +96,49 @@ +--- a/arch/arm/mach-at91/board-flexibity.c ++++ b/arch/arm/mach-at91/board-flexibity.c +@@ -94,49 +94,49 @@ static struct gpio_led flexibity_leds[] .name = "usb1:green", .gpio = AT91_PIN_PA12, .active_low = 1, diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index da146dcd868..ecb23f3d9c5 100644 --- a/target/linux/avr32/Makefile +++ b/target/linux/avr32/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Atmel AVR32 FEATURES:=squashfs MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.3.2 +LINUX_VERSION:=3.3.3 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile index 44b04d38a7d..5cb57bc3b3f 100644 --- a/target/linux/cns21xx/Makefile +++ b/target/linux/cns21xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS21xx FEATURES:=squashfs broken CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves -LINUX_VERSION:=3.3.2 +LINUX_VERSION:=3.3.3 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch index 4a7d351b644..d4fa69d2390 100644 --- a/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch @@ -10,7 +10,7 @@ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) { u16 cmd; -@@ -894,3 +896,5 @@ static void __devinit quirk_usb_early_ha +@@ -898,3 +900,5 @@ static void __devinit quirk_usb_early_ha pci_disable_device(pdev); } DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff); diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index e0b7c6c799b..34da1d40a02 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=le be INITRAMFS_EXTRA_FILES:= MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.3.2 +LINUX_VERSION:=3.3.3 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mpc52xx/Makefile b/target/linux/mpc52xx/Makefile index ff91d601004..b5ff5cec9eb 100644 --- a/target/linux/mpc52xx/Makefile +++ b/target/linux/mpc52xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Freescale MPC52xx CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=603e FEATURES:=targz ext4 -LINUX_VERSION:=3.3.2 +LINUX_VERSION:=3.3.3 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index 88a55a4c222..3c3bc09f6aa 100644 --- a/target/linux/ppc40x/Makefile +++ b/target/linux/ppc40x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=405 MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.3.2 +LINUX_VERSION:=3.3.3 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 3630c78f161..9c2c3a04351 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x rt3883 CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves FEATURES:=squashfs -LINUX_VERSION:=3.3.2 +LINUX_VERSION:=3.3.3 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES+=\ diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index f516785b065..fd9f42ca259 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux FEATURES:=ext4 audio MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.3.2 +LINUX_VERSION:=3.3.3 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/patches-3.3/901-lib_zlib_deflate_visible.patch b/target/linux/uml/patches-3.3/901-lib_zlib_deflate_visible.patch index f4aba9bd7a7..f2b6547d58c 100644 --- a/target/linux/uml/patches-3.3/901-lib_zlib_deflate_visible.patch +++ b/target/linux/uml/patches-3.3/901-lib_zlib_deflate_visible.patch @@ -3,7 +3,7 @@ or as a module --- a/lib/Kconfig +++ b/lib/Kconfig -@@ -98,7 +98,7 @@ config ZLIB_INFLATE +@@ -108,7 +108,7 @@ config ZLIB_INFLATE tristate config ZLIB_DEFLATE diff --git a/target/linux/x86/geos/target.mk b/target/linux/x86/geos/target.mk index 17e32669855..5ff7aa018b7 100644 --- a/target/linux/x86/geos/target.mk +++ b/target/linux/x86/geos/target.mk @@ -1,4 +1,4 @@ -LINUX_VERSION:=3.3.2 +LINUX_VERSION:=3.3.3 BOARDNAME:=Traverse Geos FEATURES:=squashfs jffs2 ext4 pci usb gpio DEFAULT_PACKAGES += \ -- 2.30.2