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 e677a2e01b8986ee1206d1f19069fa3b483790be..c7d186149ba5ba45dd405bdde1c2380bb8441d9f 100644 (file)
--- a/arch/arm/mach-k3/Kconfig
+++ b/arch/arm/mach-k3/Kconfig
@@ -7,6 +7,9 @@ choice
 config SOC_K3_AM6
        bool "TI's K3 based AM6 SoC Family Support"
 
+config SOC_K3_J721E
+       bool "TI's K3 based J721E SoC Family Support"
+
 endchoice
 
 config SYS_SOC
@@ -14,7 +17,8 @@ config SYS_SOC
 
 config SYS_K3_NON_SECURE_MSRAM_SIZE
        hex
-       default 0x80000
+       default 0x80000 if SOC_K3_AM6
+       default 0x100000 if SOC_K3_J721E
        help
          Describes the total size of the MCU MSRAM. This doesn't
          specify the total size of SPL as ROM can use some part
@@ -23,7 +27,8 @@ config SYS_K3_NON_SECURE_MSRAM_SIZE
 
 config SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE
        hex
-       default 0x58000
+       default 0x58000 if SOC_K3_AM6
+       default 0xc0000 if SOC_K3_J721E
        help
          Describes the maximum size of the image that ROM can download
          from any boot media.
@@ -31,18 +36,21 @@ config SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE
 config SYS_K3_MCU_SCRATCHPAD_BASE
        hex
        default 0x40280000 if SOC_K3_AM6
+       default 0x40280000 if SOC_K3_J721E
        help
          Describes the base address of MCU Scratchpad RAM.
 
 config SYS_K3_MCU_SCRATCHPAD_SIZE
        hex
        default 0x200 if SOC_K3_AM6
+       default 0x200 if SOC_K3_J721E
        help
          Describes the size of MCU Scratchpad RAM.
 
 config SYS_K3_BOOT_PARAM_TABLE_INDEX
        hex
        default 0x41c7fbfc if SOC_K3_AM6
+       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.
@@ -58,6 +66,74 @@ config SYS_K3_BOOT_CORE_ID
        int
        default 16
 
+config K3_EARLY_CONS
+       bool "Activate to allow for an early console during SPL"
+       depends on SPL
+       help
+         Turn this option on to enable an early console functionality in SPL
+         before the main console is being brought up. This can be useful in
+         situations where the main console is dependent on System Firmware
+         (SYSFW) being up and running, which is usually not the case during
+         the very early stages of boot. Using this early console functionality
+         will allow for an alternate serial port to be used to support things
+         like UART-based boot and early diagnostic messages until the main
+         console is ready to get activated.
+
+config K3_EARLY_CONS_IDX
+       depends on K3_EARLY_CONS
+       int "Index of serial device to use for SPL early console"
+       default 1
+       help
+         Use this option to set the index of the serial device to be used
+         for the early console during SPL execution.
+
+config K3_LOAD_SYSFW
+       bool
+       depends on SPL
+
+config K3_SYSFW_IMAGE_NAME
+       string "File name of SYSFW firmware and configuration blob"
+       depends on K3_LOAD_SYSFW
+       default "sysfw.itb"
+       help
+         Filename of the combined System Firmware and configuration image tree
+         blob to be loaded when booting from a filesystem.
+
+config K3_SYSFW_IMAGE_MMCSD_RAW_MODE_SECT
+       hex "MMC sector to load SYSFW firmware and configuration blob from"
+       depends on K3_LOAD_SYSFW && SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
+       default 0x3600
+       help
+         Address on the MMC to load the combined System Firmware and
+         configuration image tree blob from, when the MMC is being used
+         in raw mode. Units: MMC sectors (1 sector = 512 bytes).
+
+config K3_SYSFW_IMAGE_MMCSD_RAW_MODE_PART
+       hex "MMC partition to load SYSFW firmware and configuration blob from"
+       depends on K3_LOAD_SYSFW && SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
+       default 2
+       help
+         Partition on the MMC to the combined System Firmware and configuration
+         image tree blob from, when the MMC is being used in raw mode.
+
+config K3_SYSFW_IMAGE_SIZE_MAX
+       int "Amount of memory dynamically allocated for loading SYSFW blob"
+       depends on K3_LOAD_SYSFW
+       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
@@ -66,4 +142,5 @@ config SYS_K3_SPL_ATF
          after SPL from R5.
 
 source "board/ti/am65x/Kconfig"
+source "board/ti/j721e/Kconfig"
 endif