aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-6.1/920-device_tree_cmdline.patch
diff options
context:
space:
mode:
authorChristian Marangi <ansuelsmth@gmail.com>2023-05-22 18:07:13 +0200
committerChristian Marangi <ansuelsmth@gmail.com>2023-05-22 22:28:16 +0200
commitaa56d00aa624ffdc3ed839300d1284f890d31bf7 (patch)
treed207f91c716db1bdcf10d5aa04e21122a44b979c /target/linux/generic/hack-6.1/920-device_tree_cmdline.patch
parentf79af593830ef766f54e7931a0fad28134ae44c9 (diff)
downloadupstream-aa56d00aa624ffdc3ed839300d1284f890d31bf7.tar.gz
upstream-aa56d00aa624ffdc3ed839300d1284f890d31bf7.tar.bz2
upstream-aa56d00aa624ffdc3ed839300d1284f890d31bf7.zip
generic: 6.1: refresh hack patches
Refresh hack patches with make target/linux/refresh. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/hack-6.1/920-device_tree_cmdline.patch')
-rw-r--r--target/linux/generic/hack-6.1/920-device_tree_cmdline.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-6.1/920-device_tree_cmdline.patch b/target/linux/generic/hack-6.1/920-device_tree_cmdline.patch
index 2722266722e..cc384bb553b 100644
--- a/target/linux/generic/hack-6.1/920-device_tree_cmdline.patch
+++ b/target/linux/generic/hack-6.1/920-device_tree_cmdline.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] of/ftd: add device tree cmdline
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
-@@ -1158,6 +1158,9 @@ int __init early_init_dt_scan_chosen(uns
+@@ -1183,6 +1183,9 @@ int __init early_init_dt_scan_chosen(cha
p = of_get_flat_dt_prop(node, "bootargs", &l);
if (p != NULL && l > 0)
strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));
@@ -17,5 +17,5 @@ Subject: [PATCH] of/ftd: add device tree cmdline
+ if (p != NULL && l > 0)
+ strlcat(cmdline, p, min_t(int, strlen(cmdline) + (int)l, COMMAND_LINE_SIZE));
+ handle_cmdline:
/*
- * CONFIG_CMDLINE is meant to be a default in case nothing else