ramips: 5.10: port and refresh patches, ralink drv

[openwrt/staging/rmilecki.git] / target / linux / ramips / patches-5.10 / 314-MIPS-add-bootargs-override-property.patch

diff --git a/target/linux/ramips/patches-5.10/314-MIPS-add-bootargs-override-property.patch b/target/linux/ramips/patches-5.10/314-MIPS-add-bootargs-override-property.patch
index c19a0fb4809f8603d42ebf343f4454dd478cd183..a5df046ba745a4251a4b8c9b18271fd1d353bd7a 100644 (file)
--- a/target/linux/ramips/patches-5.10/314-MIPS-add-bootargs-override-property.patch
+++ b/target/linux/ramips/patches-5.10/314-MIPS-add-bootargs-override-property.patch
@@ -17,9 +17,9 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 
 --- a/arch/mips/kernel/setup.c
 +++ b/arch/mips/kernel/setup.c
-@@ -571,8 +571,28 @@ static int __init bootcmdline_scan_chose
-       return 1;
- }
+@@ -542,8 +542,28 @@ static int __init bootcmdline_scan_chose
+ 
+ #endif /* CONFIG_OF_EARLY_FLATTREE */
  
 +static int __init bootcmdline_scan_chosen_override(unsigned long node, const char *uname,
 +                                                 int depth, void *data)
@@ -40,13 +40,13 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 +      return 1;
 +}
 +
- static void __init bootcmdline_init(char **cmdline_p)
+ static void __init bootcmdline_init(void)
  {
 +      bool dt_bootargs_override = false;
        bool dt_bootargs = false;
  
        /*
-@@ -586,6 +606,14 @@ static void __init bootcmdline_init(char
+@@ -557,6 +577,14 @@ static void __init bootcmdline_init(void
        }
  
        /*