diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-25 23:12:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-25 23:12:43 -0400 |
| commit | 7a1a01c6029039e4fa6aa185cdbbf9a357eecba7 (patch) | |
| tree | f145f655379b2298dc58ef11aa03742c159e7f56 /include/configs/imx6_logic.h | |
| parent | 9f9ecd3e4d7839e24c182fb7b24937e19b670f1b (diff) | |
| parent | acbc1d86f16cc8372cccb7b862a0b9dc242f8fe5 (diff) | |
| download | u-boot-7a1a01c6029039e4fa6aa185cdbbf9a357eecba7.zip u-boot-7a1a01c6029039e4fa6aa185cdbbf9a357eecba7.tar.gz u-boot-7a1a01c6029039e4fa6aa185cdbbf9a357eecba7.tar.bz2 | |
Merge tag 'u-boot-imx-20200825' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
For 2020.10
-----------
- mx6: SOCs user selectable
Fix for imx6q_logic
Some DM conversion
- mx7: introduce secondary boot device
Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/720918010
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/imx6_logic.h')
| -rw-r--r-- | include/configs/imx6_logic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 63662dd..6b992f9 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -34,8 +34,8 @@ "script=boot.scr\0" \ "image=zImage\0" \ "bootm_size=0x10000000\0" \ - "fdt_addr_r=0x13000000\0" \ - "ramdisk_addr_r=0x14000000\0" \ + "fdt_addr_r=0x14000000\0" \ + "ramdisk_addr_r=0x14080000\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "ramdisk_file=rootfs.cpio.uboot\0" \ "boot_fdt=try\0" \ |