brcm2708: fix build error introduced in 2b4e5d47
authorÁlvaro Fernández Rojas <noltari@gmail.com>
Wed, 1 Jun 2016 15:08:08 +0000 (17:08 +0200)
committerÁlvaro Fernández Rojas <noltari@gmail.com>
Wed, 1 Jun 2016 15:11:04 +0000 (17:11 +0200)
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
target/linux/brcm2708/patches-4.4/0050-fdt-Add-support-for-the-CONFIG_CMDLINE_EXTEND-option.patch

index 815d3a7a1b85f996339e7d0f0fef984bdfc16cd9..8dded00c2cb046c29c4d468bbe7be43109f63487 100644 (file)
@@ -9,15 +9,12 @@ Subject: [PATCH 050/304] fdt: Add support for the CONFIG_CMDLINE_EXTEND option
 
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
-@@ -954,22 +954,38 @@ int __init early_init_dt_scan_chosen(uns
+@@ -954,19 +954,38 @@ int __init early_init_dt_scan_chosen(uns
  
        /* Retrieve command line */
        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