]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge tag 'v2024.07-rc3' into next
authorTom Rini <trini@konsulko.com>
Mon, 20 May 2024 16:16:33 +0000 (10:16 -0600)
committerTom Rini <trini@konsulko.com>
Mon, 20 May 2024 16:16:33 +0000 (10:16 -0600)
Prepare v2024.07-rc3

13 files changed:
1  2 
arch/arm/cpu/armv8/generic_timer.c
arch/arm/dts/Makefile
arch/arm/mach-k3/am64x/Makefile
arch/arm/mach-k3/am64x/am642_init.c
drivers/crypto/nuvoton/npcm_sha.c
drivers/dma/ti/k3-udma.c
drivers/net/ti/am65-cpsw-nuss.c
drivers/phy/phy-npcm-usb.c
drivers/pinctrl/pinctrl-uclass.c
drivers/remoteproc/ti_k3_dsp_rproc.c
drivers/remoteproc/ti_k3_r5f_rproc.c
fs/zfs/zfs.c
net/eth-uclass.c

Simple merge
Simple merge
index d0b286276c8d147793f4b4dc4e28612bc4e12494,0000000000000000000000000000000000000000..59ec43e79051e7837e7bcf3fb11c7a5f798ff76c
mode 100644,000000..100644
--- /dev/null
@@@ -1,4 -1,0 +1,3 @@@
- obj-y += boot.o
 +# SPDX-License-Identifier:    GPL-2.0+
 +
 +obj-$(CONFIG_SPL_BUILD) += am642_init.o
Simple merge
index 6da162069aa73bbf432a15369e92eeb371939de2,7ebdfa16f4fcd37d25cd1b87e59edd40edf041de..2a5e6726880b77150a31fc3abcc6e205e642d693
@@@ -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>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/zfs/zfs.c
Simple merge
Simple merge