diff options
author | Tom Rini <trini@konsulko.com> | 2016-09-09 09:45:32 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-09-09 09:45:32 -0400 |
commit | 16f416661ec5ffa46b3f879a0b83907bbec13714 (patch) | |
tree | 4674f10254e3d773b39a21552c108214795dddec /include/configs/tbs2910.h | |
parent | 01c5075506afcb7a74e0db8600af8979f45881b5 (diff) | |
parent | d4ee5043f36e7a418c3fb5be2e76eb5f6ee2cd9f (diff) | |
download | u-boot-16f416661ec5ffa46b3f879a0b83907bbec13714.tar.gz |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'include/configs/tbs2910.h')
-rw-r--r-- | include/configs/tbs2910.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index ec0bf05084..640bce4b0a 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -129,9 +129,9 @@ #define CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE #define CONFIG_SYS_STDIO_DEREGISTER #define CONFIG_PREBOOT \ + "usb start; " \ "if hdmidet; then " \ - "usb start; " \ - "run set_con_usb_hdmi; " \ + "run set_con_hdmi; " \ "else " \ "run set_con_serial; " \ "fi;" @@ -181,12 +181,13 @@ "bootm 0x10800000 0x10d00000\0" \ "console=ttymxc0\0" \ "fan=gpio set 92\0" \ - "set_con_serial=setenv stdin serial; " \ - "setenv stdout serial; " \ + "set_con_serial=setenv stdout serial; " \ "setenv stderr serial;\0" \ - "set_con_usb_hdmi=setenv stdin serial,usbkbd; " \ - "setenv stdout serial,vga; " \ - "setenv stderr serial,vga;\0" + "set_con_hdmi=setenv stdout serial,vga; " \ + "setenv stderr serial,vga;\0" \ + "stderr=serial,vga;\0" \ + "stdin=serial,usbkbd;\0" \ + "stdout=serial,vga;\0" #define CONFIG_BOOTCOMMAND \ "mmc rescan; " \ |