arm: K3: Add initial support for TI's K3 generation of SoCs

Add support for Texas Instruments' K3 Generation Processor
families.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/Kconfig b/Kconfig
index d96e3373c198bb7b74b0363e507bb2033b12d14d..1aadf5dd2d793bcb85368e9554085ad45c102eeb 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -453,7 +453,7 @@ config SYS_EXTRA_OPTIONS
 config SYS_TEXT_BASE
        depends on !NIOS2 && !XTENSA
        depends on !EFI_APP
-       default 0x80800000 if ARCH_OMAP2PLUS
+       default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3
        default 0x4a000000 if ARCH_SUNXI && !MACH_SUN9I && !MACH_SUN8I_V3S
        default 0x2a000000 if ARCH_SUNXI && MACH_SUN9I
        default 0x42e00000 if ARCH_SUNXI && MACH_SUN8I_V3S

diff --git a/MAINTAINERS b/MAINTAINERS
index a1c31e24ab9d01dbd565a7126d8878d41847df68..64f6b38196f83f51d7a8a58e6930186b90585275 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -272,6 +272,7 @@ M:  Tom Rini <trini@konsulko.com>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-ti.git
 F:     arch/arm/mach-davinci/
+F:     arch/arm/mach-k3/
 F:     arch/arm/mach-keystone/
 F:     arch/arm/include/asm/arch-omap*/
 F:     arch/arm/include/asm/ti-common/

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b71160573abcad1e0ac1f6118b930c4b6ad31e65..0f8dd32bdd0ee3f0f9c2960805f7db99ebc504b9 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -646,6 +646,12 @@ config ARCH_KEYSTONE
        imply CMD_SAVES
        imply FIT
 
+config ARCH_K3
+       bool "Texas Instruments' K3 Architecture"
+       select SPL
+       select SUPPORT_SPL
+       select FIT
+
 config ARCH_OMAP2PLUS
        bool "TI OMAP2+"
        select CPU_V7A
@@ -1377,6 +1383,8 @@ source "arch/arm/mach-highbank/Kconfig"
 
 source "arch/arm/mach-integrator/Kconfig"
 
+source "arch/arm/mach-k3/Kconfig"
+
 source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 4e1b8cfa3525f914285c56cb46efa71e3dd97743..8f50560434b91d0f1daa5528833791f7e8041a9d 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -58,6 +58,7 @@ machine-$(CONFIG_ARCH_BCMSTB)         += bcmstb
 machine-$(CONFIG_ARCH_DAVINCI)         += davinci
 machine-$(CONFIG_ARCH_EXYNOS)          += exynos
 machine-$(CONFIG_ARCH_HIGHBANK)                += highbank
+machine-$(CONFIG_ARCH_K3)              += k3
 machine-$(CONFIG_ARCH_KEYSTONE)                += keystone
 # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
 machine-$(CONFIG_KIRKWOOD)             += kirkwood

diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig
new file mode 100644 (file)
index 0000000..552b849
--- /dev/null
+++ b/arch/arm/mach-k3/Kconfig
@@ -0,0 +1,12 @@
+if ARCH_K3
+
+choice
+       prompt "Texas Instruments' K3 based SoC select"
+       optional
+
+endchoice
+
+config SYS_SOC
+       default "k3"
+
+endif

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 2e79d7d22b68786d3302fdfc493af09b72246fa9..e5a5188de8f1e8a00b02a81f0997e0372a94a10d 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -171,7 +171,7 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR
        default 0x140 if ARCH_MVEBU
        default 0x200 if ARCH_SOCFPGA || ARCH_AT91
        default 0x300 if ARCH_ZYNQ || ARCH_KEYSTONE || OMAP34XX || OMAP44XX || \
-                        OMAP54XX || AM33XX || AM43XX
+                        OMAP54XX || AM33XX || AM43XX || ARCH_K3
        default 0x4000 if ARCH_ROCKCHIP
        help
          Address on the MMC to load U-Boot from, when the MMC is being used

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 41f43af01f3ba0941558639cd30504035499d629..5fa27254e3053a7520c3e2bb6df67ab7636bc246 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -628,7 +628,7 @@ config MSM_SERIAL
 config OMAP_SERIAL
        bool "Support for OMAP specific UART"
        depends on DM_SERIAL
-       default y if ARCH_OMAP2PLUS
+       default y if (ARCH_OMAP2PLUS || ARCH_K3)
        select SYS_NS16550
        help
          If you have an TI based SoC and want to use the on-chip serial