From mboxrd@z Thu Jan 1 00:00:00 1970 From: Geert Uytterhoeven Subject: [PATCH 4/9] metag: Remove duplicate DT selection logic Date: Tue, 19 Nov 2013 12:12:29 +0100 Message-ID: <1384859554-27268-4-git-send-email-geert@linux-m68k.org> References: <5283A000.8090007@gmail.com> <1384859554-27268-1-git-send-email-geert@linux-m68k.org> Return-path: In-Reply-To: <1384859554-27268-1-git-send-email-geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Rob Herring Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Geert Uytterhoeven , James Hogan , linux-metag-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-arch.vger.kernel.org early_init_dt_scan() now takes care of falling back to the built-in DTB. Note that we now have to check ourselves whether original_cmd_line is a DTB or a command line, to keep command line append working. Signed-off-by: Geert Uytterhoeven Cc: James Hogan Cc: linux-metag-u79uwXL29TY76Z2rM5mHXA@public.gmane.org --- Untested due to lack of cross-compiler. arch/metag/kernel/setup.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/arch/metag/kernel/setup.c b/arch/metag/kernel/setup.c index 919c782f5479..e3ebfc5f5d77 100644 --- a/arch/metag/kernel/setup.c +++ b/arch/metag/kernel/setup.c @@ -221,6 +221,7 @@ static struct notifier_block metag_panic_block = { void __init setup_arch(char **cmdline_p) { + void *dt = NULL; unsigned long start_pfn; unsigned long text_start = (unsigned long)(&_stext); unsigned long cpu = smp_processor_id(); @@ -242,26 +243,27 @@ void __init setup_arch(char **cmdline_p) #endif /* try interpreting the argument as a device tree */ - machine_desc = setup_machine_fdt(original_cmd_line); - /* if it doesn't look like a device tree it must be a command line */ + if (original_cmd_line && + be32_to_cpup((__be32 *)original_cmd_line) == OF_DT_HEADER) { + dt = original_cmd_line; + original_cmd_line = NULL; + } + + machine_desc = setup_machine_fdt(dt); if (!machine_desc) { -#ifdef CONFIG_METAG_BUILTIN_DTB - /* try the embedded device tree */ - machine_desc = setup_machine_fdt(&__dtb_start); - if (!machine_desc) - panic("Invalid embedded device tree."); -#else /* use the default machine description */ machine_desc = default_machine_desc(); -#endif + } + #ifndef CONFIG_CMDLINE_FORCE + if (original_cmd_line) { /* append the bootloader cmdline to any builtin fdt cmdline */ if (boot_command_line[0] && original_cmd_line[0]) strlcat(boot_command_line, " ", COMMAND_LINE_SIZE); strlcat(boot_command_line, original_cmd_line, COMMAND_LINE_SIZE); -#endif } +#endif setup_meta_clocks(machine_desc->clocks); *cmdline_p = boot_command_line; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from georges.telenet-ops.be ([195.130.137.68]:34608 "EHLO georges.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752354Ab3KSLMp (ORCPT ); Tue, 19 Nov 2013 06:12:45 -0500 From: Geert Uytterhoeven Subject: [PATCH 4/9] metag: Remove duplicate DT selection logic Date: Tue, 19 Nov 2013 12:12:29 +0100 Message-ID: <1384859554-27268-4-git-send-email-geert@linux-m68k.org> In-Reply-To: <1384859554-27268-1-git-send-email-geert@linux-m68k.org> References: <5283A000.8090007@gmail.com> <1384859554-27268-1-git-send-email-geert@linux-m68k.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Rob Herring Cc: devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , James Hogan , linux-metag@vger.kernel.org Message-ID: <20131119111229.X8Blc_RejUqg7oQ3vUK8yFvsYVFRcsnqjRE-LhshZlE@z> early_init_dt_scan() now takes care of falling back to the built-in DTB. Note that we now have to check ourselves whether original_cmd_line is a DTB or a command line, to keep command line append working. Signed-off-by: Geert Uytterhoeven Cc: James Hogan Cc: linux-metag@vger.kernel.org --- Untested due to lack of cross-compiler. arch/metag/kernel/setup.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/arch/metag/kernel/setup.c b/arch/metag/kernel/setup.c index 919c782f5479..e3ebfc5f5d77 100644 --- a/arch/metag/kernel/setup.c +++ b/arch/metag/kernel/setup.c @@ -221,6 +221,7 @@ static struct notifier_block metag_panic_block = { void __init setup_arch(char **cmdline_p) { + void *dt = NULL; unsigned long start_pfn; unsigned long text_start = (unsigned long)(&_stext); unsigned long cpu = smp_processor_id(); @@ -242,26 +243,27 @@ void __init setup_arch(char **cmdline_p) #endif /* try interpreting the argument as a device tree */ - machine_desc = setup_machine_fdt(original_cmd_line); - /* if it doesn't look like a device tree it must be a command line */ + if (original_cmd_line && + be32_to_cpup((__be32 *)original_cmd_line) == OF_DT_HEADER) { + dt = original_cmd_line; + original_cmd_line = NULL; + } + + machine_desc = setup_machine_fdt(dt); if (!machine_desc) { -#ifdef CONFIG_METAG_BUILTIN_DTB - /* try the embedded device tree */ - machine_desc = setup_machine_fdt(&__dtb_start); - if (!machine_desc) - panic("Invalid embedded device tree."); -#else /* use the default machine description */ machine_desc = default_machine_desc(); -#endif + } + #ifndef CONFIG_CMDLINE_FORCE + if (original_cmd_line) { /* append the bootloader cmdline to any builtin fdt cmdline */ if (boot_command_line[0] && original_cmd_line[0]) strlcat(boot_command_line, " ", COMMAND_LINE_SIZE); strlcat(boot_command_line, original_cmd_line, COMMAND_LINE_SIZE); -#endif } +#endif setup_meta_clocks(machine_desc->clocks); *cmdline_p = boot_command_line; -- 1.7.9.5