diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-09 09:17:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-09 09:17:24 -0400 |
| commit | be79009f3b9bbdbce283e67a865121e576d790ea (patch) | |
| tree | e6f0288f2031c6e869c4e131f2692e47a43aa263 /include | |
| parent | e411a090cf7162626d54d72dfc4530986c788cdb (diff) | |
| parent | 385429680106f8612386e26564f69dccdd110620 (diff) | |
| download | u-boot-be79009f3b9bbdbce283e67a865121e576d790ea.zip u-boot-be79009f3b9bbdbce283e67a865121e576d790ea.tar.gz u-boot-be79009f3b9bbdbce283e67a865121e576d790ea.tar.bz2 | |
Merge tag 'u-boot-imx-20200609' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Fixes for 2020.07
-----------------
- mx53: mx53menlo Convert to DM_ETH, fix fail boot
- imx8mp_evk: fix boot issue
- MX6, display5: fix environment
- drop warnings (watchdog) for i.MX8mm i.mx8mp
- enable bootaux for i.MX8M
Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/695929999
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/display5.h | 7 | ||||
| -rw-r--r-- | include/configs/imx8mp_evk.h | 12 |
2 files changed, 9 insertions, 10 deletions
diff --git a/include/configs/display5.h b/include/configs/display5.h index 2e5dbfe..3348ecc 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -28,9 +28,10 @@ * 0x020000 - 0x120000 : SPI.u-boot (1MiB) * 0x120000 - 0x130000 : SPI.u-boot-env1 (64KiB) * 0x130000 - 0x140000 : SPI.u-boot-env2 (64KiB) - * 0x140000 - 0x540000 : SPI.swupdate-kernel-FIT (4MiB) - * 0x540000 - 0x1540000 : SPI.swupdate-initramfs (16MiB) - * 0x1540000 - 0x1640000 : SPI.factory (1MiB) + * 0x140000 - 0x740000 : SPI.swupdate-kernel-FIT (6MiB) + * 0x740000 - 0x1B40000 : SPI.swupdate-initramfs (20MiB) + * 0x1B40000 - 0x1F00000 : SPI.reserved (3840KiB) + * 0x1F00000 - 0x2000000 : SPI.factory (1MiB) */ /* SPI Flash Configs */ diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index b346154..7f38f21 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -24,16 +24,14 @@ #ifdef CONFIG_SPL_BUILD /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" -#define CONFIG_SPL_STACK 0x990000 -#define CONFIG_SPL_BSS_START_ADDR 0x0095e000 -#define CONFIG_SPL_BSS_MAX_SIZE 0x2000 /* 8 KB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ +#define CONFIG_SPL_STACK 0x960000 +#define CONFIG_SPL_BSS_START_ADDR 0x0098FC00 +#define CONFIG_SPL_BSS_MAX_SIZE 0x400 /* 1 KB */ +#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 +#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ #define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_DCACHE_OFF -#define CONFIG_MALLOC_F_ADDR 0x940000 - #define CONFIG_SPL_ABORT_ON_RAW_IMAGE #undef CONFIG_DM_MMC |