diff options
| author | Vineet Gupta <vgupta@synopsys.com> | 2015-03-09 19:40:09 +0530 |
|---|---|---|
| committer | Vineet Gupta <vgupta@synopsys.com> | 2015-06-19 18:09:27 +0530 |
| commit | 036b2c5664281e7da5a89c9f742491f30966485f (patch) | |
| tree | e9e75a0b1eac449927c2bae6a9c6887fdb22bcd3 /arch/arc/kernel/setup.c | |
| parent | fd1557923b2e45a7ff4664bd88311d8239d69ca9 (diff) | |
| download | op-kernel-dev-036b2c5664281e7da5a89c9f742491f30966485f.zip op-kernel-dev-036b2c5664281e7da5a89c9f742491f30966485f.tar.gz | |
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.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c index 5086c75..c6e8b72 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) void __init setup_arch(char **cmdline_p) { +#ifdef CONFIG_ARC_UBOOT_SUPPORT /* make sure that uboot passed pointer to cmdline/dtb is valid */ if (uboot_tag && is_kernel((unsigned long)uboot_arg)) panic("Invalid uboot arg\n"); /* See if u-boot passed an external Device Tree blob */ machine_desc = setup_machine_fdt(uboot_arg); /* uboot_tag == 2 */ - if (!machine_desc) { + if (!machine_desc) +#endif + { /* No, so try the embedded one */ machine_desc = setup_machine_fdt(__dtb_start); if (!machine_desc) |
