MIPS: Octeon: Remove special handling of CONFIG_MIPS_ELF_APPENDED_DTB=y

The ELF appended dtb can be accessed now via 'fw_passed_dtb'.

Since raw appended dtb is accessed via that variable too,
this now effectively allows to boot with CONFIG_MIPS_RAW_APPENDED_DTB=y
on Octeon.

Signed-off-by: Yasha Cherikovsky <yasha.che3@gmail.com>
[paul.burton@mips.com: Fix trivial __dtb_octeon_*_begin conflict]
Signed-off-by: Paul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/20805/
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@mips.com>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org

diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index c2426232db0646108ba8443f620872a2e5273cd1..dfb95cffef3e2c5f37b680939162572730de7df8 100644 (file)
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -1161,15 +1161,12 @@ void __init device_tree_init(void)
        bool do_prune;
        bool fill_mac;
 
-#ifdef CONFIG_MIPS_ELF_APPENDED_DTB
-       if (!fdt_check_header(&__appended_dtb)) {
-               fdt = &__appended_dtb;
+       if (fw_passed_dtb) {
+               fdt = (void *)fw_passed_dtb;
                do_prune = false;
                fill_mac = true;
                pr_info("Using appended Device Tree.\n");
-       } else
-#endif
-       if (octeon_bootinfo->minor_version >= 3 && octeon_bootinfo->fdt_addr) {
+       } else if (octeon_bootinfo->minor_version >= 3 && octeon_bootinfo->fdt_addr) {
                fdt = phys_to_virt(octeon_bootinfo->fdt_addr);
                if (fdt_check_header(fdt))
                        panic("Corrupt Device Tree passed to kernel.");