diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-19 08:29:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-19 08:29:24 -0400 |
| commit | 83befb446664af32ce18f0e42e99a353e6622e58 (patch) | |
| tree | 563a58575010c89767e6e8d21bf82443e5f44e52 /arch/arm/mach-k3/am642_init.c | |
| parent | abf0061eabf43f43a3889871e259c9633e7a42e3 (diff) | |
| parent | 652982309d316b14aae5805d09239f89eb89f038 (diff) | |
Merge tag 'ti-v2021.10-rc1' of https://source.denx.de/u-boot/custodians/u-boot-ti
- Enabled distro boot for all TI platforms.
- Cleanup for AM335x Guardian Board
- PRUSS rproc on AM65 platform.
- Add PMIC support for J7200
- Misc fixes for Nokia RX-51
# Conflicts:
# arch/arm/mach-omap2/am33xx/Kconfig
Diffstat (limited to 'arch/arm/mach-k3/am642_init.c')
| -rw-r--r-- | arch/arm/mach-k3/am642_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-k3/am642_init.c b/arch/arm/mach-k3/am642_init.c index 579dbacb7e..0e46d70e84 100644 --- a/arch/arm/mach-k3/am642_init.c +++ b/arch/arm/mach-k3/am642_init.c @@ -141,7 +141,7 @@ int fdtdec_board_setup(const void *fdt_blob) void board_init_f(ulong dummy) { -#if defined(CONFIG_K3_LOAD_SYSFW) +#if defined(CONFIG_K3_LOAD_SYSFW) || defined(CONFIG_K3_AM64_DDRSS) struct udevice *dev; int ret; #endif |