From: Fabio Estevam Date: Mon, 4 May 2015 17:09:23 +0000 (-0300) Subject: mx6cuboxi: Skip usb initialization when booting without HDMI X-Git-Tag: v2015.07-rc2~170 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0e1f991efb85520590fba6ad7955116a7bd499d4;p=u-boot mx6cuboxi: Skip usb initialization when booting without HDMI Starting USB initialization is useful for those who use Cuboxi/Hummingboard with HDMI and USB keyboard. However, when booting without a HDMI connection we can skip the usb initialization, which makes the boot faster. Signed-off-by: Jon Nettleton Signed-off-by: Fabio Estevam Tested-By: Vagrant Cascadian --- diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 4e07f59bef..b6f9d4e580 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -80,6 +80,7 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IMX_HDMI +#define CONFIG_CMD_HDMIDETECT #define CONFIG_IMX_VIDEO_SKIP #define CONFIG_CONSOLE_MUX @@ -94,7 +95,17 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_USB_KEYBOARD #define CONFIG_SYS_USB_EVENT_POLL -#define CONFIG_PREBOOT "usb start" +#define CONFIG_PREBOOT \ + "if hdmidet; then " \ + "usb start; " \ + "setenv stdin serial,usbkbd; "\ + "setenv stdout serial,vga; " \ + "setenv stderr serial,vga; " \ + "else " \ + "setenv stdin serial; " \ + "setenv stdout serial; " \ + "setenv stderr serial; " \ + "fi;" #define CONFIG_SYS_NO_FLASH @@ -117,9 +128,6 @@ #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ - "stdin=serial,usbkbd\0" \ - "stdout=serial,vga\0" \ - "stderr=serial,vga\0" \ "script=boot.scr\0" \ "image=zImage\0" \ "fdtfile=undefined\0" \