diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-18 18:00:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-18 18:00:05 -0400 |
| commit | 5c3cd8e2e1f956b74cbf6f145db6db518241a113 (patch) | |
| tree | bc2c4525366d4b8d5e1036f50c324907e21581f4 | |
| parent | 717e779f6e2e14a876e5965a455604ab966f1f26 (diff) | |
| parent | 1099b2abef35c3c887f6afac1a8ef18c7924d5d2 (diff) | |
| download | u-boot-5c3cd8e2e1f956b74cbf6f145db6db518241a113.tar.gz | |
Merge tag 'fixes-for-v2020.07-rc4' of https://gitlab.denx.de/u-boot/custodians/u-boot-video
- fix stdout in default environment for apalis_imx6, colibri_imx6
and cm_fx6 boards
| -rw-r--r-- | include/configs/apalis_imx6.h | 3 | ||||
| -rw-r--r-- | include/configs/cm_fx6.h | 4 | ||||
| -rw-r--r-- | include/configs/colibri_imx6.h | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index d5a0625e02..6fc7c3982c 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -169,7 +169,8 @@ BOOTENV \ "bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \ "usb start ; " \ - "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ + "setenv stdout serial,vidconsole; " \ + "setenv stdin serial,usbkbd\0" \ "boot_file=zImage\0" \ "console=ttymxc0\0" \ "defargs=enable_wait_mode=off vmalloc=400M\0" \ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 302907dcfb..35f251c15e 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -49,8 +49,8 @@ "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ "fdtfile=undefined\0" \ "stdin=serial,usbkbd\0" \ - "stdout=serial,vga\0" \ - "stderr=serial,vga\0" \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" \ "panel=HDMI\0" \ "autoload=no\0" \ "uImage=uImage-cm-fx6\0" \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 6beef25094..0a52a701c6 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -152,7 +152,8 @@ BOOTENV \ "bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd; " \ "usb start ; " \ - "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ + "setenv stdout serial,vidconsole; " \ + "setenv stdin serial,usbkbd\0" \ "boot_file=zImage\0" \ "console=ttymxc0\0" \ "defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \ |