Re: [PATCH 3/4] MIPS: BMIPS: Remove special handling of CONFIG_MIPS_ELF_APPENDED_DTB=y

[Florian Fainelli]

On 9/25/2018 11:08 AM, Yasha Cherikovsky wrote:

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

Signed-off-by: Yasha Cherikovsky <yasha.c...@gmail.com>

Reviewed-by: Florian Fainelli <f.faine...@gmail.com>

Cc: Kevin Cernekee <cerne...@gmail.com>
Cc: Florian Fainelli <f.faine...@gmail.com>
Cc: Ralf Baechle <r...@linux-mips.org>
Cc: Paul Burton <paul.bur...@mips.com>
Cc: James Hogan <jho...@kernel.org>
Cc: linux-m...@linux-mips.org
Cc: linux-kernel@vger.kernel.org
---
  arch/mips/bmips/setup.c | 9 +--------
  1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/arch/mips/bmips/setup.c b/arch/mips/bmips/setup.c
index 3b6f687f177c..b71b6eaaf7ed 100644
--- a/arch/mips/bmips/setup.c
+++ b/arch/mips/bmips/setup.c
@@ -153,8 +153,6 @@ void __init plat_time_init(void)
        mips_hpt_frequency = freq;
  }

-extern const char __appended_dtb;

-
  void __init plat_mem_setup(void)
  {
        void *dtb;
@@ -164,15 +162,10 @@ void __init plat_mem_setup(void)
        ioport_resource.start = 0;
        ioport_resource.end = ~0;

-#ifdef CONFIG_MIPS_ELF_APPENDED_DTB

-       if (!fdt_check_header(&__appended_dtb))
-               dtb = (void *)&__appended_dtb;
-       else
-#endif
        /* intended to somewhat resemble ARM; see Documentation/arm/Booting */
        if (fw_arg0 == 0 && fw_arg1 == 0xffffffff)
                dtb = phys_to_virt(fw_arg2);
-       else if (fw_passed_dtb) /* UHI interface */
+       else if (fw_passed_dtb) /* UHI interface or appended dtb */
                dtb = (void *)fw_passed_dtb;
        else if (__dtb_start != __dtb_end)
                dtb = (void *)__dtb_start;

--
Florian