Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / mach-k3 / Kconfig

diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig
index 2e111bbf27ee4670387a5bf34d7e2d30b45f6887..c7d186149ba5ba45dd405bdde1c2380bb8441d9f 100644 (file)
--- a/arch/arm/mach-k3/Kconfig
+++ b/arch/arm/mach-k3/Kconfig
@@ -50,7 +50,7 @@ config SYS_K3_MCU_SCRATCHPAD_SIZE
 config SYS_K3_BOOT_PARAM_TABLE_INDEX
        hex
        default 0x41c7fbfc if SOC_K3_AM6
-       default 0x41cffc00 if SOC_K3_J721E
+       default 0x41cffbfc if SOC_K3_J721E
        help
          Address at which ROM stores the value which determines if SPL
          is booted up by primary boot media or secondary boot media.
@@ -119,13 +119,21 @@ config K3_SYSFW_IMAGE_MMCSD_RAW_MODE_PART
 config K3_SYSFW_IMAGE_SIZE_MAX
        int "Amount of memory dynamically allocated for loading SYSFW blob"
        depends on K3_LOAD_SYSFW
-       default 277000
+       default 278000
        help
          Amount of memory (in bytes) reserved through dynamic allocation at
          runtime for loading the combined System Firmware and configuration image
          tree blob. Keep it as tight as possible, as this directly affects the
          overall SPL memory footprint.
 
+config K3_SYSFW_IMAGE_SPI_OFFS
+       hex "SPI offset of SYSFW firmware and configuration blob"
+       depends on K3_LOAD_SYSFW
+       default 0x6C0000
+       help
+         Offset of the combined System Firmware and configuration image tree
+         blob to be loaded when booting from a SPI flash memory.
+
 config SYS_K3_SPL_ATF
        bool "Start Cortex-A from SPL"
        depends on SPL && CPU_V7R