summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.4/0051-fdt-Add-support-for-the-CONFIG_CMDLINE_EXTEND-option.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2016-04-07 21:25:10 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2016-04-07 21:25:10 +0200
commita8d4d71c41ff0158c2026cac5981e39702167da9 (patch)
tree0c54ec3eb59f5bab6aa7318d14c92ff875412202 /target/linux/brcm2708/patches-4.4/0051-fdt-Add-support-for-the-CONFIG_CMDLINE_EXTEND-option.patch
parent59e0e88c22007fd77ee9c6c8e02a689889a5f597 (diff)
downloadmaster-31e0f0ae-a8d4d71c41ff0158c2026cac5981e39702167da9.tar.gz
master-31e0f0ae-a8d4d71c41ff0158c2026cac5981e39702167da9.tar.bz2
master-31e0f0ae-a8d4d71c41ff0158c2026cac5981e39702167da9.zip
brcm2708: update to latest version
As usual these patches were extracted from the raspberry pi repo: https://github.com/raspberrypi/linux/commits/rpi-4.4.y Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0051-fdt-Add-support-for-the-CONFIG_CMDLINE_EXTEND-option.patch')
-rw-r--r--target/linux/brcm2708/patches-4.4/0051-fdt-Add-support-for-the-CONFIG_CMDLINE_EXTEND-option.patch58
1 files changed, 0 insertions, 58 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0051-fdt-Add-support-for-the-CONFIG_CMDLINE_EXTEND-option.patch b/target/linux/brcm2708/patches-4.4/0051-fdt-Add-support-for-the-CONFIG_CMDLINE_EXTEND-option.patch
deleted file mode 100644
index 6103352b51..0000000000
--- a/target/linux/brcm2708/patches-4.4/0051-fdt-Add-support-for-the-CONFIG_CMDLINE_EXTEND-option.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From a251bf4a37d8fd468bc3ff853bcebe8ee452a31e Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Fri, 5 Dec 2014 17:26:26 +0000
-Subject: [PATCH 051/170] fdt: Add support for the CONFIG_CMDLINE_EXTEND option
-
----
- drivers/of/fdt.c | 29 ++++++++++++++++++++++++-----
- 1 file changed, 24 insertions(+), 5 deletions(-)
-
---- a/drivers/of/fdt.c
-+++ b/drivers/of/fdt.c
-@@ -954,22 +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
- * managed to set the command line, unless CONFIG_CMDLINE_FORCE
- * is set in which case we override whatever was found earlier.
-+ *
-+ * However, it can be useful to be able to treat the default as
-+ * a starting point to be extended using CONFIG_CMDLINE_EXTEND.
- */
-+ ((char *)data)[0] = '\0';
-+
- #ifdef CONFIG_CMDLINE
--#ifndef CONFIG_CMDLINE_FORCE
-- if (!((char *)data)[0])
-+ strlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
-+
-+ if (p != NULL && l > 0) {
-+#if defined(CONFIG_CMDLINE_EXTEND)
-+ int len = strlen(data);
-+ if (len > 0) {
-+ strlcat(data, " ", COMMAND_LINE_SIZE);
-+ len++;
-+ }
-+ strlcpy((char *)data + len, p, min((int)l, COMMAND_LINE_SIZE - len));
-+#elif defined(CONFIG_CMDLINE_FORCE)
-+ pr_warning("Ignoring bootargs property (using the default kernel command line)\n");
-+#else
-+ /* Neither extend nor force - just override */
-+ strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
- #endif
-- strlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
-+ }
-+#else /* CONFIG_CMDLINE */
-+ if (p != NULL && l > 0)
-+ strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
- #endif /* CONFIG_CMDLINE */
-
- pr_debug("Command line is: %s\n", (char*)data);