aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arc/kernel/setup.c
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2015-03-09 10:10:09 -0400
committerVineet Gupta <vgupta@synopsys.com>2015-06-19 08:39:27 -0400
commit036b2c5664281e7da5a89c9f742491f30966485f (patch)
treee9e75a0b1eac449927c2bae6a9c6887fdb22bcd3 /arch/arc/kernel/setup.c
parentfd1557923b2e45a7ff4664bd88311d8239d69ca9 (diff)
ARC: explicit'ify uboot support
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Diffstat (limited to 'arch/arc/kernel/setup.c')
-rw-r--r--arch/arc/kernel/setup.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index 5086c75681b5..c6e8b72ff293 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -319,13 +319,16 @@ static inline int is_kernel(unsigned long addr)
319 319
320void __init setup_arch(char **cmdline_p) 320void __init setup_arch(char **cmdline_p)
321{ 321{
322#ifdef CONFIG_ARC_UBOOT_SUPPORT
322 /* make sure that uboot passed pointer to cmdline/dtb is valid */ 323 /* make sure that uboot passed pointer to cmdline/dtb is valid */
323 if (uboot_tag && is_kernel((unsigned long)uboot_arg)) 324 if (uboot_tag && is_kernel((unsigned long)uboot_arg))
324 panic("Invalid uboot arg\n"); 325 panic("Invalid uboot arg\n");
325 326
326 /* See if u-boot passed an external Device Tree blob */ 327 /* See if u-boot passed an external Device Tree blob */
327 machine_desc = setup_machine_fdt(uboot_arg); /* uboot_tag == 2 */ 328 machine_desc = setup_machine_fdt(uboot_arg); /* uboot_tag == 2 */
328 if (!machine_desc) { 329 if (!machine_desc)
330#endif
331 {
329 /* No, so try the embedded one */ 332 /* No, so try the embedded one */
330 machine_desc = setup_machine_fdt(__dtb_start); 333 machine_desc = setup_machine_fdt(__dtb_start);
331 if (!machine_desc) 334 if (!machine_desc)