Merge tag 'v2024.01-rc3' into next

Prepare v2024.01-rc3

diff --cc Makefile
Simple merge

diff --cc arch/arm/dts/Makefile
Simple merge

diff --cc arch/arm/mach-imx/spl_imx_romapi.c
Simple merge

diff --cc arch/arm/mach-k3/am654_init.c
Simple merge

diff --cc arch/arm/mach-k3/common.c
Simple merge

diff --cc arch/arm/mach-k3/j721e_init.c
Simple merge

diff --cc arch/arm/mach-k3/j721s2_init.c
Simple merge

diff --cc arch/arm/mach-k3/r5_mpu.c
Simple merge

diff --cc arch/arm/mach-k3/security.c
Simple merge

diff --cc arch/arm/mach-k3/sysfw-loader.c
Simple merge

diff --cc arch/arm/mach-omap2/boot-common.c
Simple merge

diff --cc arch/arm/mach-stm32mp/include/mach/stm32.h
index b31e4a5d0dcf5760ba028f2b19728bb773e9301a,ac0deced67e42b8333fe6a36a052fec9f67ca07e..46d469881b32824f8e08350497e0a14d8f08e7a6
--- 1/arch/arm/mach-stm32mp/include/mach/stm32.h
--- 2/arch/arm/mach-stm32mp/include/mach/stm32.h
+++ b/arch/arm/mach-stm32mp/include/mach/stm32.h
@@@ -6,61 -6,8 +6,64 @@@
  #ifndef _MACH_STM32_H_
  #define _MACH_STM32_H_
  
 +#include <linux/sizes.h>
  #ifndef __ASSEMBLY__
  #include <linux/bitops.h>
- #define TAMP_BOOT_DEBUG_ON            BIT(16)
 +
 +enum boot_device {
 +      BOOT_FLASH_SD = 0x10,
 +      BOOT_FLASH_SD_1 = 0x11,
 +      BOOT_FLASH_SD_2 = 0x12,
 +      BOOT_FLASH_SD_3 = 0x13,
 +
 +      BOOT_FLASH_EMMC = 0x20,
 +      BOOT_FLASH_EMMC_1 = 0x21,
 +      BOOT_FLASH_EMMC_2 = 0x22,
 +      BOOT_FLASH_EMMC_3 = 0x23,
 +
 +      BOOT_FLASH_NAND = 0x30,
 +      BOOT_FLASH_NAND_FMC = 0x31,
 +
 +      BOOT_FLASH_NOR = 0x40,
 +      BOOT_FLASH_NOR_QSPI = 0x41,
 +
 +      BOOT_SERIAL_UART = 0x50,
 +      BOOT_SERIAL_UART_1 = 0x51,
 +      BOOT_SERIAL_UART_2 = 0x52,
 +      BOOT_SERIAL_UART_3 = 0x53,
 +      BOOT_SERIAL_UART_4 = 0x54,
 +      BOOT_SERIAL_UART_5 = 0x55,
 +      BOOT_SERIAL_UART_6 = 0x56,
 +      BOOT_SERIAL_UART_7 = 0x57,
 +      BOOT_SERIAL_UART_8 = 0x58,
 +
 +      BOOT_SERIAL_USB = 0x60,
 +      BOOT_SERIAL_USB_OTG = 0x62,
 +
 +      BOOT_FLASH_SPINAND = 0x70,
 +      BOOT_FLASH_SPINAND_1 = 0x71,
 +};
 +
 +#define TAMP_BOOT_MODE_MASK           GENMASK(15, 8)
 +#define TAMP_BOOT_MODE_SHIFT          8
++#define TAMP_BOOT_AUTH_MASK           GENMASK(23, 16)
++#define TAMP_BOOT_AUTH_SHIFT          16
 +#define TAMP_BOOT_DEVICE_MASK         GENMASK(7, 4)
 +#define TAMP_BOOT_INSTANCE_MASK               GENMASK(3, 0)
++#define TAMP_BOOT_AUTH_ST_MASK                GENMASK(7, 4)
++#define TAMP_BOOT_PARTITION_MASK      GENMASK(3, 0)
 +#define TAMP_BOOT_FORCED_MASK         GENMASK(7, 0)
 +
 +enum forced_boot_mode {
 +      BOOT_NORMAL = 0x00,
 +      BOOT_FASTBOOT = 0x01,
 +      BOOT_RECOVERY = 0x02,
 +      BOOT_STM32PROG = 0x03,
 +      BOOT_UMS_MMC0 = 0x10,
 +      BOOT_UMS_MMC1 = 0x11,
 +      BOOT_UMS_MMC2 = 0x12,
 +};
 +
  #endif
  
  /*

diff --cc arch/arm/mach-stm32mp/include/mach/sys_proto.h
Simple merge

diff --cc arch/arm/mach-stm32mp/stm32mp1/cpu.c
Simple merge

diff --cc arch/sandbox/cpu/os.c
Simple merge

diff --cc arch/sandbox/dts/test.dts
Simple merge

diff --cc board/ti/am65x/evm.c
Simple merge

diff --cc board/ti/j721e/evm.c
Simple merge

diff --cc board/ti/j721s2/evm.c
Simple merge

diff --cc configs/stm32mp15_dhcom_basic_defconfig
Simple merge

diff --cc configs/stm32mp15_dhcor_basic_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_mini_qspi_defconfig
Simple merge

diff --cc configs/zynq_cse_nand_defconfig
Simple merge

diff --cc configs/zynq_cse_nor_defconfig
Simple merge

diff --cc configs/zynq_cse_qspi_defconfig
Simple merge

diff --cc drivers/ata/sata.c
Simple merge

diff --cc drivers/core/Kconfig
Simple merge

diff --cc drivers/scsi/scsi.c
Simple merge

diff --cc drivers/spi/spi-mem-nodm.c
index f9cadcc026dcdb6e78ad12b1a8c6491f1409d281,6ee841358b343eae9b22736331d521ee39627e93..6d9ab61769a782b8bf6ee4cf039503839c9d5b9a
--- 1/drivers/spi/spi-mem-nodm.c
--- 2/drivers/spi/spi-mem-nodm.c
+++ b/drivers/spi/spi-mem-nodm.c
@@@ -1,9 -1,8 +1,9 @@@
  // SPDX-License-Identifier: GPL-2.0+
  /*
-  * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/
+  * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/
   */
  
 +#include <errno.h>
  #include <log.h>
  #include <malloc.h>
  #include <spi.h>

diff --cc drivers/ufs/cdns-platform.c
Simple merge

diff --cc drivers/usb/dwc3/core.c
Simple merge

diff --cc include/env_internal.h
Simple merge