mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-03 22:44:27 -05:00 
			
		
		
		
	kernel: move bootargs-append patch to generic
This moves bootargs-append support patch from ipq40xx and ipq806x to generic. This way we can append additional boot arguments from DTS instead of only being able to overwrite them. This is a preparation for kirkwood support of ipTIME NAS1. Signed-off-by: Sungbo Eo <mans0n@gorani.run>
This commit is contained in:
		
							parent
							
								
									536a8021c3
								
							
						
					
					
						commit
						81a561b4a6
					
				@ -1,6 +1,6 @@
 | 
			
		||||
--- a/drivers/of/fdt.c
 | 
			
		||||
+++ b/drivers/of/fdt.c
 | 
			
		||||
@@ -1055,6 +1055,9 @@ int __init early_init_dt_scan_chosen(uns
 | 
			
		||||
@@ -1059,6 +1059,9 @@ int __init early_init_dt_scan_chosen(uns
 | 
			
		||||
 	p = of_get_flat_dt_prop(node, "bootargs", &l);
 | 
			
		||||
 	if (p != NULL && l > 0)
 | 
			
		||||
 		strlcpy(data, p, min(l, COMMAND_LINE_SIZE));
 | 
			
		||||
@ -8,5 +8,5 @@
 | 
			
		||||
+	if (p != NULL && l > 0)
 | 
			
		||||
+		strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
 | 
			
		||||
 
 | 
			
		||||
     /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different
 | 
			
		||||
      * device tree option of chosen/bootargs-override. This is
 | 
			
		||||
 	/*
 | 
			
		||||
 	 * CONFIG_CMDLINE is meant to be a default in case nothing else
 | 
			
		||||
@ -17,9 +17,9 @@
 | 
			
		||||
 	default ""
 | 
			
		||||
--- a/drivers/of/fdt.c
 | 
			
		||||
+++ b/drivers/of/fdt.c
 | 
			
		||||
@@ -1056,6 +1056,17 @@ int __init early_init_dt_scan_chosen(uns
 | 
			
		||||
@@ -1059,6 +1059,17 @@ int __init early_init_dt_scan_chosen(uns
 | 
			
		||||
 	if (p != NULL && l > 0)
 | 
			
		||||
 		strlcpy(data, p, min(l, COMMAND_LINE_SIZE));
 | 
			
		||||
 		strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
 | 
			
		||||
 
 | 
			
		||||
+    /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different
 | 
			
		||||
+     * device tree option of chosen/bootargs-override. This is
 | 
			
		||||
 | 
			
		||||
@ -17,9 +17,9 @@
 | 
			
		||||
 	help
 | 
			
		||||
--- a/drivers/of/fdt.c
 | 
			
		||||
+++ b/drivers/of/fdt.c
 | 
			
		||||
@@ -1056,6 +1056,17 @@ int __init early_init_dt_scan_chosen(uns
 | 
			
		||||
@@ -1059,6 +1059,17 @@ int __init early_init_dt_scan_chosen(uns
 | 
			
		||||
 	if (p != NULL && l > 0)
 | 
			
		||||
 		strlcpy(data, p, min(l, COMMAND_LINE_SIZE));
 | 
			
		||||
 		strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
 | 
			
		||||
 
 | 
			
		||||
+    /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different
 | 
			
		||||
+     * device tree option of chosen/bootargs-override. This is
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user