From e361ff17c6d9aa94ea87eaf6ab5233d9ed03c4f7 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 18 Aug 2020 19:07:42 -0400 Subject: 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 Signed-off-by: Andrew Geissler --- meta-openpower/conf/machine/include/p8.inc | 1 + meta-openpower/conf/machine/include/p9.inc | 1 + 2 files changed, 2 insertions(+) (limited to 'meta-openpower/conf') diff --git a/meta-openpower/conf/machine/include/p8.inc b/meta-openpower/conf/machine/include/p8.inc index b43045d5ae..af269c23ee 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 4c30aac185..2da9fd1440 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" -- cgit v1.2.3