mx6cuboxi: Avoid calling setup_display() from SPL code

There is no need call setup_display() from SPL code, so move it to
board_init(), which executes only in U-Boot proper.

Reported-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
This commit is contained in:
Fabio Estevam 2017-09-22 23:45:31 -03:00 committed by Stefano Babic
parent 1b853e4793
commit ae40e82eef

View file

@ -308,13 +308,8 @@ int board_ehci_hcd_init(int port)
int board_early_init_f(void) int board_early_init_f(void)
{ {
int ret = 0;
setup_iomux_uart(); setup_iomux_uart();
#ifdef CONFIG_VIDEO_IPUV3
ret = setup_display();
#endif
#ifdef CONFIG_CMD_SATA #ifdef CONFIG_CMD_SATA
setup_sata(); setup_sata();
#endif #endif
@ -322,15 +317,21 @@ int board_early_init_f(void)
#ifdef CONFIG_USB_EHCI_MX6 #ifdef CONFIG_USB_EHCI_MX6
setup_usb(); setup_usb();
#endif #endif
return ret; return 0;
} }
int board_init(void) int board_init(void)
{ {
int ret = 0;
/* address of boot parameters */ /* address of boot parameters */
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; 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) static bool is_hummingboard(void)