diff options
| author | Tom Rini <trini@konsulko.com> | 2022-06-20 14:40:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-06-20 14:40:59 -0400 |
| commit | 52af0101be55da74a32e9b169864508101f886fe (patch) | |
| tree | 0027962a3a4e43a1e29fa7411934501b75fe811b /include/configs/verdin-imx8mm.h | |
| parent | 78533a1ce87786d2ba9be70e657b09cded1267e1 (diff) | |
| parent | 568a226f87655fd5339514f66413c2ad72f65d6f (diff) | |
| download | u-boot-52af0101be55da74a32e9b169864508101f886fe.zip u-boot-52af0101be55da74a32e9b169864508101f886fe.tar.gz u-boot-52af0101be55da74a32e9b169864508101f886fe.tar.bz2 | |
Merge branch 'master' into next
Merge in v2022.07-rc5.
Diffstat (limited to 'include/configs/verdin-imx8mm.h')
| -rw-r--r-- | include/configs/verdin-imx8mm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index afc507b..19c16df 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -50,8 +50,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 " \ |