aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2016-06-01 17:08:08 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2016-06-01 17:11:04 +0200
commit65ae9db41ab70f496dbfbdb26a76952aa42d8ddf (patch)
treebfd1eb1fba32c70a8d63a6f609ef93af83b0bec1
parent83390271f9d9495fb394ea654bb1a959fb9ca4ec (diff)
downloadupstream-65ae9db41ab70f496dbfbdb26a76952aa42d8ddf.tar.gz
upstream-65ae9db41ab70f496dbfbdb26a76952aa42d8ddf.tar.bz2
upstream-65ae9db41ab70f496dbfbdb26a76952aa42d8ddf.zip
brcm2708: fix build error introduced in 2b4e5d47
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-rw-r--r--target/linux/brcm2708/patches-4.4/0050-fdt-Add-support-for-the-CONFIG_CMDLINE_EXTEND-option.patch5
1 files changed, 1 insertions, 4 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0050-fdt-Add-support-for-the-CONFIG_CMDLINE_EXTEND-option.patch b/target/linux/brcm2708/patches-4.4/0050-fdt-Add-support-for-the-CONFIG_CMDLINE_EXTEND-option.patch
index 815d3a7a1b..8dded00c2c 100644
--- a/target/linux/brcm2708/patches-4.4/0050-fdt-Add-support-for-the-CONFIG_CMDLINE_EXTEND-option.patch
+++ b/target/linux/brcm2708/patches-4.4/0050-fdt-Add-support-for-the-CONFIG_CMDLINE_EXTEND-option.patch
@@ -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