diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-13 11:27:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-13 11:27:00 -0400 |
| commit | 891483186052b259852f3f48926ff307763f4eb0 (patch) | |
| tree | 019e4a490e40ad5459f7dd3d4129021be696c495 /include/environment/ti/boot.h | |
| parent | 36fec02b1f90b92cf51ec531564f9284eae27ab4 (diff) | |
| parent | 67bbc1ecd311c78b06e845a3fd4e333806782367 (diff) | |
| download | u-boot-891483186052b259852f3f48926ff307763f4eb0.tar.gz | |
Merge branch 'next'
Pull in changes that have been pending in our 'next' branch. This
includes:
- A large number of CI improvements including moving to gcc-9.2 for all
platforms.
- amlogic, xilinx, stm32, TI SoC updates
- USB and i2c subsystem updtaes
- Re-sync Kbuild/etc logic with v4.19 of the Linux kernel.
- RSA key handling improvements
Diffstat (limited to 'include/environment/ti/boot.h')
| -rw-r--r-- | include/environment/ti/boot.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h index 523c8fc4fe..11a57af0a4 100644 --- a/include/environment/ti/boot.h +++ b/include/environment/ti/boot.h @@ -103,18 +103,18 @@ "echo \" Reading DTB for AM57x EVM RevA3...\"; " \ "abootimg get dtb --index=0 dtb_start dtb_size; " \ "cp.b $dtb_start $fdtaddr $dtb_size; " \ - "fdt addr $fdtaddr; " \ + "fdt addr $fdtaddr 0x80000; " \ "echo \" Applying DTBOs for AM57x EVM RevA3...\"; " \ "adtimg addr $dtboaddr; " \ - "adtimg get dt --index=0 dtbo0_addr; " \ + "adtimg get dt --index=0 dtbo0_addr dtbo0_size; " \ "fdt apply $dtbo0_addr; " \ - "adtimg get dt --index=1 dtbo1_addr; " \ + "adtimg get dt --index=1 dtbo1_addr dtbo1_size; " \ "fdt apply $dtbo1_addr; " \ "elif test $board_name = beagle_x15_revc; then " \ "echo \" Reading DTB for Beagle X15 RevC...\"; " \ "abootimg get dtb --index=0 dtb_start dtb_size; " \ "cp.b $dtb_start $fdtaddr $dtb_size; " \ - "fdt addr $fdtaddr; " \ + "fdt addr $fdtaddr 0x80000; " \ "else " \ "echo Error: Android boot is not supported for $board_name; " \ "exit; " \ |