diff options
| author | Tom Rini <trini@konsulko.com> | 2022-06-16 08:38:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-06-16 08:38:46 -0400 |
| commit | 9abfbef57f55f31e42940ac2a18ebccfb087e5c6 (patch) | |
| tree | 96a13568c13a7bffda05adb85cb5b7daabebc4ad /include | |
| parent | fd27812e520881d73bd97a2c034f3b5ecc361c4b (diff) | |
| parent | 1a558fafbbdff80cb6a7c8e883addec7f02fe8e5 (diff) | |
| download | u-boot-9abfbef57f55f31e42940ac2a18ebccfb087e5c6.zip u-boot-9abfbef57f55f31e42940ac2a18ebccfb087e5c6.tar.gz u-boot-9abfbef57f55f31e42940ac2a18ebccfb087e5c6.tar.bz2 | |
Merge tag 'u-boot-imx-20220616' of https://gitlab.denx.de/u-boot/custodians/u-boot-imxWIP/16Jun2022
u-boot-imx-20220616
-------------------
Fixes for 2022.07 + Toradex apalis-imx8 (missed in last PR)
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/12322
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/verdin-imx8mm.h | 4 | ||||
| -rw-r--r-- | include/configs/verdin-imx8mp.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index cd950ad..558b781 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -58,8 +58,8 @@ "fdt_board=dev\0" \ "initrd_addr=0x43800000\0" \ "initrd_high=0xffffffffffffffff\0" \ - "setup=setenv setupargs console=${console},${baudrate} " \ - "console=tty1 consoleblank=0 earlycon\0" \ + "setup=setenv setupargs console=tty1 console=${console},${baudrate} " \ + "consoleblank=0 earlycon\0" \ "update_uboot=askenv confirm Did you load flash.bin (y/N)?; " \ "if test \"$confirm\" = \"y\"; then " \ "setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \ diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h index 470f64d..52fa2be 100644 --- a/include/configs/verdin-imx8mp.h +++ b/include/configs/verdin-imx8mp.h @@ -75,7 +75,7 @@ "fdt_board=dev\0" \ "initrd_addr=0x43800000\0" \ "initrd_high=0xffffffffffffffff\0" \ - "setup=setenv setupargs console=${console},${baudrate} console=tty1 " \ + "setup=setenv setupargs console=tty1 console=${console},${baudrate} " \ "consoleblank=0 earlycon\0" \ "update_uboot=askenv confirm Did you load flash.bin (y/N)?; " \ "if test \"$confirm\" = \"y\"; then " \ |