summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-bsp
diff options
context:
space:
mode:
authorXo Wang <xow@google.com>2018-01-17 12:28:11 -0800
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-01-23 17:02:08 +0000
commit4bc9ca81b59a4c5cb122a136b1c41a4d99ada02d (patch)
tree40a68be891e37cce65ad42c69dd4f0a339e6802e /meta-openbmc-bsp
parente3e4d880a168db15be705f7a742bf673fc281c97 (diff)
downloadtalos-openbmc-4bc9ca81b59a4c5cb122a136b1c41a4d99ada02d.tar.gz
talos-openbmc-4bc9ca81b59a4c5cb122a136b1c41a4d99ada02d.zip
meta-aspeed: Set SOC_FAMILY in SoC include files
Set SOC_FAMILY to aspeed-g4 and aspeed-g5 in ast2400 and ast2500 SoC include files, respectively. Include soc-family.inc so that the family is added to MACHINEOVERRIDES. This is just minor cleanup that helps set the scene for creating Aspeed model-specific include files (though I don't plan to do this). Tested: Inspected OVERRIDES with the bb utility. MACHINEOVERRIDES for witherspoon is now "openbmc:armv6:aspeed-g5:witherspoon:ast2500". Signed-off-by: Xo Wang <xow@google.com> Change-Id: I4175915b750b04f36e7b3bd354a55b6a4f7f51fb
Diffstat (limited to 'meta-openbmc-bsp')
-rw-r--r--meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc2
-rw-r--r--meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc2
2 files changed, 4 insertions, 0 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
index 0215a0dd1..49c6c23ef 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
@@ -14,6 +14,8 @@ MACHINE_EXTRA_RDEPENDS += "udev-aspeed-vuart"
SERIAL_CONSOLES = "115200;ttyS4"
+SOC_FAMILY = "aspeed-g4"
+include conf/machine/include/soc-family.inc
MACHINEOVERRIDES .= ":ast2400"
require conf/machine/include/tune-arm926ejs.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
index 01f299cb4..2805ea079 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
@@ -14,6 +14,8 @@ DEFAULTTUNE = "armv6-novfp"
SERIAL_CONSOLES = "115200;ttyS4"
+SOC_FAMILY = "aspeed-g5"
+include conf/machine/include/soc-family.inc
MACHINEOVERRIDES .= ":ast2500"
require conf/machine/include/arm/arch-armv6.inc
OpenPOWER on IntegriCloud