X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fhack-6.1%2F920-device_tree_cmdline.patch;h=cc384bb553baae25e9afb8cb33b86fb2a20671c0;hb=HEAD;hp=d1f36e716ed9bac812a61f535b40e9c920cfd648;hpb=fa79baf4a6e2306d60ac4968fdd8935e64c358ab;p=openwrt%2Fopenwrt.git

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 d1f36e716e..cc384bb553 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,13 +9,13 @@ 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)
- 		strlcpy(data, p, min(l, COMMAND_LINE_SIZE));
+ 		strscpy(cmdline, p, min(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));
++		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