diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-12-02 22:23:22 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-12-02 22:23:22 +0000 |
commit | 9da189b6160422c8fe396181ff2d496fa68408b2 (patch) | |
tree | 4d911e6fe2fe7e304d340276c06729b33099013c /target/linux/generic/patches-4.4/997-device_tree_cmdline.patch | |
parent | 51a736c6287eb29cc5150f06ce8fdf10b7441a1b (diff) | |
download | master-187ad058-9da189b6160422c8fe396181ff2d496fa68408b2.tar.gz master-187ad058-9da189b6160422c8fe396181ff2d496fa68408b2.tar.bz2 master-187ad058-9da189b6160422c8fe396181ff2d496fa68408b2.zip |
kernel: add linux 4.4 support
Based on 4.4-rc3. Runtime tested on MIPS.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47701 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.4/997-device_tree_cmdline.patch')
-rw-r--r-- | target/linux/generic/patches-4.4/997-device_tree_cmdline.patch | 24 |
1 files changed, 24 insertions, 0 deletions
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; + |