summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2020-08-19 02:07:42 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-09-01 22:09:45 +0300
commite361ff17c6d9aa94ea87eaf6ab5233d9ed03c4f7 (patch)
treefe9e21d1bbc1aff9bf2c08ae0d03c9f9206ad98e
parent32cc5c1f5be9b95ed6ae62eb76f5f06afbd18805 (diff)
downloadopenbmc-e361ff17c6d9aa94ea87eaf6ab5233d9ed03c4f7.tar.xz
openpower: use meta-phosphor provided overrides
OpenBMC is moving away from processor arch specific layers to supporting multiple arches in a single layer (meta-phosphor). To that end, a handful of machine includes that set some machine overrides were added to meta-phosphor for IBM POWER processors. Include these new includes from our layer so that any existing meta-openpower users pick up the new overrides. This provides a path to migrating meta-openpower content upstream to meta-phosphor. (From meta-openpower rev: e7e4e65e2d76887d096022fa782901b45a795ee6) Change-Id: Ic176d3247523ae8f1de143301bf2a932e427fdcc Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
-rw-r--r--meta-openpower/conf/machine/include/p8.inc1
-rw-r--r--meta-openpower/conf/machine/include/p9.inc1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta-openpower/conf/machine/include/p8.inc b/meta-openpower/conf/machine/include/p8.inc
index b43045d5a..af269c23e 100644
--- a/meta-openpower/conf/machine/include/p8.inc
+++ b/meta-openpower/conf/machine/include/p8.inc
@@ -1 +1,2 @@
+include conf/machine/include/ibm-power8-cpu.inc
OBMC_MACHINE_FEATURES += 'i2c-occ'
diff --git a/meta-openpower/conf/machine/include/p9.inc b/meta-openpower/conf/machine/include/p9.inc
index 4c30aac18..2da9fd144 100644
--- a/meta-openpower/conf/machine/include/p9.inc
+++ b/meta-openpower/conf/machine/include/p9.inc
@@ -1,2 +1,3 @@
+include conf/machine/include/ibm-power9-cpu.inc
OBMC_MACHINE_FEATURES += 'op-fsi p9-cfam-override'
PREFERRED_PROVIDER_virtual/obmc-host-ctl = "p9-host-start"