diff options
author | Robert P. J. Day <rpjday@crashcourse.ca> | 2016-05-19 15:23:12 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-05-27 15:41:16 -0400 |
commit | 7ffe3cd62e5af2cda1e18c6d896cab58bfb0c811 (patch) | |
tree | d9ded0ff0acde3e3a3dc469087d7590e627de4e3 /arch/nios2 | |
parent | 87861c1970d9e1c475e62304b8e249aa3edf8c39 (diff) |
Delete tests of CONFIG_OF_LIBFDT when testing CONFIG_OF_BOARD_SETUP
Since CONFIG_OF_BOARD_SETUP depends on CONFIG_OF_LIBFDT:
config OF_BOARD_SETUP
bool "Set up board-specific details in device tree before boot"
depends on OF_LIBFDT
...
remove superfluous tests of CONFIG_OF_LIBFDT when testing for
CONFIG_OF_BOARD_SETUP.
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
[trini: Typo fix: s/ifdefi/ifdef/]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/nios2')
-rw-r--r-- | arch/nios2/cpu/fdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/nios2/cpu/fdt.c b/arch/nios2/cpu/fdt.c index 79f72aa12f..a44f51a7f2 100644 --- a/arch/nios2/cpu/fdt.c +++ b/arch/nios2/cpu/fdt.c @@ -12,7 +12,7 @@ #include <common.h> -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) +#ifdef CONFIG_OF_BOARD_SETUP #include <libfdt.h> #include <fdt_support.h> @@ -35,4 +35,4 @@ void ft_cpu_setup(void *blob, bd_t *bd) */ fdt_fixup_ethernet(blob); } -#endif /* CONFIG_OF_LIBFDT && CONFIG_OF_BOARD_SETUP */ +#endif /* CONFIG_OF_BOARD_SETUP */ |