[LEDE-DEV] [PATCH] kernel: make fix extending dtb cmd with bootloader

[John Crispin]

On 09/12/2016 00:21, Hauke Mehrtens wrote:
> This was introduced in kernel 4.4, but broken there and fixed in 4.5.
> I would like to activate it, but I am scared about the boot loader
> around giving us all sorts of command lines.
> 
> Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>

we had previously used a syntax of prepending the cmdline with +/- to
indicate whether this should replace/extend the bootloader cmdline. the
biggest problem is that the bootloaders will pass console= and root= and
thus breaking boot. merging/activating this as is will most likely lead
to 50% of lantiq boards not booting anymore. imho this feature should be
an opt-in based on the specific board

	John

> ---
>  .../patches-4.4/094-MIPS-Fix-macro-typo.patch      | 33 ++++++++++++++++++++++
>  1 file changed, 33 insertions(+)
>  create mode 100644 target/linux/generic/patches-4.4/094-MIPS-Fix-macro-typo.patch
> 
> diff --git a/target/linux/generic/patches-4.4/094-MIPS-Fix-macro-typo.patch b/target/linux/generic/patches-4.4/094-MIPS-Fix-macro-typo.patch
> new file mode 100644
> index 0000000..783e1cf
> --- /dev/null
> +++ b/target/linux/generic/patches-4.4/094-MIPS-Fix-macro-typo.patch
> @@ -0,0 +1,33 @@
> +From 2549cc967ebb4043f3507b55e3dc579f44d3b516 Mon Sep 17 00:00:00 2001
> +From: Jaedon Shin <jaedon.shin at gmail.com>
> +Date: Mon, 21 Dec 2015 12:47:35 +0900
> +Subject: [PATCH] MIPS: Fix macro typo
> +
> +Change the CONFIG_MIPS_CMDLINE_EXTEND to CONFIG_MIPS_CMDLINE_DTB_EXTEND
> +to resolve the EXTEND_WITH_PROM macro.
> +
> +Signed-off-by: Jaedon Shin <jaedon.shin at gmail.com>
> +Fixes: 2024972ef533 ("MIPS: Make the kernel arguments from dtb available")
> +Reviewed-by: Alexander Sverdlin <alexander.svedlin at gmail.com>
> +Cc: Jonas Gorski <jogo at openwrt.org>
> +Cc: Masahiro Yamada <yamada.masahiro at socionext.com>
> +Cc: Paul Burton <paul.burton at imgtec.com>
> +Cc: Aaro Koskinen <aaro.koskinen at nokia.com>
> +Cc: linux-mips at linux-mips.org
> +Patchwork: https://patchwork.linux-mips.org/patch/11909/
> +Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
> +---
> + arch/mips/kernel/setup.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +--- a/arch/mips/kernel/setup.c
> ++++ b/arch/mips/kernel/setup.c
> +@@ -623,7 +623,7 @@ static void __init request_crashkernel(s
> + 
> + #define USE_PROM_CMDLINE	IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER)
> + #define USE_DTB_CMDLINE		IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_DTB)
> +-#define EXTEND_WITH_PROM	IS_ENABLED(CONFIG_MIPS_CMDLINE_EXTEND)
> ++#define EXTEND_WITH_PROM	IS_ENABLED(CONFIG_MIPS_CMDLINE_DTB_EXTEND)
> + 
> + static void __init arch_mem_init(char **cmdline_p)
> + {
>