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 /board/socrates | |
| parent | 87861c1970d9e1c475e62304b8e249aa3edf8c39 (diff) | |
| download | u-boot-imx-7ffe3cd62e5af2cda1e18c6d896cab58bfb0c811.zip u-boot-imx-7ffe3cd62e5af2cda1e18c6d896cab58bfb0c811.tar.gz u-boot-imx-7ffe3cd62e5af2cda1e18c6d896cab58bfb0c811.tar.bz2 | |
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 'board/socrates')
| -rw-r--r-- | board/socrates/socrates.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c index 953a43f..8b34a80 100644 --- a/board/socrates/socrates.c +++ b/board/socrates/socrates.c @@ -217,7 +217,7 @@ int board_early_init_r (void) } #endif /* CONFIG_BOARD_EARLY_INIT_R */ -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) +#ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup(void *blob, bd_t *bd) { u32 val[12]; @@ -253,7 +253,7 @@ int ft_board_setup(void *blob, bd_t *bd) return 0; } -#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */ +#endif /* CONFIG_OF_BOARD_SETUP */ #define DEFAULT_BRIGHTNESS 25 #define BACKLIGHT_ENABLE (1 << 31) |