4 files changed, 5 insertions, 1 deletions
diff --git a/meta-openpower/conf/distro/include/openpower-distrovars.inc b/meta-openpower/conf/distro/include/openpower-distrovars.inc
index 479e099fc..12f848bde 100644
--- a/meta-openpower/conf/distro/include/openpower-distrovars.inc
+++ b/meta-openpower/conf/distro/include/openpower-distrovars.inc
@@ -2,3 +2,5 @@ DISTRO_FEATURES += "openpower"
 DISTRO_FEATURES_FILTER_NATIVE += "openpower"
 DISTRO_FEATURES_FILTER_NATIVESDK += "openpower"
 DISTROOVERRIDES .= ":df-openpower"
+
+OBMC_ORG_YAML_SUBDIRS += " org/open_power"
diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf
index 134e5ef38..57e0925c1 100644
--- a/meta-openpower/conf/layer.conf
+++ b/meta-openpower/conf/layer.conf
@@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "openpower-layer"
 BBFILE_PATTERN_openpower-layer := "^${LAYERDIR}/"
 LAYERVERSION_openpower-layer = "1"
 LAYERDEPENDS_openpower-layer = "core phosphor-layer aspeed-layer"
-LAYERSERIES_COMPAT_openpower-layer = "warrior zeus dunfell"
+LAYERSERIES_COMPAT_openpower-layer = "dunfell gatesgarth"
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"