Merge branch 'master' of git://git.denx.de/u-boot-socfpga

diff --combined arch/arm/Kconfig
index 0bc4322,7d159ec..76365ef
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -823,7 -823,6 +823,7 @@@ config ARCH_MX7UL
        select CPU_V7A
        select ROM_UNIFIED_SECTIONS
        imply MXC_GPIO
 +      imply SYS_THUMB_BUILD
  
  config ARCH_MX7
        bool "Freescale MX7"
@@@ -834,7 -833,6 +834,7 @@@
        select SYS_FSL_SEC_COMPAT_4
        select SYS_FSL_SEC_LE
        imply MXC_GPIO
 +      imply SYS_THUMB_BUILD
  
  config ARCH_MX6
        bool "Freescale MX6"
@@@ -842,8 -840,8 +842,8 @@@
        select SYS_FSL_HAS_SEC if IMX_HAB
        select SYS_FSL_SEC_COMPAT_4
        select SYS_FSL_SEC_LE
 -      select SYS_THUMB_BUILD if SPL
        imply MXC_GPIO
 +      imply SYS_THUMB_BUILD
  
  if ARCH_MX6
  config SPL_LDSCRIPT
@@@ -907,7 -905,7 +907,7 @@@ config ARCH_SOCFPG
        bool "Altera SOCFPGA family"
        select ARCH_EARLY_INIT_R
        select ARCH_MISC_INIT if !TARGET_SOCFPGA_ARRIA10
-       select ARM64 if TARGET_SOCFPGA_STRATIX10
+       select ARM64 if TARGET_SOCFPGA_STRATIX10 || TARGET_SOCFPGA_AGILEX
        select CPU_V7A if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
        select DM
        select DM_SERIAL
@@@ -919,7 -917,7 +919,7 @@@
        select SPL_LIBGENERIC_SUPPORT
        select SPL_NAND_SUPPORT if SPL_NAND_DENALI
        select SPL_OF_CONTROL
-       select SPL_SEPARATE_BSS if TARGET_SOCFPGA_STRATIX10
+       select SPL_SEPARATE_BSS if TARGET_SOCFPGA_STRATIX10 || TARGET_SOCFPGA_AGILEX
        select SPL_SERIAL_SUPPORT
        select SPL_SYSRESET
        select SPL_WATCHDOG_SUPPORT

diff --combined arch/arm/dts/Makefile
index 25dbda9,1ad882f..08c5967
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -153,7 -153,6 +153,7 @@@ dtb-$(CONFIG_ARCH_MESON) += 
        meson-g12a-sei510.dtb \
        meson-g12b-odroid-n2.dtb \
        meson-g12b-a311d-khadas-vim3.dtb \
 +      meson-sm1-khadas-vim3l.dtb \
        meson-sm1-sei610.dtb
  dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
        tegra20-medcom-wide.dtb \
@@@ -330,6 -329,7 +330,7 @@@ dtb-$(CONFIG_TI816X) += dm8168-evm.dt
  dtb-$(CONFIG_THUNDERX) += thunderx-88xx.dtb
  
  dtb-$(CONFIG_ARCH_SOCFPGA) +=                         \
+       socfpga_agilex_socdk.dtb                        \
        socfpga_arria5_socdk.dtb                        \
        socfpga_arria10_socdk_sdmmc.dtb                 \
        socfpga_cyclone5_mcvevk.dtb                     \
@@@ -571,34 -571,14 +572,34 @@@ dtb-$(CONFIG_VF610) += vf500-colibri.dt
        vf610-pcm052.dtb \
        vf610-bk4r1.dtb
  
 +dtb-$(CONFIG_MX28) += \
 +      imx28-xea.dtb
 +
  dtb-$(CONFIG_MX53) += imx53-cx9020.dtb \
        imx53-kp.dtb \
        imx53-m53menlo.dtb
  
  ifneq ($(CONFIG_MX6DL)$(CONFIG_MX6QDL)$(CONFIG_MX6S),)
  dtb-y += \
 +      imx6dl-aristainetos2_4.dtb \
 +      imx6dl-aristainetos2_7.dtb \
 +      imx6dl-aristainetos2b_4.dtb \
 +      imx6dl-aristainetos2b_7.dtb \
 +      imx6dl-aristainetos2b_csl_4.dtb \
 +      imx6dl-aristainetos2b_csl_7.dtb \
 +      imx6dl-aristainetos2c_4.dtb \
 +      imx6dl-aristainetos2c_7.dtb \
        imx6dl-brppt2.dtb \
 +      imx6dl-cubox-i.dtb \
 +      imx6dl-cubox-i-emmc-som-v15.dtb \
 +      imx6dl-cubox-i-som-v15.dtb \
        imx6dl-dhcom-pdk2.dtb \
 +      imx6dl-hummingboard2.dtb \
 +      imx6dl-hummingboard2-emmc-som-v15.dtb \
 +      imx6dl-hummingboard2-som-v15.dtb \
 +      imx6dl-hummingboard.dtb \
 +      imx6dl-hummingboard-emmc-som-v15.dtb \
 +      imx6dl-hummingboard-som-v15.dtb \
        imx6dl-icore.dtb \
        imx6dl-icore-mipi.dtb \
        imx6dl-icore-rqs.dtb \
