diff --git a/conf/machine/include/aspeed.inc b/conf/machine/include/aspeed.inc
index 88290ff..36153cf 100644
--- a/conf/machine/include/aspeed.inc
+++ b/conf/machine/include/aspeed.inc
@@ -3,4 +3,4 @@
 PREFERRED_PROVIDER_u-boot ?= "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-fw-utils-aspeed"
 
-MACHINEOVERRIDES .= ":aspeed"
+MACHINEOVERRIDES =. "aspeed:"
diff --git a/conf/machine/include/ast2400.inc b/conf/machine/include/ast2400.inc
index 2237475..a7c900a 100644
--- a/conf/machine/include/ast2400.inc
+++ b/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
diff --git a/conf/machine/include/ast2500.inc b/conf/machine/include/ast2500.inc
index fe079ee..49a6211 100644
--- a/conf/machine/include/ast2500.inc
+++ b/conf/machine/include/ast2500.inc
@@ -2,20 +2,17 @@
 #@NAME: Aspeed AST2500
 #@DESCRIPTION: Common machine configuration for the Aspeed AST2500 Chip
 
+SOC_FAMILY = "aspeed-g5"
+include conf/machine/include/soc-family.inc
 require conf/machine/include/aspeed.inc
 
+DEFAULTTUNE ?= "arm1176jzs"
+require conf/machine/include/tune-arm1176jz-s.inc
+
 UBOOT_MACHINE ?= "ast_g5_ncsi_config"
 UBOOT_ENTRYPOINT ?= "0x80001000"
 UBOOT_LOADADDRESS ?= "0x80001000"
 
 MACHINE_EXTRA_RDEPENDS += "udev-aspeed-vuart"
 
-DEFAULTTUNE ?= "arm1176jzs"
-
 SERIAL_CONSOLES = "115200;ttyS4"
-
-SOC_FAMILY = "aspeed-g5"
-include conf/machine/include/soc-family.inc
-MACHINEOVERRIDES .= ":ast2500"
-
-require conf/machine/include/tune-arm1176jz-s.inc
diff --git a/recipes-kernel/linux/linux-aspeed.inc b/recipes-kernel/linux/linux-aspeed.inc
index 9343393..06c9e3c 100644
--- a/recipes-kernel/linux/linux-aspeed.inc
+++ b/recipes-kernel/linux/linux-aspeed.inc
@@ -10,9 +10,6 @@
 SRC_URI = "${KSRC}"
 SRC_URI += " file://defconfig"
 
-FILESEXTRAPATHS_prepend_ast2400 := "${THISDIR}/ast2400:"
-FILESEXTRAPATHS_prepend_ast2500 := "${THISDIR}/ast2500:"
-
 LINUX_VERSION_EXTENSION ?= "-${SRCREV}"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/recipes-kernel/linux/ast2400/defconfig b/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig
similarity index 100%
rename from recipes-kernel/linux/ast2400/defconfig
rename to recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig
diff --git a/recipes-kernel/linux/ast2500/defconfig b/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig
similarity index 100%
rename from recipes-kernel/linux/ast2500/defconfig
rename to recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig