7 files changed, 25 insertions, 42 deletions
diff --git a/meta-aspeed/conf/machine/evb-ast2500.conf b/meta-aspeed/conf/machine/evb-ast2500.conf
index 2689d3796..e8aebd18f 100644
--- a/meta-aspeed/conf/machine/evb-ast2500.conf
+++ b/meta-aspeed/conf/machine/evb-ast2500.conf
@@ -2,3 +2,5 @@ KERNEL_DEVICETREE = "aspeed-ast2500-evb.dtb"
 UBOOT_MACHINE = "ast_g5_phy_config"
 
 require conf/machine/include/ast2500.inc
+
+SERIAL_CONSOLES = "115200;ttyS4"
diff --git a/meta-aspeed/conf/machine/evb-ast2600.conf b/meta-aspeed/conf/machine/evb-ast2600.conf
index fd72baa17..9c8c64963 100644
--- a/meta-aspeed/conf/machine/evb-ast2600.conf
+++ b/meta-aspeed/conf/machine/evb-ast2600.conf
@@ -2,3 +2,5 @@ KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb"
 UBOOT_MACHINE = "evb-ast2600_defconfig"
 
 require conf/machine/include/ast2600.inc
+
+SERIAL_CONSOLES = "115200;ttyS4"
diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc
index e62af13b8..946eebccd 100644
--- a/meta-aspeed/conf/machine/include/aspeed.inc
+++ b/meta-aspeed/conf/machine/include/aspeed.inc
@@ -3,9 +3,28 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot ?= "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-fw-utils-aspeed"
 
-PREFERRED_PROVIDER_virtual/kernel_aspeed-g6 ?= "linux-aspeed-sdk"
 PREFERRED_PROVIDER_virtual/bootloader_aspeed-g6 ?= "u-boot-aspeed-sdk"
 PREFERRED_PROVIDER_u-boot_aspeed-g6 ?= "u-boot-aspeed-sdk"
 PREFERRED_PROVIDER_u-boot-fw-utils_aspeed-g6 ?= "u-boot-fw-utils-aspeed-sdk"
 
+# Build a FIT image and stuff core-image-minimal in it by default.
+KERNEL_IMAGETYPE ?= "fitImage"
+KERNEL_CLASSES ?= "kernel-fitimage"
+INITRAMFS_IMAGE ?= "aspeed-image-initramfs"
+INITRAMFS_FSTYPES ?= "cpio.xz"
+
+MACHINE_EXTRA_RRECOMMENDS += "udev-aspeed-vuart"
+
 MACHINEOVERRIDES =. "aspeed:"
+
+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-g6 ?= "0x80001000"
diff --git a/meta-aspeed/conf/machine/include/ast2400.inc b/meta-aspeed/conf/machine/include/ast2400.inc
index a7c900aa7..6284a2b64 100644
--- a/meta-aspeed/conf/machine/include/ast2400.inc
+++ b/meta-aspeed/conf/machine/include/ast2400.inc
@@ -1,16 +1,4 @@
-#@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"
-
-SERIAL_CONSOLES = "115200;ttyS4"
diff --git a/meta-aspeed/conf/machine/include/ast2500.inc b/meta-aspeed/conf/machine/include/ast2500.inc
index 49a62110a..0724157a9 100644
--- a/meta-aspeed/conf/machine/include/ast2500.inc
+++ b/meta-aspeed/conf/machine/include/ast2500.inc
@@ -1,18 +1,4 @@
-#@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"
-
-SERIAL_CONSOLES = "115200;ttyS4"
diff --git a/meta-aspeed/conf/machine/include/ast2600.inc b/meta-aspeed/conf/machine/include/ast2600.inc
index 2dcaaf613..fff5465d9 100644
--- a/meta-aspeed/conf/machine/include/ast2600.inc
+++ b/meta-aspeed/conf/machine/include/ast2600.inc
@@ -1,7 +1,4 @@
 SOC_FAMILY = "aspeed-g6"
 include conf/machine/include/soc-family.inc
 require conf/machine/include/aspeed.inc
-require conf/machine/include/tune-cortexa7.inc
-
-UBOOT_ENTRYPOINT = "0x80001000"
-UBOOT_LOADADDRESS = "0x80001000"
+include conf/machine/include/arm/arch-armv7a.inc
diff --git a/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc b/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc
deleted file mode 100644
index 5216533eb..000000000
--- a/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFAULTTUNE ?= "armv6t-novfp"
-
-require conf/machine/include/arm/arch-armv6.inc
-
-TUNEVALID[arm1176jzs] = "Enable arm1176jzs specific processor optimizations"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm1176jzs", "-mtune=arm1176jz-s", "", d)}"
-
-AVAILTUNES += "arm1176jzs"
-ARMPKGARCH_tune-arm1176jzs = "${ARMPKGARCH_tune-armv6t-novfp}"
-TUNE_FEATURES_tune-arm1176jzs = "${TUNE_FEATURES_tune-armv6t-novfp} arm1176jzs"
-PACKAGE_EXTRA_ARCHS_tune-arm1176jzs = "${PACKAGE_EXTRA_ARCHS_tune-armv6t-novfp}"