From f9b600b97e741277e57468315ab11fe632e70099 Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 3 Mar 2013 13:58:52 +0000
Subject: kernel: update linux 3.8 to 3.8.1

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35862 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../linux/atheros/patches-3.8/001-get_c0_compare_int_fix.patch   | 2 +-
 target/linux/atheros/patches-3.8/100-board.patch                 | 4 ++--
 target/linux/atheros/patches-3.8/101-early-printk-support.patch  | 2 +-
 target/linux/atheros/patches-3.8/130-watchdog.patch              | 2 +-
 target/linux/atheros/patches-3.8/140-redboot_boardconfig.patch   | 6 +++---
 .../linux/atheros/patches-3.8/141-redboot_partition_scan.patch   | 9 ++++-----
 .../atheros/patches-3.8/142-redboot_various_erase_size_fix.patch | 6 +++---
 7 files changed, 15 insertions(+), 16 deletions(-)

(limited to 'target/linux/atheros')

diff --git a/target/linux/atheros/patches-3.8/001-get_c0_compare_int_fix.patch b/target/linux/atheros/patches-3.8/001-get_c0_compare_int_fix.patch
index 43da96c3f..ff6cc998f 100644
--- a/target/linux/atheros/patches-3.8/001-get_c0_compare_int_fix.patch
+++ b/target/linux/atheros/patches-3.8/001-get_c0_compare_int_fix.patch
@@ -6,7 +6,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 
 --- a/arch/mips/kernel/cevt-r4k.c
 +++ b/arch/mips/kernel/cevt-r4k.c
-@@ -168,20 +168,23 @@ int __cpuinit r4k_clockevent_init(void)
+@@ -173,20 +173,23 @@ int __cpuinit r4k_clockevent_init(void)
  	struct clock_event_device *cd;
  	unsigned int irq;
  
diff --git a/target/linux/atheros/patches-3.8/100-board.patch b/target/linux/atheros/patches-3.8/100-board.patch
index bd00d9306..56c1f6943 100644
--- a/target/linux/atheros/patches-3.8/100-board.patch
+++ b/target/linux/atheros/patches-3.8/100-board.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -120,6 +120,19 @@ config BCM63XX
+@@ -135,6 +135,19 @@ config BCM63XX
  	help
  	 Support for BCM63XX based boards
  
@@ -20,7 +20,7 @@
  config MIPS_COBALT
  	bool "Cobalt Server"
  	select CEVT_R4K
-@@ -813,6 +826,7 @@ config NLM_XLP_BOARD
+@@ -836,6 +849,7 @@ config NLM_XLP_BOARD
  
  endchoice
  
diff --git a/target/linux/atheros/patches-3.8/101-early-printk-support.patch b/target/linux/atheros/patches-3.8/101-early-printk-support.patch
index 90e9f2ed4..7b0b2ec4d 100644
--- a/target/linux/atheros/patches-3.8/101-early-printk-support.patch
+++ b/target/linux/atheros/patches-3.8/101-early-printk-support.patch
@@ -58,7 +58,7 @@
  obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -130,6 +130,7 @@ config ATHEROS_AR231X
+@@ -145,6 +145,7 @@ config ATHEROS_AR231X
  	select SYS_SUPPORTS_BIG_ENDIAN
  	select SYS_SUPPORTS_32BIT_KERNEL
  	select ARCH_REQUIRE_GPIOLIB
diff --git a/target/linux/atheros/patches-3.8/130-watchdog.patch b/target/linux/atheros/patches-3.8/130-watchdog.patch
index 908fa711e..374565c05 100644
--- a/target/linux/atheros/patches-3.8/130-watchdog.patch
+++ b/target/linux/atheros/patches-3.8/130-watchdog.patch
@@ -202,7 +202,7 @@
 +module_exit(exit_ar2315_wdt);
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
-@@ -1064,6 +1064,12 @@ config LANTIQ_WDT
+@@ -1076,6 +1076,12 @@ config LANTIQ_WDT
  	help
  	  Hardware driver for the Lantiq SoC Watchdog Timer.
  
diff --git a/target/linux/atheros/patches-3.8/140-redboot_boardconfig.patch b/target/linux/atheros/patches-3.8/140-redboot_boardconfig.patch
index db8377b30..4191b0d42 100644
--- a/target/linux/atheros/patches-3.8/140-redboot_boardconfig.patch
+++ b/target/linux/atheros/patches-3.8/140-redboot_boardconfig.patch
@@ -17,7 +17,7 @@
  	int nrparts = 0;
  	struct fis_image_desc *buf;
  	struct mtd_partition *parts;
-@@ -227,14 +230,14 @@ static int parse_redboot_partitions(stru
+@@ -225,14 +228,14 @@ static int parse_redboot_partitions(stru
  		}
  	}
  #endif
@@ -34,7 +34,7 @@
  #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
  	if (nulllen > 0) {
  		strcpy(nullname, nullstring);
-@@ -253,6 +256,8 @@ static int parse_redboot_partitions(stru
+@@ -251,6 +254,8 @@ static int parse_redboot_partitions(stru
  	}
  #endif
  	for ( ; i<nrparts; i++) {
@@ -43,7 +43,7 @@
  		parts[i].size = fl->img->size;
  		parts[i].offset = fl->img->flash_base;
  		parts[i].name = names;
-@@ -286,6 +291,14 @@ static int parse_redboot_partitions(stru
+@@ -284,6 +289,14 @@ static int parse_redboot_partitions(stru
  		fl = fl->next;
  		kfree(tmp_fl);
  	}
diff --git a/target/linux/atheros/patches-3.8/141-redboot_partition_scan.patch b/target/linux/atheros/patches-3.8/141-redboot_partition_scan.patch
index c83823a21..c255baf8c 100644
--- a/target/linux/atheros/patches-3.8/141-redboot_partition_scan.patch
+++ b/target/linux/atheros/patches-3.8/141-redboot_partition_scan.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/redboot.c
 +++ b/drivers/mtd/redboot.c
-@@ -79,6 +79,11 @@ static int parse_redboot_partitions(stru
+@@ -79,12 +79,18 @@ static int parse_redboot_partitions(stru
  	static char nullstring[] = "unallocated";
  #endif
  
@@ -11,8 +11,7 @@
 + restart:
  	if ( directory < 0 ) {
  		offset = master->size + directory * master->erasesize;
- 		while (mtd_can_have_bb(master) &&
-@@ -86,6 +91,7 @@ static int parse_redboot_partitions(stru
+ 		while (mtd_block_isbad(master, offset)) {
  			if (!offset) {
  			nogood:
  				printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n");
@@ -20,7 +19,7 @@
  				return -EIO;
  			}
  			offset -= master->erasesize;
-@@ -99,10 +105,6 @@ static int parse_redboot_partitions(stru
+@@ -97,10 +103,6 @@ static int parse_redboot_partitions(stru
  				goto nogood;
  		}
  	}
@@ -31,7 +30,7 @@
  
  	printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
  	       master->name, offset);
-@@ -175,6 +177,11 @@ static int parse_redboot_partitions(stru
+@@ -173,6 +175,11 @@ static int parse_redboot_partitions(stru
  	}
  	if (i == numslots) {
  		/* Didn't find it */
diff --git a/target/linux/atheros/patches-3.8/142-redboot_various_erase_size_fix.patch b/target/linux/atheros/patches-3.8/142-redboot_various_erase_size_fix.patch
index 0ad155efd..fa00dcd3b 100644
--- a/target/linux/atheros/patches-3.8/142-redboot_various_erase_size_fix.patch
+++ b/target/linux/atheros/patches-3.8/142-redboot_various_erase_size_fix.patch
@@ -31,7 +31,7 @@
  	unsigned long offset;
  #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
  	static char nullstring[] = "unallocated";
-@@ -188,7 +205,10 @@ static int parse_redboot_partitions(stru
+@@ -186,7 +203,10 @@ static int parse_redboot_partitions(stru
  		goto out;
  	}
  
@@ -43,7 +43,7 @@
  		struct fis_list *new_fl, **prev;
  
  		if (buf[i].name[0] == 0xff) {
-@@ -263,12 +283,13 @@ static int parse_redboot_partitions(stru
+@@ -261,12 +281,13 @@ static int parse_redboot_partitions(stru
  	}
  #endif
  	for ( ; i<nrparts; i++) {
@@ -59,7 +59,7 @@
  		strcpy(names, fl->img->name);
  #ifdef CONFIG_MTD_REDBOOT_PARTS_READONLY
  		if (!memcmp(names, "RedBoot", 8) ||
-@@ -298,7 +319,9 @@ static int parse_redboot_partitions(stru
+@@ -296,7 +317,9 @@ static int parse_redboot_partitions(stru
  		fl = fl->next;
  		kfree(tmp_fl);
  	}
-- 
cgit v1.2.3