diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-07 12:00:26 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-07 12:00:26 -0500 |
| commit | 2a4b89a8ff69c3bbc7a2798e8b195d5489be95c1 (patch) | |
| tree | ece888360d0df99426f745442211d3541ca970f2 /configs | |
| parent | 5fec3c853d5e6b998db66f586871839c408195a3 (diff) | |
| parent | 0cc183025f6ca1106bc68973d0b4f6bd1b319950 (diff) | |
| download | u-boot-2a4b89a8ff69c3bbc7a2798e8b195d5489be95c1.zip u-boot-2a4b89a8ff69c3bbc7a2798e8b195d5489be95c1.tar.gz u-boot-2a4b89a8ff69c3bbc7a2798e8b195d5489be95c1.tar.bz2 | |
Merge branch '2022-01-04-platform-updates' into next
- Assorted updates for vexpress64, apple m1, iot2050 and stemmy
platforms.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/iot2050_defconfig | 1 | ||||
| -rw-r--r-- | configs/vexpress_aemv8a_semi_defconfig | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/configs/iot2050_defconfig b/configs/iot2050_defconfig index 4a87a33..10abb77 100644 --- a/configs/iot2050_defconfig +++ b/configs/iot2050_defconfig @@ -60,7 +60,6 @@ CONFIG_CMD_TIME=y # CONFIG_ISO_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_LIST="k3-am6528-iot2050-basic k3-am6548-iot2050-advanced" CONFIG_SPL_MULTI_DTB_FIT=y CONFIG_SPL_OF_LIST="k3-am65-iot2050-spl" CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig index 7d1a1b5..f9abf29 100644 --- a/configs/vexpress_aemv8a_semi_defconfig +++ b/configs/vexpress_aemv8a_semi_defconfig @@ -15,7 +15,7 @@ CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 loglevel=9" -CONFIG_BOOTCOMMAND="if smhload ${boot_name} ${boot_addr}; then set bootargs; abootimg addr ${boot_addr}; abootimg get dtb --index=0 fdt_addr; bootm ${boot_addr} ${boot_addr} ${fdt_addr}; else; set fdt_high 0xffffffffffffffff; set initrd_high 0xffffffffffffffff; smhload ${kernel_name} ${kernel_addr}; smhload ${fdtfile} ${fdt_addr}; smhload ${initrd_name} ${initrd_addr} initrd_end; fdt addr ${fdt_addr}; fdt resize; fdt chosen ${initrd_addr} ${initrd_end}; booti $kernel_addr - $fdt_addr; fi" +CONFIG_BOOTCOMMAND="if smhload ${boot_name} ${boot_addr_r}; then set bootargs; abootimg addr ${boot_addr_r}; abootimg get dtb --index=0 fdt_addr_r; bootm ${boot_addr_r} ${boot_addr_r} ${fdt_addr_r}; else; set fdt_high 0xffffffffffffffff; set initrd_high 0xffffffffffffffff; smhload ${kernel_name} ${kernel_addr}; smhload ${fdtfile} ${fdt_addr_r}; smhload ${ramdisk_name} ${ramdisk_addr_r} ramdisk_end; fdt addr ${fdt_addr_r}; fdt resize; fdt chosen ${ramdisk_addr_r} ${ramdisk_end}; booti $kernel_addr - $fdt_addr_r; fi" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="VExpress64# " |