summaryrefslogtreecommitdiffstats
path: root/board/davedenx/aria/aria.c
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2016-05-19 15:23:12 -0400
committerTom Rini <trini@konsulko.com>2016-05-27 15:41:16 -0400
commit7ffe3cd62e5af2cda1e18c6d896cab58bfb0c811 (patch)
treed9ded0ff0acde3e3a3dc469087d7590e627de4e3 /board/davedenx/aria/aria.c
parent87861c1970d9e1c475e62304b8e249aa3edf8c39 (diff)
downloadtalos-obmc-uboot-7ffe3cd62e5af2cda1e18c6d896cab58bfb0c811.tar.gz
talos-obmc-uboot-7ffe3cd62e5af2cda1e18c6d896cab58bfb0c811.zip
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/davedenx/aria/aria.c')
-rw-r--r--board/davedenx/aria/aria.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/davedenx/aria/aria.c b/board/davedenx/aria/aria.c
index a15a9edac4..1b6c40f8d5 100644
--- a/board/davedenx/aria/aria.c
+++ b/board/davedenx/aria/aria.c
@@ -106,11 +106,11 @@ int checkboard (void)
return 0;
}
-#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
+#ifdef CONFIG_OF_BOARD_SETUP
int ft_board_setup(void *blob, bd_t *bd)
{
ft_cpu_setup(blob, bd);
return 0;
}
-#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
+#endif /* CONFIG_OF_BOARD_SETUP */
OpenPOWER on IntegriCloud