Merge tag 'u-boot-imx-20220616' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
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
This commit is contained in:
@@ -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 " \
|
||||
|
||||
@@ -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 " \
|
||||
|
||||
Reference in New Issue
Block a user