diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc
new file mode 100644
index 00000000..ce88567c
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/j7200.inc
@@ -0,0 +1,2 @@
+require conf/machine/include/j7.inc
+SOC_FAMILY:append = ":j7200"
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
new file mode 100644
index 00000000..d965327c
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -0,0 +1,4 @@
+require conf/machine/include/j7.inc
+SOC_FAMILY:append = ":j721e"
+
+MACHINE_FEATURES += "gpu"
diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
new file mode 100644
index 00000000..113f86c4
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -0,0 +1,2 @@
+require conf/machine/include/j7.inc
+SOC_FAMILY:append = ":j721s2"
diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf
index 2565c90c..175d30f8 100644
--- a/meta-ti-bsp/conf/machine/j7200-evm.conf
+++ b/meta-ti-bsp/conf/machine/j7200-evm.conf
@@ -2,7 +2,7 @@
 #@NAME: J7200 EVM
 #@DESCRIPTION: Machine configuration for the TI J7200 EVM
 
-require conf/machine/include/j7.inc
+require conf/machine/include/j7200.inc
 
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf
index 12d4fecb..fe28e6f5 100644
--- a/meta-ti-bsp/conf/machine/j721e-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721e-evm.conf
@@ -2,9 +2,7 @@
 #@NAME: J721e EVM
 #@DESCRIPTION: Machine configuration for the TI J721e EVM
 
-require conf/machine/include/j7.inc
-
-MACHINE_FEATURES += "gpu"
+require conf/machine/include/j721e.inc
 
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index 82fd33da..a2c15f74 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -2,7 +2,7 @@
 #@NAME: J721S2 EVM
 #@DESCRIPTION: Machine configuration for the TI J721S2 EVM
 
-require conf/machine/include/j7.inc
+require conf/machine/include/j721s2.inc
 
 SERIAL_CONSOLES = "115200;ttyS10"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"