diff options
| author | John Crispin <blogic@openwrt.org> | 2012-11-06 10:39:43 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2012-11-06 10:39:43 +0000 |
| commit | ce0ec8cf6f2d8b65aa59faaa0f8cb60bf56dce17 (patch) | |
| tree | f9a1746f38f249ff274b16c36b2ba9ff622839ab /target | |
| parent | 14c3415c87bf3eb546e4328c7c5bad5dfd05f7b4 (diff) | |
| download | master-187ad058-ce0ec8cf6f2d8b65aa59faaa0f8cb60bf56dce17.tar.gz master-187ad058-ce0ec8cf6f2d8b65aa59faaa0f8cb60bf56dce17.tar.bz2 master-187ad058-ce0ec8cf6f2d8b65aa59faaa0f8cb60bf56dce17.zip | |
[lantiq] add OWRTDTB marker patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34100 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/lantiq/patches-3.6/0200-MIPS-dtb-image-hack.patch | 26 | ||||
| -rw-r--r-- | target/linux/lantiq/patches-3.6/0201-lantiq-dtb-image-hack.patch | 58 |
2 files changed, 84 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-3.6/0200-MIPS-dtb-image-hack.patch b/target/linux/lantiq/patches-3.6/0200-MIPS-dtb-image-hack.patch new file mode 100644 index 0000000000..0c6fa51e1e --- /dev/null +++ b/target/linux/lantiq/patches-3.6/0200-MIPS-dtb-image-hack.patch @@ -0,0 +1,26 @@ +From 5dd6dd9cddc0327b638d15f8c4f489fee6257fb0 Mon Sep 17 00:00:00 2001 +From: John Crispin <blogic@openwrt.org> +Date: Fri, 2 Nov 2012 15:40:08 +0100 +Subject: [PATCH 200/201] MIPS: dtb image hack + +--- + arch/mips/kernel/head.S | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S +index ea695d9..be87456 100644 +--- a/arch/mips/kernel/head.S ++++ b/arch/mips/kernel/head.S +@@ -141,6 +141,9 @@ FEXPORT(__kernel_entry) + j kernel_entry + #endif + ++ .ascii "OWRTDTB:" ++ EXPORT(__image_dtb) ++ .fill 0x4000 + __REF + + NESTED(kernel_entry, 16, sp) # kernel entry point +-- +1.7.10.4 + diff --git a/target/linux/lantiq/patches-3.6/0201-lantiq-dtb-image-hack.patch b/target/linux/lantiq/patches-3.6/0201-lantiq-dtb-image-hack.patch new file mode 100644 index 0000000000..b2f781e557 --- /dev/null +++ b/target/linux/lantiq/patches-3.6/0201-lantiq-dtb-image-hack.patch @@ -0,0 +1,58 @@ +From a86a157eb87fb21a62205a5382842c2f331fb473 Mon Sep 17 00:00:00 2001 +From: John Crispin <blogic@openwrt.org> +Date: Fri, 2 Nov 2012 15:40:34 +0100 +Subject: [PATCH 201/201] lantiq: dtb image hack + +--- + arch/mips/lantiq/Kconfig | 12 ------------ + arch/mips/lantiq/prom.c | 4 +++- + 2 files changed, 3 insertions(+), 13 deletions(-) + +diff --git a/arch/mips/lantiq/Kconfig b/arch/mips/lantiq/Kconfig +index c9d0984..bef648f 100644 +--- a/arch/mips/lantiq/Kconfig ++++ b/arch/mips/lantiq/Kconfig +@@ -24,18 +24,6 @@ config SOC_FALCON + + endchoice + +-choice +- prompt "Devicetree" +- +-config DT_EASY50712 +- bool "Easy50712" +- depends on SOC_XWAY +- +-config DT_EASY80920 +- bool "Easy80920" +- depends on SOC_XWAY +-endchoice +- + config PCI_LANTIQ + bool "PCI Support" + depends on SOC_XWAY && PCI +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 + |