diff options
author | Felix Fietkau <nbd@nbd.name> | 2018-04-06 18:20:46 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2018-04-06 18:21:45 +0200 |
commit | dea9922acd290b37a784d354892a44684a8fb696 (patch) | |
tree | 6882d6c6a6b0166ed11842edea35ace83c7e592d /target/linux/ramips/patches-4.9/0100-prom_fixes.patch | |
parent | 804952e7ef045e2ed68a1434dbc7371057495968 (diff) | |
download | upstream-dea9922acd290b37a784d354892a44684a8fb696.tar.gz upstream-dea9922acd290b37a784d354892a44684a8fb696.tar.bz2 upstream-dea9922acd290b37a784d354892a44684a8fb696.zip |
ramips: drop linux 4.9 support
4.14 has been tested a lot by a number of users, and we want to use it
for the release.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/ramips/patches-4.9/0100-prom_fixes.patch')
-rw-r--r-- | target/linux/ramips/patches-4.9/0100-prom_fixes.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/target/linux/ramips/patches-4.9/0100-prom_fixes.patch b/target/linux/ramips/patches-4.9/0100-prom_fixes.patch deleted file mode 100644 index 07042f89b1..0000000000 --- a/target/linux/ramips/patches-4.9/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) - { - set_io_port_base(KSEG1); -@@ -74,7 +87,11 @@ 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); -+ -+ 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 |