From 07532dca7f40b2e81df67eadb84f9f18c8be1ef1 Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Fri, 15 Mar 2013 14:39:51 +0000
Subject: kernel: update linux 3.8 to 3.8.3
Also refresh the related generic/platform patches.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 36039
---
target/linux/cns21xx/Makefile | 2 +-
target/linux/cns21xx/patches-3.8/003-arm-introduce-fa-platform.patch | 4 ++--
target/linux/cns21xx/patches-3.8/006-arm-add-fa-watchdog-driver.patch | 2 +-
target/linux/cns21xx/patches-3.8/100-cns21xx-core.patch | 2 +-
.../linux/cns21xx/patches-3.8/202-cns21xx-add-watchdog-device.patch | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'target/linux/cns21xx')
diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile
index b63ade9ae9..d0438bf0a2 100644
--- a/target/linux/cns21xx/Makefile
+++ b/target/linux/cns21xx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS21xx
FEATURES:=squashfs
CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves
-LINUX_VERSION:=3.8.2
+LINUX_VERSION:=3.8.3
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/cns21xx/patches-3.8/003-arm-introduce-fa-platform.patch b/target/linux/cns21xx/patches-3.8/003-arm-introduce-fa-platform.patch
index 5f7907c049..771a1b825a 100644
--- a/target/linux/cns21xx/patches-3.8/003-arm-introduce-fa-platform.patch
+++ b/target/linux/cns21xx/patches-3.8/003-arm-introduce-fa-platform.patch
@@ -18,7 +18,7 @@
select GENERIC_CLOCKEVENTS
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
-@@ -202,6 +202,7 @@ machine-$(CONFIG_ARCH_SUNXI) += sunxi
+@@ -207,6 +207,7 @@ machine-$(CONFIG_ARCH_SUNXI) += sunxi
plat-$(CONFIG_ARCH_OMAP) += omap
plat-$(CONFIG_ARCH_S3C64XX) += samsung
plat-$(CONFIG_PLAT_IOP) += iop
@@ -26,7 +26,7 @@
plat-$(CONFIG_PLAT_ORION) += orion
plat-$(CONFIG_PLAT_PXA) += pxa
plat-$(CONFIG_PLAT_S3C24XX) += s3c24xx samsung
-@@ -311,7 +312,7 @@ define archhelp
+@@ -316,7 +317,7 @@ define archhelp
echo ' Image - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'
echo '* xipImage - XIP kernel image, if configured (arch/$(ARCH)/boot/xipImage)'
echo ' uImage - U-Boot wrapped zImage'
diff --git a/target/linux/cns21xx/patches-3.8/006-arm-add-fa-watchdog-driver.patch b/target/linux/cns21xx/patches-3.8/006-arm-add-fa-watchdog-driver.patch
index a485529184..2c67b167a1 100644
--- a/target/linux/cns21xx/patches-3.8/006-arm-add-fa-watchdog-driver.patch
+++ b/target/linux/cns21xx/patches-3.8/006-arm-add-fa-watchdog-driver.patch
@@ -1,6 +1,6 @@
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
-@@ -364,6 +364,13 @@ config IMX2_WDT
+@@ -365,6 +365,13 @@ config IMX2_WDT
To compile this driver as a module, choose M here: the
module will be called imx2_wdt.
diff --git a/target/linux/cns21xx/patches-3.8/100-cns21xx-core.patch b/target/linux/cns21xx/patches-3.8/100-cns21xx-core.patch
index 04fb1909a5..4cfe5ba223 100644
--- a/target/linux/cns21xx/patches-3.8/100-cns21xx-core.patch
+++ b/target/linux/cns21xx/patches-3.8/100-cns21xx-core.patch
@@ -67,7 +67,7 @@
+initrd_phys-y := 0x00C00000
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
-@@ -141,6 +141,7 @@ machine-$(CONFIG_ARCH_AT91) += at91
+@@ -146,6 +146,7 @@ machine-$(CONFIG_ARCH_AT91) += at91
machine-$(CONFIG_ARCH_BCM) += bcm
machine-$(CONFIG_ARCH_BCM2835) += bcm2835
machine-$(CONFIG_ARCH_CLPS711X) += clps711x
diff --git a/target/linux/cns21xx/patches-3.8/202-cns21xx-add-watchdog-device.patch b/target/linux/cns21xx/patches-3.8/202-cns21xx-add-watchdog-device.patch
index 7b88c53a2e..858fa73d4b 100644
--- a/target/linux/cns21xx/patches-3.8/202-cns21xx-add-watchdog-device.patch
+++ b/target/linux/cns21xx/patches-3.8/202-cns21xx-add-watchdog-device.patch
@@ -52,7 +52,7 @@
+}
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
-@@ -366,7 +366,7 @@ config IMX2_WDT
+@@ -367,7 +367,7 @@ config IMX2_WDT
config FA_WATCHDOG
tristate "Faraday watchdog"
--
cgit v1.2.3