diff --git a/conf/machine/include/aspeed.inc b/conf/machine/include/aspeed.inc
index 4bed9e3..7eaa346 100644
--- a/conf/machine/include/aspeed.inc
+++ b/conf/machine/include/aspeed.inc
@@ -17,3 +17,5 @@
 MACHINEOVERRIDES =. "aspeed:"
 
 SERIAL_CONSOLES ?= "115200;ttyS4"
+
+DEFAULTTUNE_aspeed-g6 ?= "armv7a-vfpv4d16"
diff --git a/conf/machine/include/ast2600.inc b/conf/machine/include/ast2600.inc
index 2dcaaf6..1857d14 100644
--- a/conf/machine/include/ast2600.inc
+++ b/conf/machine/include/ast2600.inc
@@ -1,7 +1,7 @@
 SOC_FAMILY = "aspeed-g6"
 include conf/machine/include/soc-family.inc
 require conf/machine/include/aspeed.inc
-require conf/machine/include/tune-cortexa7.inc
+include conf/machine/include/arm/arch-armv7a.inc
 
 UBOOT_ENTRYPOINT = "0x80001000"
 UBOOT_LOADADDRESS = "0x80001000"