diff --git a/meta-aspeed/conf/machine/include/ast2400.inc b/meta-aspeed/conf/machine/include/ast2400.inc
index 2237475..a7c900a 100644
--- a/meta-aspeed/conf/machine/include/ast2400.inc
+++ b/meta-aspeed/conf/machine/include/ast2400.inc
@@ -2,7 +2,10 @@
 #@NAME: Aspeed AST2400
 #@DESCRIPTION: Common machine configuration for the Aspeed AST2400 Chip
 
+SOC_FAMILY = "aspeed-g4"
+include conf/machine/include/soc-family.inc
 require conf/machine/include/aspeed.inc
+require conf/machine/include/tune-arm926ejs.inc
 
 UBOOT_MACHINE ?= "ast_g4_ncsi_config"
 UBOOT_ENTRYPOINT ?= "0x40001000"
@@ -11,9 +14,3 @@
 MACHINE_EXTRA_RDEPENDS += "udev-aspeed-vuart"
 
 SERIAL_CONSOLES = "115200;ttyS4"
-
-SOC_FAMILY = "aspeed-g4"
-include conf/machine/include/soc-family.inc
-MACHINEOVERRIDES .= ":ast2400"
-
-require conf/machine/include/tune-arm926ejs.inc