diff options
| author | Chuanhong Guo <gch981213@gmail.com> | 2019-06-27 20:44:27 +0800 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2019-07-08 22:00:24 +0200 |
| commit | 7a8d3432c739c6ff038295176e8b6324e92fc116 (patch) | |
| tree | a5cef9217a4a17791f4482c1b6e4791c51ded88c /target/linux/ramips/patches-4.14 | |
| parent | 653e05d27f13fee2ab925031c5162ddb34b755f0 (diff) | |
| download | upstream-7a8d3432c739c6ff038295176e8b6324e92fc116.tar.gz upstream-7a8d3432c739c6ff038295176e8b6324e92fc116.tar.bz2 upstream-7a8d3432c739c6ff038295176e8b6324e92fc116.zip | |
ramips: use upstream RAW_APPENDED_DTB instead of our OWRTDTB
Upstream kernel added support for RAW_APPENDED_DTB on ralink arch
in the following commit:
02564fc89d3d ("ralink: Introduce fw_passed_dtb to arch/mips/ralink")
Use upstream solution and get rid of our OWRTDTB hack.
This commit set DEVICE_DTS to $$(DTS) instead of replacing DTS with
DEVICE_DTS in device profile because DTS variable will be dropped
in later commits.
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
[Tested on mt7621/mt76x8]
Tested-by: Chuanhong Guo <gch981213@gmail.com>
[Tested on rt305x/mt7620]
Tested-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Diffstat (limited to 'target/linux/ramips/patches-4.14')
| -rw-r--r-- | target/linux/ramips/patches-4.14/0100-prom_fixes.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/target/linux/ramips/patches-4.14/0100-prom_fixes.patch b/target/linux/ramips/patches-4.14/0100-prom_fixes.patch deleted file mode 100644 index 91ac3b22c4..0000000000 --- a/target/linux/ramips/patches-4.14/0100-prom_fixes.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 67b7bff0fd364c194e653f69baa623ba2141bd4c Mon Sep 17 00:00:00 2001 -From: John Crispin <blogic@openwrt.org> -Date: Mon, 4 Aug 2014 18:46:02 +0200 -Subject: [PATCH 07/53] MIPS: ralink: copy the commandline from the devicetree - -Signed-off-by: John Crispin <blogic@openwrt.org> ---- - arch/mips/ralink/of.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/arch/mips/ralink/of.c -+++ b/arch/mips/ralink/of.c -@@ -3,7 +3,7 @@ - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. - * -- * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org> -+ * Copyright (C) 2008-2014 Imre Kaloz <kaloz@openwrt.org> - * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org> - * Copyright (C) 2013 John Crispin <john@phrozen.org> - */ -@@ -66,6 +66,19 @@ static int __init early_init_dt_find_mem - return 0; - } - -+static int chosen_dtb; -+ -+static int __init early_init_dt_find_chosen(unsigned long node, const char *uname, -+ int depth, void *data) -+{ -+ if (depth == 1 && !strcmp(uname, "chosen")) -+ chosen_dtb = 1; -+ -+ return 0; -+} -+ -+extern struct boot_param_header __image_dtb; -+ - void __init plat_mem_setup(void) - { - void *dtb = NULL; -@@ -82,7 +95,11 @@ void __init plat_mem_setup(void) - else if (__dtb_start != __dtb_end) - dtb = (void *)__dtb_start; - -- __dt_setup_arch(dtb); -+ __dt_setup_arch(&__image_dtb); -+ -+ of_scan_flat_dt(early_init_dt_find_chosen, NULL); -+ if (chosen_dtb) -+ strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE); - - strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE); - ---- a/arch/mips/kernel/head.S -+++ b/arch/mips/kernel/head.S -@@ -85,6 +85,9 @@ EXPORT(__image_cmdline) - .fill 0x400 - #endif /* CONFIG_IMAGE_CMDLINE_HACK */ - -+ .ascii "OWRTDTB:" -+ EXPORT(__image_dtb) -+ .fill 0x4000 - __REF - - NESTED(kernel_entry, 16, sp) # kernel entry point |