Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / board / solidrun / mx6cuboxi / mx6cuboxi.c

diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index 1e4da4a6b1674c4b38fbc217977a919f3bb136ce..ee9e4f7c01ebf0a1088c1bb0a32e109a84596fa9 100644 (file)
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -308,13 +308,8 @@ int board_ehci_hcd_init(int port)
 
 int board_early_init_f(void)
 {
-       int ret = 0;
        setup_iomux_uart();
 
-#ifdef CONFIG_VIDEO_IPUV3
-       ret = setup_display();
-#endif
-
 #ifdef CONFIG_CMD_SATA
        setup_sata();
 #endif
@@ -322,15 +317,21 @@ int board_early_init_f(void)
 #ifdef CONFIG_USB_EHCI_MX6
        setup_usb();
 #endif
-       return ret;
+       return 0;
 }
 
 int board_init(void)
 {
+       int ret = 0;
+
        /* address of boot parameters */
        gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 
-       return 0;
+#ifdef CONFIG_VIDEO_IPUV3
+       ret = setup_display();
+#endif
+
+       return ret;
 }
 
 static bool is_hummingboard(void)