Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH 3/4] MIPS: BMIPS: Remove special handling of
 CONFIG_MIPS_ELF_APPENDED_DTB=y
To:     Yasha Cherikovsky <yasha.che3@gmail.com>,
        Ralf Baechle <ralf@linux-mips.org>,
        Paul Burton <paul.burton@mips.com>,
        James Hogan <jhogan@kernel.org>, linux-mips@linux-mips.org
Cc:     Kevin Cernekee <cernekee@gmail.com>, linux-kernel@vger.kernel.org,
        Jonas Gorski <jonas.gorski@gmail.com>
References: <20180925180825.24659-1-yasha.che3@gmail.com>
 <20180925180825.24659-4-yasha.che3@gmail.com>
From:   Florian Fainelli <f.fainelli@gmail.com>
Message-ID: <27cf7925-71a1-42f1-db52-7598663edd65@gmail.com>
Date:   Tue, 25 Sep 2018 19:52:56 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101
 Thunderbird/60.0
MIME-Version: 1.0
In-Reply-To: <20180925180825.24659-4-yasha.che3@gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


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.che3@gmail.com>

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

> Cc: Kevin Cernekee <cernekee@gmail.com>
> Cc: Florian Fainelli <f.fainelli@gmail.com>
> 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
> ---
>   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