diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc
index 7eaa346..8b3b4f9 100644
--- a/meta-aspeed/conf/machine/include/aspeed.inc
+++ b/meta-aspeed/conf/machine/include/aspeed.inc
@@ -18,4 +18,12 @@
 
 SERIAL_CONSOLES ?= "115200;ttyS4"
 
+DEFAULTTUNE_aspeed-g5 ?= "arm1176jzs"
 DEFAULTTUNE_aspeed-g6 ?= "armv7a-vfpv4d16"
+
+UBOOT_ENTRYPOINT_aspeed-g4 ?= "0x40001000"
+UBOOT_ENTRYPOINT_aspeed-g5 ?= "0x80001000"
+UBOOT_ENTRYPOINT_aspeed-g6 ?= "0x80001000"
+UBOOT_LOADADDRESS_aspeed-g4 ?= "0x40001000"
+UBOOT_LOADADDRESS_aspeed-g5 ?= "0x80001000"
+UBOOT_LOADADDRESS_aspeed-65 ?= "0x80001000"
diff --git a/meta-aspeed/conf/machine/include/ast2400.inc b/meta-aspeed/conf/machine/include/ast2400.inc
index 547a3c0..4d82a34 100644
--- a/meta-aspeed/conf/machine/include/ast2400.inc
+++ b/meta-aspeed/conf/machine/include/ast2400.inc
@@ -1,14 +1,8 @@
-#@TYPE: Machine
-#@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"
-UBOOT_LOADADDRESS ?= "0x40001000"
 
 MACHINE_EXTRA_RDEPENDS += "udev-aspeed-vuart"
diff --git a/meta-aspeed/conf/machine/include/ast2500.inc b/meta-aspeed/conf/machine/include/ast2500.inc
index 34039b4..3c5a4b6 100644
--- a/meta-aspeed/conf/machine/include/ast2500.inc
+++ b/meta-aspeed/conf/machine/include/ast2500.inc
@@ -1,16 +1,8 @@
-#@TYPE: Machine
-#@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"
diff --git a/meta-aspeed/conf/machine/include/ast2600.inc b/meta-aspeed/conf/machine/include/ast2600.inc
index 1857d14..fff5465 100644
--- a/meta-aspeed/conf/machine/include/ast2600.inc
+++ b/meta-aspeed/conf/machine/include/ast2600.inc
@@ -2,6 +2,3 @@
 include conf/machine/include/soc-family.inc
 require conf/machine/include/aspeed.inc
 include conf/machine/include/arm/arch-armv7a.inc
-
-UBOOT_ENTRYPOINT = "0x80001000"
-UBOOT_LOADADDRESS = "0x80001000"