From: Florian Fainelli <f.fainelli@gmail.com>
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>
Subject: Re: [PATCH 3/4] MIPS: BMIPS: Remove special handling of CONFIG_MIPS_ELF_APPENDED_DTB=y
Date: Tue, 25 Sep 2018 19:52:56 -0700 [thread overview]
Message-ID: <27cf7925-71a1-42f1-db52-7598663edd65@gmail.com> (raw)
In-Reply-To: <20180925180825.24659-4-yasha.che3@gmail.com>
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
next prev parent reply other threads:[~2018-09-26 2:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-25 18:08 [PATCH 0/4] MIPS: Simplify ELF appended dtb handling Yasha Cherikovsky
2018-09-25 18:08 ` [PATCH 1/4] MIPS/head: Add comments after #endif and #else Yasha Cherikovsky
2018-09-25 18:08 ` [PATCH 2/4] MIPS/head: Store ELF appended dtb in a global variable too Yasha Cherikovsky
2018-09-25 18:08 ` [PATCH 3/4] MIPS: BMIPS: Remove special handling of CONFIG_MIPS_ELF_APPENDED_DTB=y Yasha Cherikovsky
2018-09-26 2:52 ` Florian Fainelli [this message]
2018-09-25 18:08 ` [PATCH 4/4] MIPS: Octeon: " Yasha Cherikovsky
2018-09-26 20:36 ` [PATCH 0/4] MIPS: Simplify ELF appended dtb handling Paul Burton
2018-09-26 20:52 ` Yasha Cherikovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=27cf7925-71a1-42f1-db52-7598663edd65@gmail.com \
--to=f.fainelli@gmail.com \
--cc=cernekee@gmail.com \
--cc=jhogan@kernel.org \
--cc=jonas.gorski@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=paul.burton@mips.com \
--cc=ralf@linux-mips.org \
--cc=yasha.che3@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®