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-omap2/mem-common.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-omap2/mem-common.c')
| -rw-r--r-- | arch/arm/mach-omap2/mem-common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/mem-common.c b/arch/arm/mach-omap2/mem-common.c index 50d5f3e9eb..2dcf0cf9c3 100644 --- a/arch/arm/mach-omap2/mem-common.c +++ b/arch/arm/mach-omap2/mem-common.c @@ -15,7 +15,11 @@ #include <common.h> #include <asm/io.h> #include <asm/arch/cpu.h> +#if IS_ENABLED(CONFIG_TARGET_AM335X_GUARDIAN) +#include <asm/arch/mem-guardian.h> +#else #include <asm/arch/mem.h> +#endif #include <asm/arch/sys_proto.h> #include <command.h> #include <linux/mtd/omap_gpmc.h> |