diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2016-06-22 14:54:30 +0200 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-06-22 14:54:30 +0200 |
| commit | b6baab7f565bf1bcae8eee9a0b1b4105f8b992f8 (patch) | |
| tree | 034c06e420ad1a55cc6c9ea3b11bd64d46a6ef0f /target/linux/brcm2708/patches-4.4 | |
| parent | 9cc73342cdb8e006df8cfcf669041c5e24ae08fb (diff) | |
| download | master-187ad058-b6baab7f565bf1bcae8eee9a0b1b4105f8b992f8.tar.gz master-187ad058-b6baab7f565bf1bcae8eee9a0b1b4105f8b992f8.tar.bz2 master-187ad058-b6baab7f565bf1bcae8eee9a0b1b4105f8b992f8.zip | |
brcm2708: fix build error introduced with SUBTARGET checks
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4')
| -rw-r--r-- | target/linux/brcm2708/patches-4.4/0050-fdt-Add-support-for-the-CONFIG_CMDLINE_EXTEND-option.patch | 5 |
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 |