diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-08-16 05:07:12 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-08-16 16:18:36 +0300 |
| commit | a7983730faf3c97adaa10efa251a011c29a1cd08 (patch) | |
| tree | 2f3e7d32d58e6223c0c3cbdad49db4c2e1900b76 /meta-aspeed/conf | |
| parent | 1329245c32d91e40ce677cd12842b424d4f4c803 (diff) | |
| download | openbmc-a7983730faf3c97adaa10efa251a011c29a1cd08.tar.xz | |
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 <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-aspeed/conf')
| -rw-r--r-- | meta-aspeed/conf/machine/include/aspeed.inc | 8 | ||||
| -rw-r--r-- | meta-aspeed/conf/machine/include/ast2400.inc | 6 | ||||
| -rw-r--r-- | meta-aspeed/conf/machine/include/ast2500.inc | 8 | ||||
| -rw-r--r-- | meta-aspeed/conf/machine/include/ast2600.inc | 3 |
4 files changed, 8 insertions, 17 deletions
diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc index 7eaa346aa..8b3b4f91a 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 547a3c075..4d82a342b 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 34039b4cb..3c5a4b6b8 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 1857d14d3..fff5465d9 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" |