From a7983730faf3c97adaa10efa251a011c29a1cd08 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 15 Aug 2019 22:07:12 -0400 Subject: aspeed: machine include cleanups Move most settings from the ast2xxx.inc files to aspeed.inc. This seems to be how other BSPs do it (e.g. meta-freescale) and it keeps everying in one consolidated location for easy perusal, comparison, etc. bitbake will take a different path through it's code while parsing but we wind up with the exact same variable settings in the end. Remove worthless comments from ast2xxx.inc file headers. (From meta-aspeed rev: 456a28202671507ca91b35103a13d3a1dac695db) Change-Id: Id8ed034350761770f5dae4d1a0adecc9bcfea3b5 Signed-off-by: Brad Bishop --- meta-aspeed/conf/machine/include/aspeed.inc | 8 ++++++++ meta-aspeed/conf/machine/include/ast2400.inc | 6 ------ meta-aspeed/conf/machine/include/ast2500.inc | 8 -------- meta-aspeed/conf/machine/include/ast2600.inc | 3 --- 4 files changed, 8 insertions(+), 17 deletions(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc index 7eaa346aad..8b3b4f91a0 100644 --- a/meta-aspeed/conf/machine/include/aspeed.inc +++ b/meta-aspeed/conf/machine/include/aspeed.inc @@ -18,4 +18,12 @@ 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-65 ?= "0x80001000" diff --git a/meta-aspeed/conf/machine/include/ast2400.inc b/meta-aspeed/conf/machine/include/ast2400.inc index 547a3c075d..4d82a342b1 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 34039b4cbf..3c5a4b6b8d 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 1857d14d36..fff5465d9d 100644 --- a/meta-aspeed/conf/machine/include/ast2600.inc +++ b/meta-aspeed/conf/machine/include/ast2600.inc @@ -2,6 +2,3 @@ SOC_FAMILY = "aspeed-g6" 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" -- cgit v1.2.3