diff options
| author | Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> | 2016-06-22 23:01:31 +0200 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-06-22 23:01:31 +0200 |
| commit | 14bcd15fc565a2aad43d076a16847780390b9ddf (patch) | |
| tree | a6e3defe8188a97a695d809aa5e6e57d1a917a01 /target/linux/generic | |
| parent | 3b71a8996a5ee010155e47ef3e18d49192b28bcd (diff) | |
| download | master-187ad058-14bcd15fc565a2aad43d076a16847780390b9ddf.tar.gz master-187ad058-14bcd15fc565a2aad43d076a16847780390b9ddf.tar.bz2 master-187ad058-14bcd15fc565a2aad43d076a16847780390b9ddf.zip | |
kernel: remove a hack that was obsoleted upstream
Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/patches-4.4/997-device_tree_cmdline.patch | 24 |
1 files changed, 0 insertions, 24 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 deleted file mode 100644 index 566648fcc5..0000000000 --- a/target/linux/generic/patches-4.4/997-device_tree_cmdline.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/drivers/of/fdt.c -+++ b/drivers/of/fdt.c -@@ -956,6 +956,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; - |