summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-bsp
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2018-02-08 14:58:03 -0500
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-02-23 13:43:40 -0500
commit511b7cc6b84533e9b0575511f317dbfb86425d97 (patch)
tree6ccb517911bd4b3f16e1efd1f648a3f9f980cddc /meta-openbmc-bsp
parent1f5eaa8b7d5677a33f093788c29a0d8dae9dd7a4 (diff)
downloadtalos-openbmc-511b7cc6b84533e9b0575511f317dbfb86425d97.tar.gz
talos-openbmc-511b7cc6b84533e9b0575511f317dbfb86425d97.zip
aspeed: Add Aspeed global configuration file
Create a common Aspeed layer configuration file to host pointers to things like u-boot and kernel trees that support SOCs from Aspeed. Tested: Built image and verified in witherspoon qemu Change-Id: I9ad2720d8b4dff191e43be0b2c1514d25d7bf3ef Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openbmc-bsp')
-rw-r--r--meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc10
-rw-r--r--meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc4
-rw-r--r--meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc2
3 files changed, 12 insertions, 4 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc b/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc
new file mode 100644
index 000000000..06d868f20
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc
@@ -0,0 +1,10 @@
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc"
+
+ASPEED_UBOOT_VERSION ?= "v2016.07+git%"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
+PREFERRED_VERSION_u-boot ?= "${ASPEED_UBOOT_VERSION}"
+PREFERRED_VERSION_u-boot-fw-utils ?= "${ASPEED_UBOOT_VERSION}"
+
+MACHINEOVERRIDES .= ":aspeed"
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 49c6c23ef..22374752d 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
@@ -2,9 +2,7 @@
#@NAME: Aspeed AST2400
#@DESCRIPTION: Common machine configuration for the Aspeed AST2400 Chip
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc"
-PREFERRED_VERSION_u-boot ?= "v2016.07+git%"
-PREFERRED_VERSION_u-boot-fw-utils ?= "v2016.07+git%"
+require conf/machine/include/aspeed.inc
UBOOT_MACHINE ?= "ast_g4_ncsi_config"
UBOOT_ENTRYPOINT ?= "0x40001000"
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 be753324c..fe079ee61 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
@@ -2,7 +2,7 @@
#@NAME: Aspeed AST2500
#@DESCRIPTION: Common machine configuration for the Aspeed AST2500 Chip
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc"
+require conf/machine/include/aspeed.inc
UBOOT_MACHINE ?= "ast_g5_ncsi_config"
UBOOT_ENTRYPOINT ?= "0x80001000"
OpenPOWER on IntegriCloud