Merge tag 'fsl-qoriq-2024-4-24' of https://source.denx.de/u-boot/custodians/u-boot...

- move to OF_UPSTREAM for sl28

diff --combined configs/kontron_sl28_defconfig
index ed46eda170012124ffa26ee96134ee5da465a8e1,adc1d501ba8249f7bee0ca1f49e82652772c87b9..a1d5f89b1ecf186d4f571be516f7814da17730f8
--- 1/configs/kontron_sl28_defconfig
--- 2/configs/kontron_sl28_defconfig
+++ b/configs/kontron_sl28_defconfig
@@@ -11,7 -11,7 +11,7 @@@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1800ef
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x3e0000
  CONFIG_ENV_SECT_SIZE=0x10000
- CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1028a-kontron-sl28"
+ CONFIG_DEFAULT_DEVICE_TREE="freescale/fsl-ls1028a-kontron-sl28"
  CONFIG_SPL_TEXT_BASE=0x18010000
  CONFIG_SYS_FSL_SDHC_CLK_DIV=1
  CONFIG_OF_LIBFDT_OVERLAY=y
@@@ -19,9 -19,6 +19,9 @@@ CONFIG_SYS_MONITOR_LEN=104857
  CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y
  CONFIG_SPL_STACK=0x18009ff0
 +CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
 +CONFIG_SPL_BSS_START_ADDR=0x80100000
 +CONFIG_SPL_BSS_MAX_SIZE=0x100000
  CONFIG_SPL_SIZE_LIMIT=0x20000
  CONFIG_SPL=y
  CONFIG_ENV_OFFSET_REDUND=0x3f0000
@@@ -48,6 -45,9 +48,6 @@@ CONFIG_BOARD_LATE_INIT=
  # CONFIG_HWCONFIG is not set
  CONFIG_PCI_INIT_R=y
  CONFIG_SPL_MAX_SIZE=0x20000
 -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
 -CONFIG_SPL_BSS_START_ADDR=0x80100000
 -CONFIG_SPL_BSS_MAX_SIZE=0x100000
  CONFIG_SPL_BOARD_INIT=y
  # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
  CONFIG_SPL_SYS_MALLOC=y
@@@ -73,7 -73,8 +73,8 @@@ CONFIG_CMD_EFIDEBUG=
  CONFIG_CMD_RNG=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
- CONFIG_OF_LIST="fsl-ls1028a-kontron-sl28 fsl-ls1028a-kontron-sl28-var1 fsl-ls1028a-kontron-sl28-var2 fsl-ls1028a-kontron-sl28-var3 fsl-ls1028a-kontron-sl28-var4"
+ CONFIG_OF_UPSTREAM=y
+ CONFIG_OF_LIST="freescale/fsl-ls1028a-kontron-sl28 freescale/fsl-ls1028a-kontron-sl28-var1 freescale/fsl-ls1028a-kontron-sl28-var2 freescale/fsl-ls1028a-kontron-sl28-var4"
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y