Every MACHINE build deploys a tiboot3.bin file for all three K3 security types (GP, HS-FS, HS-SE). These extra MACHINE configs existed to select a different default. As U-Boot now selects a default for us this logic does not need to exist here. Instead if one wants to use a non-default security type for an EVM then can simply rename the tiboot3.bin file in the boot partition. Testing automation already handles this and Sitara- family devices have dropped the dedicated MACHINE configs, do the same for Jacinto-family devices.
Signed-off-by: Andrew Davis <[email protected]> --- meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf | 11 ----------- meta-ti-bsp/conf/machine/am65xx-hs-evm.conf | 7 ------- meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf | 11 ----------- meta-ti-bsp/conf/machine/j7200-hs-evm.conf | 7 ------- meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf | 11 ----------- meta-ti-bsp/conf/machine/j721e-hs-evm.conf | 7 ------- meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf | 11 ----------- meta-ti-bsp/conf/machine/j721s2-hs-evm.conf | 5 ----- meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf | 11 ----------- meta-ti-bsp/conf/machine/j784s4-hs-evm.conf | 5 ----- 10 files changed, 86 deletions(-) delete mode 100644 meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf delete mode 100644 meta-ti-bsp/conf/machine/am65xx-hs-evm.conf delete mode 100644 meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf delete mode 100644 meta-ti-bsp/conf/machine/j7200-hs-evm.conf delete mode 100644 meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf delete mode 100644 meta-ti-bsp/conf/machine/j721e-hs-evm.conf delete mode 100644 meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf delete mode 100644 meta-ti-bsp/conf/machine/j721s2-hs-evm.conf delete mode 100644 meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf delete mode 100644 meta-ti-bsp/conf/machine/j784s4-hs-evm.conf diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf deleted file mode 100644 index 337c8413..00000000 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: AM65xx HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am65x_sr2" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" - -UBOOT_MACHINE = "am65x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf deleted file mode 100644 index f8221f31..00000000 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf +++ /dev/null @@ -1,7 +0,0 @@ -#@TYPE: Machine -#@NAME: AM65xx HS EVM -#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM - -require conf/machine/include/am65xx.inc - -UBOOT_MACHINE = "am65x_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf deleted file mode 100644 index 1922d5c8..00000000 --- a/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: J7200 HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI J7200 HS EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "j7200_sr2" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" - -UBOOT_MACHINE = "j7200_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j7200-hs-evm.conf b/meta-ti-bsp/conf/machine/j7200-hs-evm.conf deleted file mode 100644 index 54fd2b4a..00000000 --- a/meta-ti-bsp/conf/machine/j7200-hs-evm.conf +++ /dev/null @@ -1,7 +0,0 @@ -#@TYPE: Machine -#@NAME: J7200 HS EVM -#@DESCRIPTION: Machine configuration for the TI J7200 HS EVM - -require conf/machine/j7200-evm.conf - -UBOOT_MACHINE = "j7200_evm_a72_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf deleted file mode 100644 index 7904c660..00000000 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: J721e HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI J721e HS EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "j721e_sr1_1" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" - -UBOOT_MACHINE = "j721e_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf deleted file mode 100644 index 441ca169..00000000 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf +++ /dev/null @@ -1,7 +0,0 @@ -#@TYPE: Machine -#@NAME: J721e HS EVM -#@DESCRIPTION: Machine configuration for the TI J721e HS EVM - -require conf/machine/j721e-evm.conf - -UBOOT_MACHINE = "j721e_evm_a72_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf deleted file mode 100644 index 58cd92c4..00000000 --- a/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: J721S2 HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "j721s2" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" - -UBOOT_MACHINE = "j721s2_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf deleted file mode 100644 index 4cf32a28..00000000 --- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf +++ /dev/null @@ -1,5 +0,0 @@ -#@TYPE: Machine -#@NAME: J721S2 HS EVM -#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM - -require conf/machine/j721s2-evm.conf diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf deleted file mode 100644 index 80a228a0..00000000 --- a/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: J784S4 HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "j784s4" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" - -UBOOT_MACHINE = "j784s4_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf deleted file mode 100644 index 8fa1c1fd..00000000 --- a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf +++ /dev/null @@ -1,5 +0,0 @@ -#@TYPE: Machine -#@NAME: J784S4 HS EVM -#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM - -require conf/machine/j784s4-evm.conf -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#19318): https://lists.yoctoproject.org/g/meta-ti/message/19318 Mute This Topic: https://lists.yoctoproject.org/mt/116585422/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
