diff mbox series

[meta-ti,master/kirkstone,9/9] conf: machine: Remove all leftover config files

Message ID 20230525181132.417197-10-afd@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series Switch to U-Boot binman | expand

Commit Message

Andrew Davis May 25, 2023, 6:11 p.m. UTC 
Signed-off-by: Andrew Davis <afd@ti.com>
---
 .../conf/machine/am62axx-evm-k3r5-gp.conf     | 19 ----------------
 .../conf/machine/am62axx-evm-k3r5-hs-fs.conf  | 14 ------------
 .../conf/machine/am62axx-evm-k3r5-hs-se.conf  | 22 -------------------
 .../conf/machine/am62xx-evm-k3r5-gp.conf      | 18 ---------------
 .../conf/machine/am62xx-evm-k3r5-hs-fs.conf   | 14 ------------
 .../conf/machine/am62xx-evm-k3r5-hs-se.conf   | 21 ------------------
 .../machine/am62xx-lp-evm-k3r5-hs-fs.conf     | 14 ------------
 .../machine/am62xx-lp-evm-k3r5-hs-se.conf     | 21 ------------------
 .../conf/machine/am64xx-evm-k3r5-gp.conf      | 20 -----------------
 .../machine/am64xx-evm-k3r5-sr2-hs-fs.conf    | 14 ------------
 .../machine/am64xx-evm-k3r5-sr2-hs-se.conf    | 20 -----------------
 .../conf/machine/am65xx-evm-k3r5-sr2.conf     | 11 ----------
 .../conf/machine/am65xx-hs-evm-k3r5-sr2.conf  | 11 ----------
 .../conf/machine/j721s2-evm-k3r5-gp.conf      | 20 -----------------
 .../machine/j721s2-evm-k3r5-sr1-hs-fs.conf    | 15 -------------
 .../conf/machine/j784s4-evm-k3r5-gp.conf      | 20 -----------------
 .../machine/j784s4-evm-k3r5-sr1-hs-fs.conf    | 16 --------------
 meta-ti-bsp/conf/multiconfig/k3r5-gp.conf     |  3 ---
 meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf  |  3 ---
 meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf  |  3 ---
 .../conf/multiconfig/k3r5-sr1-hs-fs.conf      |  3 ---
 meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf    |  3 ---
 .../conf/multiconfig/k3r5-sr2-hs-fs.conf      |  3 ---
 .../conf/multiconfig/k3r5-sr2-hs-se.conf      |  3 ---
 meta-ti-bsp/conf/multiconfig/k3r5-sr2.conf    |  3 ---
 25 files changed, 314 deletions(-)
 delete mode 100644 meta-ti-bsp/conf/machine/am62axx-evm-k3r5-gp.conf
 delete mode 100644 meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-fs.conf
 delete mode 100644 meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-se.conf
 delete mode 100644 meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf
 delete mode 100644 meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf
 delete mode 100644 meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-se.conf
 delete mode 100644 meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf
 delete mode 100644 meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
 delete mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf
 delete mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf
 delete mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf
 delete mode 100644 meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf
 delete mode 100644 meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf
 delete mode 100644 meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf
 delete mode 100644 meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf
 delete mode 100644 meta-ti-bsp/conf/machine/j784s4-evm-k3r5-gp.conf
 delete mode 100644 meta-ti-bsp/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf
 delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-gp.conf
 delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf
 delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf
 delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf
 delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf
 delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf
 delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-se.conf
 delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr2.conf
diff mbox series

Patch

diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-gp.conf
deleted file mode 100644
index 962413c3..00000000
--- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-gp.conf
+++ /dev/null
@@ -1,19 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: AM62A GP EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62A GP EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am62ax"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-SYSFW_TIBOOT3_SYMLINK = ""
-SYSFW_SYMLINK = ""
-
-UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
-
-SPL_BINARY = ""
-UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-fs.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-fs.conf
deleted file mode 100644
index 256f021a..00000000
--- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-fs.conf
+++ /dev/null
@@ -1,14 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: AM62A HS-FS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62A HS-FS EVM (R5F core)
-
-# Booting HS-FS requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY:append = ":k3r5-hs-fs"
-
-SYSFW_SOC = "am62ax"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-se.conf
deleted file mode 100644
index c7cb0681..00000000
--- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-se.conf
+++ /dev/null
@@ -1,22 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: AM62A HS-SE EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62A HS-SE EVM (R5F core)
-
-# Booting HS-SE requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY:append = ":k3r5-hs-se"
-
-SYSFW_SOC = "am62ax"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-SYSFW_TIBOOT3_SYMLINK = ""
-SYSFW_SYMLINK = ""
-
-UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
-
-SPL_BINARY = ""
-UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf
deleted file mode 100644
index ab18301a..00000000
--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf
+++ /dev/null
@@ -1,18 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: AM62XX EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-SYSFW_TIBOOT3_SYMLINK = ""
-
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
-
-SPL_BINARY = ""
-UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf
deleted file mode 100644
index 0dad1104..00000000
--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf
+++ /dev/null
@@ -1,14 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: AM62xx HS-FS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62xx HS-FS EVM (R5F core)
-
-# Booting HS-FS requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY:append = ":k3r5-hs-fs"
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-se.conf
deleted file mode 100644
index 7bca513a..00000000
--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-se.conf
+++ /dev/null
@@ -1,21 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: AM62xx HS-SE EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62xx HS-SE EVM (R5F core)
-
-# Booting HS-SE requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY:append = ":k3r5-hs-se"
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-SYSFW_TIBOOT3_SYMLINK = ""
-
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
-
-SPL_BINARY = ""
-UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf
deleted file mode 100644
index 9026b67c..00000000
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf
+++ /dev/null
@@ -1,14 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: AM62xx LPSK HS-FS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62xx LP HS-FS EVM (R5F core)
-
-# Booting HS-FS requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY:append = ":k3r5-hs-fs"
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
deleted file mode 100644
index c126de0f..00000000
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
+++ /dev/null
@@ -1,21 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: AM62xx LPSK HS-SE EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62xx LP HS-SE EVM (R5F core)
-
-# Booting HS-SE requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY:append = ":k3r5-hs-se"
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-SYSFW_TIBOOT3_SYMLINK = ""
-
-UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
-
-SPL_BINARY = ""
-UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf
deleted file mode 100644
index 50bf6a07..00000000
--- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf
+++ /dev/null
@@ -1,20 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: AM64xx GP EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM64xx GP EVM (R5F core)
-
-# Booting GP requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY:append = ":k3r5-gp"
-
-SYSFW_SOC = "am64x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-SYSFW_TIBOOT3_SYMLINK = ""
-
-UBOOT_MACHINE = "am64x_evm_r5_defconfig"
-
-SPL_BINARY = ""
-UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf
deleted file mode 100644
index 42ddbb4c..00000000
--- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf
+++ /dev/null
@@ -1,14 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: AM64xx SR2.0 HS-FS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-FS EVM (R5F core)
-
-# Booting SR2.0 HS-FS requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY:append = ":k3r5-sr2-hs-fs"
-
-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/am64xx-evm-k3r5-sr2-hs-se.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf
deleted file mode 100644
index a1c2b3e6..00000000
--- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf
+++ /dev/null
@@ -1,20 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: AM64xx SR2.0 HS-SE EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-SE EVM (R5F core)
-
-# Booting SR2.0 HS-SE requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY:append = ":k3r5-sr2-hs-se"
-
-SYSFW_SOC = "am64x_sr2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-SYSFW_TIBOOT3_SYMLINK = ""
-
-UBOOT_MACHINE = "am64x_evm_r5_defconfig"
-
-SPL_BINARY = ""
-UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-sr2-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl-sr2-hs-se.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf
deleted file mode 100644
index e74dd3ab..00000000
--- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf
+++ /dev/null
@@ -1,11 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: AM65xx SR2.0 EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 EVM (R5F core)
-
-# Booting SR2 requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/am65xx-evm-k3r5.conf
-SOC_FAMILY:append = ":k3r5-sr2"
-
-SYSFW_SOC = "am65x_sr2"
-SYSFW_SYMLINK = "sysfw.itb"
diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf
deleted file mode 100644
index ff1645e4..00000000
--- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf
+++ /dev/null
@@ -1,11 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: AM65xx SR2.0 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 HS EVM (R5F core)
-
-# Booting SR2 requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/am65xx-hs-evm-k3r5.conf
-SOC_FAMILY:append = ":k3r5-sr2"
-
-SYSFW_SOC = "am65x_sr2"
-SYSFW_SYMLINK = "sysfw.itb"
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf
deleted file mode 100644
index 95771139..00000000
--- a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf
+++ /dev/null
@@ -1,20 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: J721S2 GP EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J721S2 GP EVM (R5F core)
-
-# Booting GP requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY:append = ":k3r5-gp"
-
-SYSFW_SOC = "j721s2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin"
-
-UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
-
-SPL_BINARY = ""
-UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf
deleted file mode 100644
index 1a77830d..00000000
--- a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf
+++ /dev/null
@@ -1,15 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: J721S2 HS-FS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J721S2 HS-FS EVM (R5F core)
-
-# Booting HS-FS requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY:append = ":k3r5-sr1-hs-fs"
-
-SYSFW_SOC = "j721s2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-SYSFW_TIBOOT3_SYMLINK = ""
-
-UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-gp.conf
deleted file mode 100644
index 6f7ef92e..00000000
--- a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-gp.conf
+++ /dev/null
@@ -1,20 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: J784S4 GP EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J784S4 GP EVM (R5F core)
-
-# Booting GP requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY:append = ":k3r5-gp"
-
-SYSFW_SOC = "j784s4"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin"
-
-UBOOT_MACHINE = "j784s4_evm_r5_defconfig"
-
-SPL_BINARY = ""
-UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf
deleted file mode 100644
index 18b38305..00000000
--- a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf
+++ /dev/null
@@ -1,16 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: J784S4 HS-FS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J784S4 HS-FS EVM (R5F core)
-
-# Booting HS-FS requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY:append = ":k3r5-sr1-hs-fs"
-
-SYSFW_SOC = "j784s4"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-SYSFW_TIBOOT3_SYMLINK = ""
-SYSFW_SYMLINK = ""
-
-UBOOT_MACHINE = "j784s4_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-gp.conf b/meta-ti-bsp/conf/multiconfig/k3r5-gp.conf
deleted file mode 100644
index 80491e35..00000000
--- a/meta-ti-bsp/conf/multiconfig/k3r5-gp.conf
+++ /dev/null
@@ -1,3 +0,0 @@ 
-require k3r5.conf
-
-MACHINE:append = "-gp"
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf b/meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf
deleted file mode 100644
index e22204ee..00000000
--- a/meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf
+++ /dev/null
@@ -1,3 +0,0 @@ 
-require k3r5.conf
-
-MACHINE:append = "-hs-fs"
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf b/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf
deleted file mode 100644
index 7e3d7dae..00000000
--- a/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf
+++ /dev/null
@@ -1,3 +0,0 @@ 
-require k3r5.conf
-
-MACHINE:append = "-hs-se"
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf
deleted file mode 100644
index 505f08d5..00000000
--- a/meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf
+++ /dev/null
@@ -1,3 +0,0 @@ 
-require k3r5-sr1.conf
-
-MACHINE:append = "-hs-fs"
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf
deleted file mode 100644
index 1c8098cd..00000000
--- a/meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf
+++ /dev/null
@@ -1,3 +0,0 @@ 
-require k3r5.conf
-
-MACHINE:append = "-sr1"
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf
deleted file mode 100644
index 98972326..00000000
--- a/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf
+++ /dev/null
@@ -1,3 +0,0 @@ 
-require k3r5-sr2.conf
-
-MACHINE:append = "-hs-fs"
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-se.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-se.conf
deleted file mode 100644
index 8b98fc0a..00000000
--- a/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-se.conf
+++ /dev/null
@@ -1,3 +0,0 @@ 
-require k3r5-sr2.conf
-
-MACHINE:append = "-hs-se"
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr2.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr2.conf
deleted file mode 100644
index e933b9cc..00000000
--- a/meta-ti-bsp/conf/multiconfig/k3r5-sr2.conf
+++ /dev/null
@@ -1,3 +0,0 @@ 
-require k3r5.conf
-
-MACHINE:append = "-sr2"