| Message ID | 20251202223210.3816583-4-afd@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-ti,master,1/4] conf: machine: Remove remaining K3 HS machines | expand |
diff --git a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf index 65616b67..6366174f 100644 --- a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf +++ b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf @@ -5,8 +5,4 @@ require conf/machine/include/k3r5.inc require conf/machine/include/beagle-bsp.inc -SYSFW_SOC = "j721e" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - UBOOT_MACHINE = "j721e_beagleboneai64_r5_defconfig" diff --git a/meta-beagle/conf/machine/beagley-ai-k3r5.conf b/meta-beagle/conf/machine/beagley-ai-k3r5.conf index c00c14d1..06c74cf9 100644 --- a/meta-beagle/conf/machine/beagley-ai-k3r5.conf +++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf @@ -5,10 +5,6 @@ require conf/machine/include/k3r5.inc require conf/machine/include/beagle-bsp.inc -SYSFW_SOC = "j722s" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - UBOOT_MACHINE = "am67a_beagley_ai_r5_defconfig" UBOOT_MACHINE:bsp-bb_org-6_6 = "j722s_evm_r5_defconfig" UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_r5_defconfig" diff --git a/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf b/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf index b506cf7d..22535996 100644 --- a/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf +++ b/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf @@ -5,8 +5,4 @@ require conf/machine/include/k3r5.inc require conf/machine/include/beagle-bsp.inc -SYSFW_SOC = "am62x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - UBOOT_MACHINE = "am62_pocketbeagle2_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf index 7abe706e..e02e10ed 100644 --- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf @@ -4,10 +4,6 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "am62ax" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - UBOOT_MACHINE = "am62ax_evm_r5_defconfig" UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config" diff --git a/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf index 00906420..7533eb5b 100644 --- a/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf @@ -4,8 +4,4 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "am62dx" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - UBOOT_MACHINE = "am62dx_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf index a4b1005b..44744c46 100644 --- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf @@ -4,10 +4,6 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "am62px" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - UBOOT_MACHINE = "am62px_evm_r5_defconfig" UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf index cd95a45e..1665f586 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf @@ -4,10 +4,6 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "am62x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - UBOOT_MACHINE = "am62x_evm_r5_defconfig" UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf index 29638d1d..8319ae19 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf @@ -4,10 +4,6 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "am62x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config" diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf index e846c0da..c20b9619 100644 --- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf @@ -4,9 +4,5 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "am62x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - UBOOT_MACHINE = "am6254xxl_evm_r5_defconfig" UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf index e932928a..4b97adaf 100644 --- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf @@ -4,8 +4,4 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "am64x_sr2" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf index 8744ac3e..23e302a8 100644 --- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf @@ -4,8 +4,4 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "am65x_sr2" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - UBOOT_MACHINE = "am65x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf b/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf index f8ce3688..4637f7a5 100644 --- a/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf @@ -4,8 +4,4 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "j721s2" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - UBOOT_MACHINE = "am68_sk_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf index 9d2b4cd6..b989cf98 100644 --- a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf @@ -4,8 +4,4 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "j784s4" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - UBOOT_MACHINE = "am69_sk_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf index b597c702..6996cc2b 100644 --- a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf @@ -4,8 +4,4 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "am62x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc index 0408c09c..95dfd0c3 100644 --- a/meta-ti-bsp/conf/machine/include/k3r5.inc +++ b/meta-ti-bsp/conf/machine/include/k3r5.inc @@ -16,8 +16,7 @@ require conf/machine/include/ti-bsp.inc PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" UBOOT_SUFFIX = "bin" -UBOOT_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "tiboot3.${UBOOT_SUFFIX}" +UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" PACKAGECONFIG:pn-u-boot-ti-staging = "" PACKAGECONFIG:pn-u-boot-ti-mainline = "" diff --git a/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf index 68061883..a35607ad 100644 --- a/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf @@ -4,8 +4,4 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "j7200" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - UBOOT_MACHINE = "j7200_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf index 070bf7aa..6f904c58 100644 --- a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf @@ -4,8 +4,4 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "j721e" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - UBOOT_MACHINE = "j721e_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf index 45eaabb6..a5c10824 100644 --- a/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf @@ -4,8 +4,4 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "j721e" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - UBOOT_MACHINE = "j721e_sk_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf index 508e96e5..40d10f13 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf @@ -4,8 +4,4 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "j721s2" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - UBOOT_MACHINE = "j721s2_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf index 2c884ffd..fcdf3e8a 100644 --- a/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf @@ -4,8 +4,4 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "j722s" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - UBOOT_MACHINE = "j722s_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf index 41bf401e..9adeb306 100644 --- a/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf @@ -4,8 +4,4 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "j742s2" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - UBOOT_MACHINE = "j742s2_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf index 04feebc6..754eb5f6 100644 --- a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf @@ -4,8 +4,4 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "j784s4" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - UBOOT_MACHINE = "j784s4_evm_r5_defconfig"
These were used back when each board had to select the correct tiboot3.bin to become the default for that board's image. Two things have changed since then, first we deploy all options for tiboot3.bin generated by U-Boot. And second, U-Boot's binman tool now symlinks the most appropriate version of this file for us for the selected U-Boot defconfig file. These are no longer needed so drop them. Signed-off-by: Andrew Davis <afd@ti.com> --- meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf | 4 ---- meta-beagle/conf/machine/beagley-ai-k3r5.conf | 4 ---- meta-beagle/conf/machine/pocketbeagle2-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/am68-sk-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/am69-sk-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/include/k3r5.inc | 3 +-- meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf | 4 ---- meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf | 4 ---- 22 files changed, 1 insertion(+), 86 deletions(-)