diff options
author | John Crispin <john@openwrt.org> | 2013-03-14 18:42:29 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2013-03-14 18:42:29 +0000 |
commit | b98ae2b149e8eef38d3285d8e1b21af32ac1f2dc (patch) | |
tree | 942791530060eeebfd3e6cd68158c74b892ed7ec /target/linux/lantiq/patches-3.8/0036-owrt-lantiq-dtb-image-hack.patch | |
parent | 3ab75692f3a7490146eaec4a5a76dec327f11f97 (diff) | |
download | master-31e0f0ae-b98ae2b149e8eef38d3285d8e1b21af32ac1f2dc.tar.gz master-31e0f0ae-b98ae2b149e8eef38d3285d8e1b21af32ac1f2dc.tar.bz2 master-31e0f0ae-b98ae2b149e8eef38d3285d8e1b21af32ac1f2dc.zip |
bump to v3.8
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 36014
Diffstat (limited to 'target/linux/lantiq/patches-3.8/0036-owrt-lantiq-dtb-image-hack.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.8/0036-owrt-lantiq-dtb-image-hack.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-3.8/0036-owrt-lantiq-dtb-image-hack.patch b/target/linux/lantiq/patches-3.8/0036-owrt-lantiq-dtb-image-hack.patch new file mode 100644 index 0000000000..9fd7deb203 --- /dev/null +++ b/target/linux/lantiq/patches-3.8/0036-owrt-lantiq-dtb-image-hack.patch @@ -0,0 +1,48 @@ +From 5128799df668a7ff5b2861fab39f9f788369eb43 Mon Sep 17 00:00:00 2001 +From: John Crispin <blogic@openwrt.org> +Date: Wed, 13 Mar 2013 09:36:16 +0100 +Subject: [PATCH 36/40] owrt: lantiq dtb image hack + +--- + arch/mips/lantiq/Makefile | 2 -- + arch/mips/lantiq/prom.c | 4 +++- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/mips/lantiq/Makefile b/arch/mips/lantiq/Makefile +index d6bdc57..690257a 100644 +--- a/arch/mips/lantiq/Makefile ++++ b/arch/mips/lantiq/Makefile +@@ -6,8 +6,6 @@ + + obj-y := irq.o clk.o prom.o + +-obj-y += dts/ +- + obj-$(CONFIG_EARLY_PRINTK) += early_printk.o + + obj-$(CONFIG_SOC_TYPE_XWAY) += xway/ +diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c +index 9f9e875..72b183a 100644 +--- a/arch/mips/lantiq/prom.c ++++ b/arch/mips/lantiq/prom.c +@@ -57,6 +57,8 @@ static void __init prom_init_cmdline(void) + } + } + ++extern struct boot_param_header __image_dtb; ++ + void __init plat_mem_setup(void) + { + ioport_resource.start = IOPORT_RESOURCE_START; +@@ -70,7 +72,7 @@ void __init plat_mem_setup(void) + * Load the builtin devicetree. This causes the chosen node to be + * parsed resulting in our memory appearing + */ +- __dt_setup_arch(&__dtb_start); ++ __dt_setup_arch(&__image_dtb); + } + + void __init device_tree_init(void) +-- +1.7.10.4 + |