Commit e524c788 authored by Yasha Cherikovsky's avatar Yasha Cherikovsky Committed by Paul Burton

MIPS: BMIPS: Remove special handling of CONFIG_MIPS_ELF_APPENDED_DTB=y

The ELF appended dtb can be accessed now via 'fw_passed_dtb'.
Signed-off-by: default avatarYasha Cherikovsky <yasha.che3@gmail.com>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/20804/
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
parent c55213ea
...@@ -153,8 +153,6 @@ void __init plat_time_init(void) ...@@ -153,8 +153,6 @@ void __init plat_time_init(void)
mips_hpt_frequency = freq; mips_hpt_frequency = freq;
} }
extern const char __appended_dtb;
void __init plat_mem_setup(void) void __init plat_mem_setup(void)
{ {
void *dtb; void *dtb;
...@@ -164,15 +162,10 @@ void __init plat_mem_setup(void) ...@@ -164,15 +162,10 @@ void __init plat_mem_setup(void)
ioport_resource.start = 0; ioport_resource.start = 0;
ioport_resource.end = ~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 */ /* intended to somewhat resemble ARM; see Documentation/arm/Booting */
if (fw_arg0 == 0 && fw_arg1 == 0xffffffff) if (fw_arg0 == 0 && fw_arg1 == 0xffffffff)
dtb = phys_to_virt(fw_arg2); 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; dtb = (void *)fw_passed_dtb;
else if (__dtb_start != __dtb_end) else if (__dtb_start != __dtb_end)
dtb = (void *)__dtb_start; dtb = (void *)__dtb_start;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment