From: Tom Rini <trini@konsulko.com>
Date: Mon, 20 May 2024 16:16:33 +0000 (-0600)
Subject: Merge tag 'v2024.07-rc3' into next
X-Git-Tag: v2024.10-rc1~41^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4781422d1268aa6deca3e49d2fb227e79c160b4;p=pandora-u-boot.git

Merge tag 'v2024.07-rc3' into next

Prepare v2024.07-rc3
---

d4781422d1268aa6deca3e49d2fb227e79c160b4
diff --cc arch/arm/mach-k3/am64x/Makefile
index d0b286276c8,00000000000..59ec43e7905
mode 100644,000000..100644
--- a/arch/arm/mach-k3/am64x/Makefile
+++ b/arch/arm/mach-k3/am64x/Makefile
@@@ -1,4 -1,0 +1,3 @@@
 +# SPDX-License-Identifier:	GPL-2.0+
 +
 +obj-$(CONFIG_SPL_BUILD) += am642_init.o
- obj-y += boot.o
diff --cc drivers/crypto/nuvoton/npcm_sha.c
index 6da162069aa,7ebdfa16f4f..2a5e6726880
--- a/drivers/crypto/nuvoton/npcm_sha.c
+++ b/drivers/crypto/nuvoton/npcm_sha.c
@@@ -1,8 -1,9 +1,9 @@@
  // SPDX-License-Identifier: GPL-2.0+
  /*
 - * Copyright (c) 2022 Nuvoton Technology Corp.
 + * Copyright (c) 2024 Nuvoton Technology Corp.
   */
  
+ #include <common.h>
  #include <dm.h>
  #include <hash.h>
  #include <malloc.h>