@@@ -615,17 -595,8 +616,17 @@@ ifneq ($(CONFIG_MX6Q)$(CONFIG_MX6QDL),
  dtb-y += \
        imx6-apalis.dtb \
        imx6q-cm-fx6.dtb \
 +      imx6q-cubox-i.dtb \
 +      imx6q-cubox-i-emmc-som-v15.dtb \
 +      imx6q-cubox-i-som-v15.dtb \
        imx6q-dhcom-pdk2.dtb \
        imx6q-display5.dtb \
 +      imx6q-hummingboard2.dtb \
 +      imx6q-hummingboard2-emmc-som-v15.dtb \
 +      imx6q-hummingboard2-som-v15.dtb \
 +      imx6q-hummingboard.dtb \
 +      imx6q-hummingboard-emmc-som-v15.dtb \
 +      imx6q-hummingboard-som-v15.dtb \
        imx6q-icore.dtb \
        imx6q-icore-mipi.dtb \
        imx6q-icore-rqs.dtb \
@@@ -664,14 -635,14 +665,14 @@@ dtb-$(CONFIG_MX6UL) += 
        imx6ul-9x9-evk.dtb \
        imx6ul-9x9-evk.dtb \
        imx6ul-liteboard.dtb \
 -      imx6ul-phycore-segin.dtb \
 +      imx6ul-phytec-segin-ff-rdk-nand.dtb \
        imx6ul-pico-hobbit.dtb \
        imx6ul-pico-pi.dtb
  
  dtb-$(CONFIG_MX6ULL) += \
        imx6ull-14x14-evk.dtb \
        imx6ull-colibri.dtb \
 -      imx6ull-phycore-segin.dtb \
 +      imx6ull-phytec-segin-ff-rdk-emmc.dtb \
        imx6ull-dart-6ul.dtb \
        imx6ulz-14x14-evk.dtb
  
@@@ -689,8 -660,7 +690,8 @@@ dtb-$(CONFIG_MX7) += imx7d-sdb.dtb 
        imx7d-pico-hobbit.dtb
  
  
 -dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-evk.dtb
 +dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-com.dtb \
 +      imx7ulp-evk.dtb
  
  dtb-$(CONFIG_ARCH_IMX8) += \
        fsl-imx8qm-apalis.dtb \
@@@ -871,12 -841,7 +872,12 @@@ dtb-$(CONFIG_ARCH_MEDIATEK) += 
        mt8516-pumpkin.dtb \
        mt8518-ap1-emmc.dtb
  
 -dtb-$(CONFIG_TARGET_GE_BX50V3) += imx6q-bx50v3.dtb
 +dtb-$(CONFIG_TARGET_GE_BX50V3) += \
 +      imx6q-bx50v3.dtb \
 +      imx6q-b850v3.dtb \
 +      imx6q-b650v3.dtb \
 +      imx6q-b450v3.dtb
 +
  dtb-$(CONFIG_TARGET_MX53PPD) += imx53-ppd.dtb
  
  dtb-$(CONFIG_TARGET_VEXPRESS_CA5X2) += vexpress-v2p-ca5s.dtb

diff --combined drivers/Makefile
index b51bdee,bfc5a25..44a08da
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -1,5 -1,6 +1,6 @@@
  # SPDX-License-Identifier: GPL-2.0+
  
+ obj-$(CONFIG_$(SPL_TPL_)CACHE) += cache/
  obj-$(CONFIG_$(SPL_TPL_)CLK) += clk/
  obj-$(CONFIG_$(SPL_TPL_)DM) += core/
  obj-$(CONFIG_$(SPL_TPL_)DFU) += dfu/
@@@ -26,7 -27,6 +27,7 @@@ obj-$(CONFIG_$(SPL_)DM_MAILBOX) += mail
  obj-$(CONFIG_$(SPL_)REMOTEPROC) += remoteproc/
  obj-$(CONFIG_$(SPL_TPL_)TPM) += tpm/
  obj-$(CONFIG_$(SPL_TPL_)ACPI_PMC) += power/acpi_pmc/
 +obj-$(CONFIG_$(SPL_)BOARD) += board/
  
  ifndef CONFIG_TPL_BUILD
  ifdef CONFIG_SPL_BUILD
@@@ -76,6 -76,7 +77,6 @@@ obj-y += ata
  obj-$(CONFIG_DM_DEMO) += demo/
  obj-$(CONFIG_BIOSEMU) += bios_emulator/
  obj-y += block/
 -obj-y += board/
  obj-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount/
  obj-y += cache/
  obj-$(CONFIG_CPU) += cpu/