summaryrefslogtreecommitdiff
path: root/meta-aspeed/conf/machine/include/ast2500.inc
diff options
context:
space:
mode:
Diffstat (limited to 'meta-aspeed/conf/machine/include/ast2500.inc')
-rw-r--r--meta-aspeed/conf/machine/include/ast2500.inc13
1 files changed, 5 insertions, 8 deletions
diff --git a/meta-aspeed/conf/machine/include/ast2500.inc b/meta-aspeed/conf/machine/include/ast2500.inc
index fe079ee61..49a62110a 100644
--- a/meta-aspeed/conf/machine/include/ast2500.inc
+++ b/meta-aspeed/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