diff options
| author | Tom Rini <[email protected]> | 2024-05-29 11:18:09 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-05-29 11:21:14 -0600 |
| commit | ea722aa5eb33740ae77e8816aeb72b385e621cd0 (patch) | |
| tree | 48b633ba273671964e988150bc0e4914d2f00e88 /arch | |
| parent | 46ff00bea5dd2dd247d5e2fdadbf5dcf8653cd9a (diff) | |
| parent | f8352a8ead39690f97042b4bf913108115040fae (diff) | |
Merge branch '2024-05-29-assorted-small-fixes'
- A few maintainer updates, bump a python package version, TI K3-AM62P
fix
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-k3/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-k3/am62p5_fdt.c | 16 | ||||
| -rw-r--r-- | arch/arm/mach-k3/am62px/Kconfig | 1 |
3 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/mach-k3/Makefile b/arch/arm/mach-k3/Makefile index 1bd523329a4..4e9d0925f13 100644 --- a/arch/arm/mach-k3/Makefile +++ b/arch/arm/mach-k3/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_SOC_K3_J721S2) += j721s2_fdt.o obj-$(CONFIG_SOC_K3_AM625) += am625_fdt.o obj-$(CONFIG_SOC_K3_AM62A7) += am62a7_fdt.o obj-$(CONFIG_SOC_K3_J784S4) += j784s4_fdt.o +obj-$(CONFIG_SOC_K3_AM62P5) += am62p5_fdt.o endif ifeq ($(CONFIG_SPL_BUILD),y) obj-$(CONFIG_SOC_K3_AM654) += am654_init.o diff --git a/arch/arm/mach-k3/am62p5_fdt.c b/arch/arm/mach-k3/am62p5_fdt.c new file mode 100644 index 00000000000..d67f012a5dc --- /dev/null +++ b/arch/arm/mach-k3/am62p5_fdt.c @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/ + */ + +#include <asm/hardware.h> +#include "common_fdt.h" +#include <fdt_support.h> + +int ft_system_setup(void *blob, struct bd_info *bd) +{ + fdt_fixup_reserved(blob, "tfa", CONFIG_K3_ATF_LOAD_ADDR, 0x80000); + fdt_fixup_reserved(blob, "optee", CONFIG_K3_OPTEE_LOAD_ADDR, 0x1800000); + + return 0; +} diff --git a/arch/arm/mach-k3/am62px/Kconfig b/arch/arm/mach-k3/am62px/Kconfig index 38a9e6811b1..76ae86b6622 100644 --- a/arch/arm/mach-k3/am62px/Kconfig +++ b/arch/arm/mach-k3/am62px/Kconfig @@ -13,6 +13,7 @@ config TARGET_AM62P5_A53_EVM bool "TI K3 based AM62P5 EVM running on A53" select ARM64 select BINMAN + select OF_SYSTEM_SETUP config TARGET_AM62P5_R5_EVM bool "TI K3 based AM62P5 EVM running on R5" |