diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
index 564b571d..4cf32a28 100644
--- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
@@ -2,19 +2,4 @@
 #@NAME: J721S2 HS EVM
 #@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM
 
-require conf/machine/include/j721s2.inc
-
-TFA_K3_USART = "0x8"
-OPTEE_K3_USART = "0x8"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-j721s2 \
-    ti/k3-j7200-mcspi-loopback \
-    ti/k3-am68-sk \
-"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-j721s2-common-proc-board.dtb \
-"
-
-UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
+require conf/machine/j721s2-evm.conf