summaryrefslogtreecommitdiff
path: root/arch/x86/lib/board.c
diff options
context:
space:
mode:
authorGabe Black <gabeblack@chromium.org>2012-11-03 11:41:30 +0000
committerSimon Glass <sjg@chromium.org>2012-12-06 14:30:42 -0800
commitb208c7f1d05c304e0dd27b7278ffb00e4af8e26e (patch)
tree13a7921062205b802b4919634091297d5635d47d /arch/x86/lib/board.c
parent05b71646a93839ad6fb1073f5e25ead928c1717d (diff)
downloadu-boot-imx-b208c7f1d05c304e0dd27b7278ffb00e4af8e26e.zip
u-boot-imx-b208c7f1d05c304e0dd27b7278ffb00e4af8e26e.tar.gz
u-boot-imx-b208c7f1d05c304e0dd27b7278ffb00e4af8e26e.tar.bz2
x86: Add support for CONFIG_OF_CONTROL
Allow a device tree to be provided through the standard mechanisms. Signed-off-by: Gabe Black <gabeblack@google.com> Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86/lib/board.c')
-rw-r--r--arch/x86/lib/board.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
index 2ffe061..22bc26d 100644
--- a/arch/x86/lib/board.c
+++ b/arch/x86/lib/board.c
@@ -99,10 +99,17 @@ typedef int (init_fnc_t) (void);
init_fnc_t *init_sequence_f[] = {
cpu_init_f,
board_early_init_f,
+#ifdef CONFIG_OF_CONTROL
+ find_fdt,
+ fdtdec_check_fdt,
+#endif
env_init,
init_baudrate_f,
serial_init,
console_init_f,
+#ifdef CONFIG_OF_CONTROL
+ prepare_fdt,
+#endif
dram_init_f,
calculate_relocation_address,