]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge tag 'v2024.07-rc4' into next
authorTom Rini <trini@konsulko.com>
Tue, 4 Jun 2024 00:42:11 +0000 (18:42 -0600)
committerTom Rini <trini@konsulko.com>
Tue, 4 Jun 2024 14:09:09 +0000 (08:09 -0600)
Prepare v2024.070-rc4

13 files changed:
1  2 
MAINTAINERS
Makefile
arch/arm/dts/Makefile
arch/arm/mach-exynos/mmu-arm64.c
arch/arm/mach-k3/am62px/Makefile
arch/arm/mach-k3/am62px/am62p5_fdt.c
board/isee/igep00x0/igep00x0.c
board/microchip/mpfs_icicle/mpfs_icicle.c
cmd/tpm-v2.c
drivers/cache/cache-andes-l2.c
drivers/clk/rockchip/clk_rk3588.c
drivers/tpm/tpm2_tis_spi.c
lib/efi_loader/efi_tcg2.c

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
index 5902862b29c87b44d6ff31650c044fb9a92c8ca4,0000000000000000000000000000000000000000..eed91a033eb8a60af3b1e10d6e5979aad4b8a85a
mode 100644,000000..100644
--- /dev/null
@@@ -1,6 -1,0 +1,7 @@@
 +# SPDX-License-Identifier: GPL-2.0+
 +#
 +# Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/
 +#     Andrew Davis <afd@ti.com>
 +
++obj-$(CONFIG_OF_SYSTEM_SETUP) += am62p5_fdt.o
 +obj-$(CONFIG_SPL_BUILD) += am62p5_init.o
index 0000000000000000000000000000000000000000,d67f012a5dcc48bb00300ca2c58c9bdc8db237c4..29c832d28acf54d2ad73f76a4a3d135643bb6bb4
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,16 +1,16 @@@
 -#include "common_fdt.h"
+ // 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;
+ }
Simple merge
diff --cc cmd/tpm-v2.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge