pkgs/kernel/mips-malta-fdt-from-bootloader.patch

@@ -1,15 +1,18 @@
 diff --git a/arch/mips/mti-malta/malta-setup.c b/arch/mips/mti-malta/malta-setup.c
-index 21cb3ac1237b..52e731f9b4e2 100644
+index 21cb3ac1237b..f11409ae9583 100644
 --- a/arch/mips/mti-malta/malta-setup.c
 +++ b/arch/mips/mti-malta/malta-setup.c
-@@ -192,7 +192,9 @@ static void __init bonito_quirks_setup(void)
+@@ -192,7 +192,12 @@ static void __init bonito_quirks_setup(void)
  
  void __init *plat_get_fdt(void)
  {
 -	return (void *)__dtb_start;
-+	return (fw_arg0 == -2) ?
++    void *r=0;
-+		(void *) (KSEG1ADDR(fw_arg1)) :
++    if(fw_arg0 == -2)
-+		(void *) __dtb_start;
++	r = (void *) KSEG1ADDR(fw_arg1);
++    else
++	r = (void *)  __dtb_start;
++    return r;
  }
  
  void __init plat_mem_setup(void)

tests/tftpboot/script.expect

@@ -15,7 +15,6 @@ close $fh
 
 expect {
    "s6-linux-init" { exit 0 }
-   "Reserved memory: unsupported node format, ignoring" { exit 1 }
    timeout { exit 1 }
 }