diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-15 15:22:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-15 15:22:00 -0400 |
| commit | bd4e8944cf7e36f8ad39466c40f8fc197c9df1c5 (patch) | |
| tree | 0a600fbc0f5507e6ae5d3ba63759545a916af7db /board | |
| parent | 23e92c124b878e7c5d9a23c46f363874890260cf (diff) | |
| parent | 5ba2883160d15b669957dcc50be2733a9b4abe94 (diff) | |
| download | u-boot-bd4e8944cf7e36f8ad39466c40f8fc197c9df1c5.zip u-boot-bd4e8944cf7e36f8ad39466c40f8fc197c9df1c5.tar.gz u-boot-bd4e8944cf7e36f8ad39466c40f8fc197c9df1c5.tar.bz2 | |
Merge tag 'ti-v2021.01-next' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti into next
- Hyperflash boot for J7200
- Update Main R5FSS lockstep mode
- R5F remoteproc support for J7200
- Minor env fixes
- Add SPI boot support for am335x-icev2
Diffstat (limited to 'board')
| -rw-r--r-- | board/ti/am335x/MAINTAINERS | 1 | ||||
| -rw-r--r-- | board/ti/j721e/evm.c | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/board/ti/am335x/MAINTAINERS b/board/ti/am335x/MAINTAINERS index e100adf..219c871 100644 --- a/board/ti/am335x/MAINTAINERS +++ b/board/ti/am335x/MAINTAINERS @@ -5,3 +5,4 @@ F: board/ti/am335x/ F: include/configs/am335x_evm.h F: configs/am335x_boneblack_vboot_defconfig F: configs/am335x_evm_defconfig +F: configs/am335x_evm_spiboot_defconfig diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c index ebaa6fa..7925b76 100644 --- a/board/ti/j721e/evm.c +++ b/board/ti/j721e/evm.c @@ -117,6 +117,13 @@ static void __maybe_unused detect_enable_hyperflash(void *blob) } #endif +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_TARGET_J7200_A72_EVM) +void spl_perform_fixups(struct spl_image_info *spl_image) +{ + detect_enable_hyperflash(spl_image->fdt_addr); +} +#endif + #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) int ft_board_setup(void *blob, struct bd_info *bd) { |