diff options
| author | Tom Rini <[email protected]> | 2020-12-28 07:44:03 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-12-28 07:44:03 -0500 |
| commit | ab865a8ee5c1a069f72a171270c02c99ccda7bfa (patch) | |
| tree | b4ac4a8519bc0128f12de2a13a8311c0f845f5b5 /include/configs | |
| parent | 1c3d1aa00617dbbdd92f0d5a2df40d7784dfcc13 (diff) | |
| parent | 26c7048dd9d04158a23e9dbfe3f0dccc4febcaed (diff) | |
Merge tag 'u-boot-imx-20201227' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Fixes for 2021.1
----------------
CI: https://gitlab.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/5680
- fixes for Variscite dart6ul
- imx8mp : increase malloc area
- fixes for bx50v3
- imx8m: HS400ES and UHS for EVK
- imx8qm-rom7720: fix phy bind
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/ge_bx50v3.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index e5c580b3f91..2d854af9a06 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -62,7 +62,7 @@ "networkboot=" \ "run setnetworkboot; " \ "nfs ${loadaddr} /srv/nfs/fitImage; " \ - "bootm ${loadaddr}#conf@${confidx}\0" \ + "bootm ${loadaddr}\0" \ #define CONFIG_NETWORKBOOTCOMMAND \ "run networkboot; " \ @@ -111,7 +111,7 @@ "doboot=" \ "echo Booting from ${dev}:${devnum}:${partnum} ...; " \ "run setargs; " \ - "bootm ${loadaddr}#conf@${confidx}\0" \ + "bootm ${loadaddr}\0" \ "tryboot=" \ "setenv partnum 1; run hasfirstboot || setenv partnum 2; " \ "run loadimage || run swappartitions && run loadimage || " \ |