@@ -13,65 +13,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN
https://git.ti.com/cgit/k3-image-gen/k3-image-gen/
if BR2_TARGET_TI_K3_IMAGE_GEN
-choice
- prompt "SoC family"
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX
- bool "am62ax"
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X
- bool "am62x"
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X
- bool "am64x"
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X
- bool "am65x"
-
-endchoice
-
-choice
- prompt "Security type"
- help
- The target SoC security type option for image gen. Valid
- options are "gp" for General Purpose devices, "hs-fs" for
- High Security - Field Securable devices, or "hs" for High
- Security - Security Enforcing devices. Note for all High
- Security device variants the TI_SECURE_DEV_PKG environmental
- variable must be defined at build time pointing to a valid
- core-secdev-k3 folder location, otherwise the build will
- fail, see
- https://git.ti.com/cgit/security-development-tools/core-secdev-k3
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP
- bool "gp"
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS
- bool "hs-fs"
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS
- bool "hs"
-
-endchoice
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SOC
- string
- default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX
- default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X
- default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X
- default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X
config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE
string
- default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX
- default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X
- default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X
- default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE
- string
- default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP
- default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS
- default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS
+ default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62AX
+ default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62X
+ default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X
+ default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X
endif
@@ -26,8 +26,8 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \
$(BR2_MAKE_HOST_DEPENDENCY)
TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE))
-TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC))
-TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE))
+TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC))
+TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE))
TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin
@@ -244,21 +244,11 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM
bool "U-Boot needs TI K3 Device Manager (DM)"
# We use the SoC selection defined for the ti-k3-image-gen
# package
- depends on BR2_TARGET_TI_K3_IMAGE_GEN
- depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X
+ depends on BR2_PACKAGE_TI_K3_SOC_AM62AX || BR2_PACKAGE_TI_K3_SOC_AM62X
help
Some TI K3 devices need the Device Manager (DM) firmware to
be available for the U-Boot build.
-if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM
-
-config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME
- string
- default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX
- default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X
-
-endif
-
config BR2_TARGET_UBOOT_NEEDS_OPENSBI
bool "U-Boot needs OpenSBI"
depends on BR2_TARGET_OPENSBI
@@ -189,7 +189,7 @@ endif
ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y)
UBOOT_DEPENDENCIES += ti-k3-boot-firmware
ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),)
-UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME))
+UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_PACKAGE_TI_K3_DM_SOCNAME))
UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f
endif
endif
@@ -12,6 +12,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y
+BR2_PACKAGE_TI_K3=y
+BR2_PACKAGE_TI_K3_SOC_AM62X=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_EXT2_SIZE="256M"
@@ -24,7 +26,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y
BR2_TARGET_OPTEE_OS=y
BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x"
BR2_TARGET_TI_K3_IMAGE_GEN=y
-BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y
BR2_TARGET_TI_K3_R5_LOADER=y
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10"
@@ -12,6 +12,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y
+BR2_PACKAGE_TI_K3=y
+BR2_PACKAGE_TI_K3_SOC_AM64X=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
@@ -24,7 +26,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y
BR2_TARGET_OPTEE_OS=y
BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x"
BR2_TARGET_TI_K3_IMAGE_GEN=y
-BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y
BR2_TARGET_TI_K3_R5_LOADER=y
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10"
@@ -630,6 +630,7 @@ endmenu
source "package/sysstat/Config.in"
source "package/targetcli-fb/Config.in"
source "package/ti-gfx/Config.in"
+ source "package/ti-k3/Config.in"
source "package/ti-sgx-demos/Config.in"
source "package/ti-sgx-km/Config.in"
source "package/ti-sgx-um/Config.in"
new file mode 100644
@@ -0,0 +1,59 @@
+config BR2_PACKAGE_TI_K3
+ bool "TI K3"
+ help
+ The TI K3 SOC specific selections.
+
+if BR2_PACKAGE_TI_K3
+
+choice
+ prompt "SoC family"
+
+config BR2_PACKAGE_TI_K3_SOC_AM62AX
+ bool "am62ax"
+
+config BR2_PACKAGE_TI_K3_SOC_AM62X
+ bool "am62x"
+
+config BR2_PACKAGE_TI_K3_SOC_AM64X
+ bool "am64x"
+
+config BR2_PACKAGE_TI_K3_SOC_AM65X
+ bool "am65x"
+
+endchoice
+
+choice
+ prompt "Security type"
+ help
+ The target SoC security type option.
+
+config BR2_PACKAGE_TI_K3_SECTYPE_GP
+ bool "gp"
+
+config BR2_PACKAGE_TI_K3_SECTYPE_HS_FS
+ bool "hs-fs"
+
+config BR2_PACKAGE_TI_K3_SECTYPE_HS
+ bool "hs"
+
+endchoice
+
+config BR2_PACKAGE_TI_K3_SOC
+ string
+ default "am62ax" if BR2_PACKAGE_TI_K3_SOC_AM62AX
+ default "am62x" if BR2_PACKAGE_TI_K3_SOC_AM62X
+ default "am64x" if BR2_PACKAGE_TI_K3_SOC_AM64X
+ default "am65x" if BR2_PACKAGE_TI_K3_SOC_AM65X
+
+config BR2_PACKAGE_TI_K3_SECTYPE
+ string
+ default "gp" if BR2_PACKAGE_TI_K3_SECTYPE_GP
+ default "hs-fs" if BR2_PACKAGE_TI_K3_SECTYPE_HS_FS
+ default "hs" if BR2_PACKAGE_TI_K3_SECTYPE_HS
+
+config BR2_PACKAGE_TI_K3_DM_SOCNAME
+ string
+ default "am62axx" if BR2_PACKAGE_TI_K3_SOC_AM62AX
+ default "am62xx" if BR2_PACKAGE_TI_K3_SOC_AM62X
+
+endif
new file mode 100644
@@ -0,0 +1,7 @@
+################################################################################
+#
+# ti-k3
+#
+################################################################################
+
+include $(sort $(wildcard package/ti-k3/*/*.mk))