diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-28 08:07:16 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-28 08:07:16 -0500 |
| commit | 6cb87cbb1475f668689f95911d1521ee6ba7f55c (patch) | |
| tree | 2454e7ad7a284c01cc1150f6d6def994e23c99a6 /tools | |
| parent | 831f06fe9af0b45fa2cba64300524d1726fb9241 (diff) | |
| parent | fff7b33ce5b1b3687857ea4184d71bf4ce1f6364 (diff) | |
| download | u-boot-6cb87cbb1475f668689f95911d1521ee6ba7f55c.tar.gz u-boot-6cb87cbb1475f668689f95911d1521ee6ba7f55c.tar.xz u-boot-6cb87cbb1475f668689f95911d1521ee6ba7f55c.zip | |
Merge tag 'u-boot-imx-20191228' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Fixes for 2020.01
-----------------
- Fixes for Nitrogen6x
- Fix corruption for mx51evk
- colibri i.MX6: fix broken ESDHC conversion
- mx6sxsabresd: fix broken mmcdev
- imx6q_logic: cleanup boot sequence
- update ATF for imx8mq_evk
- pfuze: fix pmic_get()
Travis CI: https://travis-ci.org/sbabic/u-boot-imx/builds/630007464
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/imximage.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/imximage.c b/tools/imximage.c index d7c0b6e883..d7edd3c52f 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -11,9 +11,13 @@ #include "imagetool.h" #include <image.h> #include "imximage.h" +#include <generated/autoconf.h> #define UNDEFINED 0xFFFFFFFF +#if !defined(CONFIG_IMX_DCD_ADDR) +#define CONFIG_IMX_DCD_ADDR 0x00910000 +#endif /* * Supported commands for configuration file */ @@ -524,8 +528,8 @@ static void print_hdr_v2(struct imx_header *imx_hdr) printf("HAB Blocks: 0x%08x 0x%08x 0x%08x\n", (uint32_t)fhdr_v2->self, 0, (uint32_t)(fhdr_v2->csf - fhdr_v2->self)); - printf("DCD Blocks: 0x00910000 0x%08x 0x%08x\n", - offs, be16_to_cpu(dcdlen)); + printf("DCD Blocks: 0x%08x 0x%08x 0x%08x\n", + offs, CONFIG_IMX_DCD_ADDR, be16_to_cpu(dcdlen)); } } else { imx_header_v2_t *next_hdr_v2; |