summaryrefslogtreecommitdiff
path: root/arch/arm/mach-sunxi/board.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-05-08 15:44:44 -0400
committerTom Rini <trini@konsulko.com>2017-05-08 15:44:44 -0400
commita6d4cd4778bcc30f451f2d5d92ec4722ff5b71cc (patch)
treea20f104d8896941c598f2fcb61ce26c327959cd9 /arch/arm/mach-sunxi/board.c
parentee3c6532be343e495d11adfe15a457d24d9747d9 (diff)
parent5a49b2929c0c73e43470cc53b80a6dfa47b5efda (diff)
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/mach-sunxi/board.c')
-rw-r--r--arch/arm/mach-sunxi/board.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
index 4507279cc5..65b1ebd837 100644
--- a/arch/arm/mach-sunxi/board.c
+++ b/arch/arm/mach-sunxi/board.c
@@ -204,7 +204,9 @@ void s_init(void)
clock_init();
timer_init();
gpio_init();
+#ifndef CONFIG_DM_I2C
i2c_init_board();
+#endif
eth_init_board();
}