From 621677154f39f2e0b698a558b8b795db84a8e014 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 2 Dec 2015 22:23:22 +0000 Subject: kernel: add linux 4.4 support Based on 4.4-rc3. Runtime tested on MIPS. Signed-off-by: Jonas Gorski SVN-Revision: 47701 --- .../patches-4.4/997-device_tree_cmdline.patch | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 target/linux/generic/patches-4.4/997-device_tree_cmdline.patch (limited to 'target/linux/generic/patches-4.4/997-device_tree_cmdline.patch') diff --git a/target/linux/generic/patches-4.4/997-device_tree_cmdline.patch b/target/linux/generic/patches-4.4/997-device_tree_cmdline.patch new file mode 100644 index 0000000000..2ea41497a9 --- /dev/null +++ b/target/linux/generic/patches-4.4/997-device_tree_cmdline.patch @@ -0,0 +1,24 @@ +--- a/drivers/of/fdt.c ++++ b/drivers/of/fdt.c +@@ -951,6 +951,9 @@ int __init early_init_dt_scan_chosen(uns + p = of_get_flat_dt_prop(node, "bootargs", &l); + if (p != NULL && l > 0) + strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE)); ++ p = of_get_flat_dt_prop(node, "bootargs-append", &l); ++ if (p != NULL && l > 0) ++ strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE)); + + /* + * CONFIG_CMDLINE is meant to be a default in case nothing else +--- a/arch/mips/kernel/prom.c ++++ b/arch/mips/kernel/prom.c +@@ -51,6 +51,9 @@ void * __init early_init_dt_alloc_memory + + void __init __dt_setup_arch(void *bph) + { ++ if (boot_command_line[0] == '\0') ++ strcpy(boot_command_line, arcs_cmdline); ++ + if (!early_init_dt_scan(bph)) + return; + -- cgit v1.2.3