From b572721c6d6d584e9b9560c881c1e46ae49b14ef Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Thu, 4 Aug 2022 21:49:34 -0500 Subject: [PATCH] conf: machine: Move K3 TI_SECURE_DEV_PKG definition to common include The K3 TI_SECURE_DEV_PKG is the same for all devices, move this out of each machine file and into the common K3 includes. This doesn't have any effect on the GP machines as they make no use of it. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon --- conf/machine/am64xx-hs-evm-k3r5.conf | 2 -- conf/machine/am64xx-hs-evm.conf | 2 -- conf/machine/am65xx-hs-evm-k3r5.conf | 2 -- conf/machine/am65xx-hs-evm.conf | 2 -- conf/machine/include/k3.inc | 2 ++ conf/machine/include/k3r5.inc | 2 ++ conf/machine/j7-hs-evm-k3r5.conf | 2 -- conf/machine/j7-hs-evm.conf | 2 -- conf/machine/j7200-hs-evm-k3r5.conf | 2 -- conf/machine/j7200-hs-evm.conf | 2 -- conf/machine/j721s2-hs-evm-k3r5.conf | 2 -- conf/machine/j721s2-hs-evm.conf | 2 -- 12 files changed, 4 insertions(+), 20 deletions(-) diff --git a/conf/machine/am64xx-hs-evm-k3r5.conf b/conf/machine/am64xx-hs-evm-k3r5.conf index d12c030f..647c8beb 100644 --- a/conf/machine/am64xx-hs-evm-k3r5.conf +++ b/conf/machine/am64xx-hs-evm-k3r5.conf @@ -10,5 +10,3 @@ SYSFW_SUFFIX = "hs" SYSFW_SYMLINK = "" UBOOT_MACHINE = "am64x_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf index ebbe2e62..3ab9a49e 100644 --- a/conf/machine/am64xx-hs-evm.conf +++ b/conf/machine/am64xx-hs-evm.conf @@ -17,5 +17,3 @@ UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/am65xx-hs-evm-k3r5.conf b/conf/machine/am65xx-hs-evm-k3r5.conf index 81b8c75f..d9041c9d 100644 --- a/conf/machine/am65xx-hs-evm-k3r5.conf +++ b/conf/machine/am65xx-hs-evm-k3r5.conf @@ -16,5 +16,3 @@ UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/am65xx-hs-evm.conf b/conf/machine/am65xx-hs-evm.conf index de92cacb..ea1f8ff1 100644 --- a/conf/machine/am65xx-hs-evm.conf +++ b/conf/machine/am65xx-hs-evm.conf @@ -17,5 +17,3 @@ UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc index 24741dee..a5f96087 100644 --- a/conf/machine/include/k3.inc +++ b/conf/machine/include/k3.inc @@ -47,3 +47,5 @@ WKS_FILE ?= "sdimage-2part.wks" do_image_wic[depends] += "virtual/bootloader:do_deploy" do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy" do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy" + +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/include/k3r5.inc b/conf/machine/include/k3r5.inc index 035ad812..c29d6c95 100644 --- a/conf/machine/include/k3r5.inc +++ b/conf/machine/include/k3r5.inc @@ -22,3 +22,5 @@ UBOOT_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" PACKAGECONFIG_pn-u-boot-ti-staging = "" PACKAGECONFIG_pn-u-boot-ti-mainline = "" + +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/j7-hs-evm-k3r5.conf b/conf/machine/j7-hs-evm-k3r5.conf index c0ddfcec..e4b233db 100644 --- a/conf/machine/j7-hs-evm-k3r5.conf +++ b/conf/machine/j7-hs-evm-k3r5.conf @@ -16,5 +16,3 @@ UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf index ff998dc7..bbfe6fcb 100644 --- a/conf/machine/j7-hs-evm.conf +++ b/conf/machine/j7-hs-evm.conf @@ -25,5 +25,3 @@ BBMULTICONFIG += "k3r5-sr1-1" IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb" do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy" do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/j7200-hs-evm-k3r5.conf b/conf/machine/j7200-hs-evm-k3r5.conf index 3f134877..3fe06e74 100644 --- a/conf/machine/j7200-hs-evm-k3r5.conf +++ b/conf/machine/j7200-hs-evm-k3r5.conf @@ -9,5 +9,3 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" UBOOT_MACHINE = "j7200_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf index 8821ffac..ef7268b1 100644 --- a/conf/machine/j7200-hs-evm.conf +++ b/conf/machine/j7200-hs-evm.conf @@ -17,5 +17,3 @@ UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/j721s2-hs-evm-k3r5.conf b/conf/machine/j721s2-hs-evm-k3r5.conf index ac4df86e..a4d51904 100644 --- a/conf/machine/j721s2-hs-evm-k3r5.conf +++ b/conf/machine/j721s2-hs-evm-k3r5.conf @@ -9,5 +9,3 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" UBOOT_MACHINE = "j721s2_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/j721s2-hs-evm.conf b/conf/machine/j721s2-hs-evm.conf index 7ffad45a..84db90bb 100644 --- a/conf/machine/j721s2-hs-evm.conf +++ b/conf/machine/j721s2-hs-evm.conf @@ -17,5 +17,3 @@ UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"