| Message ID | 20190620225754.1685-1-jstefek@datto.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | Chuanhong Guo |
| Headers | show |
| Series | [OpenWrt-Devel] ramips: Don't override the bootloader cmdline args if none are provided in dtb | expand |
Hi! On Fri, Jun 21, 2019 at 6:58 AM <jstefek@datto.com> wrote: > > From: Joe Stefek <jstefek@datto.com> > > This change allows cmdline arguments provided by the bootloader to be used > if no cmdline arguments are provided in the "custom" section of the device > tree. I've dropped the entire prom-fixes patch two weeks ago [0] and I guess we don't need this fix anymore :) Regards, Chuanhong Guo [0] https://git.openwrt.org/7a8d3432c739c6ff038295176e8b6324e92fc116
Agreed, we can drop this. Thanks, Joe On Mon, Jul 15, 2019 at 8:14 AM Chuanhong Guo <gch981213@gmail.com> wrote: > Hi! > > On Fri, Jun 21, 2019 at 6:58 AM <jstefek@datto.com> wrote: > > > > From: Joe Stefek <jstefek@datto.com> > > > > This change allows cmdline arguments provided by the bootloader to be > used > > if no cmdline arguments are provided in the "custom" section of the > device > > tree. > > I've dropped the entire prom-fixes patch two weeks ago [0] and I guess > we don't need this fix anymore :) > > Regards, > Chuanhong Guo > > [0] https://git.openwrt.org/7a8d3432c739c6ff038295176e8b6324e92fc116 > >
diff --git a/target/linux/ramips/patches-4.14/0100-prom_fixes.patch b/target/linux/ramips/patches-4.14/0100-prom_fixes.patch index 91ac3b22c4..ae42e72070 100644 --- a/target/linux/ramips/patches-4.14/0100-prom_fixes.patch +++ b/target/linux/ramips/patches-4.14/0100-prom_fixes.patch @@ -39,19 +39,21 @@ Signed-off-by: John Crispin <blogic@openwrt.org> void __init plat_mem_setup(void) { void *dtb = NULL; -@@ -82,7 +95,11 @@ void __init plat_mem_setup(void) +@@ -82,9 +95,11 @@ void __init plat_mem_setup(void) else if (__dtb_start != __dtb_end) dtb = (void *)__dtb_start; - __dt_setup_arch(dtb); +- +- strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE); + __dt_setup_arch(&__image_dtb); + + of_scan_flat_dt(early_init_dt_find_chosen, NULL); + if (chosen_dtb) + strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE); - strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE); - + of_scan_flat_dt(early_init_dt_find_memory, NULL); + if (memory_dtb) --- a/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S @@ -85,6 +85,9 @@ EXPORT(__image_cmdline)
From: Joe Stefek <jstefek@datto.com> This change allows cmdline arguments provided by the bootloader to be used if no cmdline arguments are provided in the "custom" section of the device tree. --- target/linux/ramips/patches-4.14/0100-prom_fixes.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)