mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 18:30:06 +00:00
MIPS: ingenic: Add support for appended devicetree
Add support for booting the kernel from an externally-appended devicetree, if no devicetree was built-in. Signed-off-by: Paul Cercueil <paul@crapouillou.net> Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: James Hogan <jhogan@kernel.org> Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org
This commit is contained in:
parent
69a07a41d9
commit
15205fc054
2 changed files with 11 additions and 5 deletions
|
@ -390,7 +390,7 @@ config MACH_INGENIC
|
|||
select GPIOLIB
|
||||
select COMMON_CLK
|
||||
select GENERIC_IRQ_CHIP
|
||||
select BUILTIN_DTB
|
||||
select BUILTIN_DTB if MIPS_NO_APPENDED_DTB
|
||||
select USE_OF
|
||||
select LIBFDT
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
|
||||
#define JZ4740_EMC_SDRAM_CTRL 0x80
|
||||
|
||||
|
||||
static void __init jz4740_detect_mem(void)
|
||||
{
|
||||
void __iomem *jz_emc_base;
|
||||
|
@ -66,15 +65,22 @@ static unsigned long __init get_board_mach_type(const void *fdt)
|
|||
void __init plat_mem_setup(void)
|
||||
{
|
||||
int offset;
|
||||
void *dtb;
|
||||
|
||||
jz4740_reset_init();
|
||||
__dt_setup_arch(__dtb_start);
|
||||
|
||||
offset = fdt_path_offset(__dtb_start, "/memory");
|
||||
if (__dtb_start != __dtb_end)
|
||||
dtb = __dtb_start;
|
||||
else
|
||||
dtb = (void *)fw_passed_dtb;
|
||||
|
||||
__dt_setup_arch(dtb);
|
||||
|
||||
offset = fdt_path_offset(dtb, "/memory");
|
||||
if (offset < 0)
|
||||
jz4740_detect_mem();
|
||||
|
||||
mips_machtype = get_board_mach_type(__dtb_start);
|
||||
mips_machtype = get_board_mach_type(dtb);
|
||||
}
|
||||
|
||||
void __init device_tree_init(void)
|
||||
|
|
Loading…
Reference in a new issue