aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-04-06 11:40:44 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-04-06 11:40:44 +0000
commit67dfec2fa81f97eafacef8081f30ab8959f70934 (patch)
treeeadd7469d3c7acf63c58ddfacd13a68feb0f4e2c /target/linux/lantiq
parent049b5f3748f4c49cae31d6a84e1ba8dab20f2524 (diff)
downloadupstream-67dfec2fa81f97eafacef8081f30ab8959f70934.tar.gz
upstream-67dfec2fa81f97eafacef8081f30ab8959f70934.tar.bz2
upstream-67dfec2fa81f97eafacef8081f30ab8959f70934.zip
kernel: update linux 3.8 to 3.8.6
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36215 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq')
-rw-r--r--target/linux/lantiq/Makefile2
-rw-r--r--target/linux/lantiq/patches-3.8/0200-MIPS-read-the-mips_machine-name-from-OF-and-output-i.patch17
2 files changed, 5 insertions, 14 deletions
diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile
index 706dc66142..210b85e5b4 100644
--- a/target/linux/lantiq/Makefile
+++ b/target/linux/lantiq/Makefile
@@ -11,7 +11,7 @@ BOARDNAME:=Lantiq GPON/XWAY/SVIP
FEATURES:=squashfs jffs2
SUBTARGETS=xway ase falcon
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.8.6
CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -mno-branch-likely
diff --git a/target/linux/lantiq/patches-3.8/0200-MIPS-read-the-mips_machine-name-from-OF-and-output-i.patch b/target/linux/lantiq/patches-3.8/0200-MIPS-read-the-mips_machine-name-from-OF-and-output-i.patch
index 3bdd136f95..21d9ee0a3c 100644
--- a/target/linux/lantiq/patches-3.8/0200-MIPS-read-the-mips_machine-name-from-OF-and-output-i.patch
+++ b/target/linux/lantiq/patches-3.8/0200-MIPS-read-the-mips_machine-name-from-OF-and-output-i.patch
@@ -13,11 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
arch/mips/kernel/prom.c | 24 ++++++++++++++++++++++++
3 files changed, 32 insertions(+), 1 deletion(-)
-diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h
-index 8808bf5..a4ad354 100644
--- a/arch/mips/include/asm/prom.h
+++ b/arch/mips/include/asm/prom.h
-@@ -44,8 +44,11 @@ extern void __dt_setup_arch(struct boot_param_header *bph);
+@@ -44,8 +44,11 @@ extern void __dt_setup_arch(struct boot_
__dt_setup_arch(&__dtb_##sym##_begin); \
})
@@ -29,8 +27,6 @@ index 8808bf5..a4ad354 100644
#endif /* CONFIG_OF */
#endif /* __ASM_PROM_H */
-diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
-index 135c4aa..9ab3d13 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -12,6 +12,7 @@
@@ -41,7 +37,7 @@ index 135c4aa..9ab3d13 100644
#include <asm/mips_machine.h>
unsigned int vced_count, vcei_count;
-@@ -34,7 +35,10 @@ static int show_cpuinfo(struct seq_file *m, void *v)
+@@ -34,7 +35,10 @@ static int show_cpuinfo(struct seq_file
*/
if (n == 0) {
seq_printf(m, "system type\t\t: %s\n", get_system_type());
@@ -53,8 +49,6 @@ index 135c4aa..9ab3d13 100644
seq_printf(m, "machine\t\t\t: %s\n",
mips_get_machine_name());
}
-diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
-index 028f6f8..1aa68a2 100644
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -23,6 +23,13 @@
@@ -71,7 +65,7 @@ index 028f6f8..1aa68a2 100644
int __init early_init_dt_scan_memory_arch(unsigned long node,
const char *uname, int depth,
void *data)
-@@ -50,6 +57,20 @@ void __init early_init_dt_setup_initrd_arch(unsigned long start,
+@@ -50,6 +57,20 @@ void __init early_init_dt_setup_initrd_a
}
#endif
@@ -92,7 +86,7 @@ index 028f6f8..1aa68a2 100644
void __init early_init_devtree(void *params)
{
/* Setup flat device-tree pointer */
-@@ -65,6 +86,9 @@ void __init early_init_devtree(void *params)
+@@ -65,6 +86,9 @@ void __init early_init_devtree(void *par
/* Scan memory nodes */
of_scan_flat_dt(early_init_dt_scan_root, NULL);
of_scan_flat_dt(early_init_dt_scan_memory_arch, NULL);
@@ -102,6 +96,3 @@ index 028f6f8..1aa68a2 100644
}
void __init __dt_setup_arch(struct boot_param_header *bph)
---
-1.7.10.4
-