realtek: update platform support for 5.15
authorINAGAKI Hiroshi <musashino.open@gmail.com>
Wed, 1 Dec 2021 03:25:54 +0000 (12:25 +0900)
committerSander Vanheule <sander@svanheule.net>
Thu, 15 Dec 2022 19:52:40 +0000 (20:52 +0100)
- fw_passed_dtb and others were replaced to get_fdt() function[1]
- __appended_dtb defined by asm/bootinfo.h[2]

[1]: https://www.spinics.net/lists/linux-mips/msg03332.html
[2]: https://www.spinics.net/lists/linux-mips/msg03332.html

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
target/linux/realtek/files-5.15/arch/mips/rtl838x/prom.c
target/linux/realtek/files-5.15/arch/mips/rtl838x/setup.c

index dd1b2b170d310ef6f6a19d0191e09d59ff470a42..abf594aa0401863503ca7aaf0a25db5e1cc3cd93 100644 (file)
@@ -25,7 +25,6 @@
 #include <mach-rtl83xx.h>
 
 extern char arcs_cmdline[];
-extern const char __appended_dtb;
 
 struct rtl83xx_soc_info soc_info;
 const void *fdt;
index b4d415ab44268c2508895ec73431323fd447b40f..546b2fa2f813205211a79279457ff7a715a10da4 100644 (file)
@@ -35,11 +35,8 @@ void __init plat_mem_setup(void)
 
        set_io_port_base(KSEG1);
 
-       if (fw_passed_dtb) /* UHI interface */
-               dtb = (void *)fw_passed_dtb;
-       else if (&__dtb_start[0] != &__dtb_end[0])
-               dtb = (void *)__dtb_start;
-       else
+       dtb = get_fdt();
+       if (!dtb)
                panic("no dtb found");
 
        /*