diff options
| -rw-r--r-- | meta-ibm/conf/distro/include/ibm-yaml.inc (renamed from meta-ibm/conf/distro/include/ibm-distrovars.inc) | 0 | ||||
| -rw-r--r-- | meta-ibm/conf/machine/mihawk.conf | 1 | ||||
| -rw-r--r-- | meta-ibm/conf/machine/p10bmc.conf | 1 | ||||
| -rw-r--r-- | meta-ibm/conf/machine/witherspoon-tacoma.conf | 1 | ||||
| -rw-r--r-- | meta-ibm/conf/machine/witherspoon.conf | 1 | ||||
| -rw-r--r-- | meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend | 2 |
6 files changed, 4 insertions, 2 deletions
diff --git a/meta-ibm/conf/distro/include/ibm-distrovars.inc b/meta-ibm/conf/distro/include/ibm-yaml.inc index dde13f233c..dde13f233c 100644 --- a/meta-ibm/conf/distro/include/ibm-distrovars.inc +++ b/meta-ibm/conf/distro/include/ibm-yaml.inc diff --git a/meta-ibm/conf/machine/mihawk.conf b/meta-ibm/conf/machine/mihawk.conf index bb54c6a78a..2bb67ed08d 100644 --- a/meta-ibm/conf/machine/mihawk.conf +++ b/meta-ibm/conf/machine/mihawk.conf @@ -15,6 +15,7 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc require conf/machine/include/p9.inc +require conf/distro/include/ibm-yaml.inc PHOSPHOR_MRW_LICENSE = "Apache-2.0" PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf index 22b59b4263..2cab74e4dd 100644 --- a/meta-ibm/conf/machine/p10bmc.conf +++ b/meta-ibm/conf/machine/p10bmc.conf @@ -14,6 +14,7 @@ include conf/machine/include/ibm-power10-cpu.inc require conf/distro/include/openpower-virtual-pnor.inc require conf/distro/include/phosphor-mmc.inc require conf/distro/include/ibm-mpreboot.inc +require conf/distro/include/ibm-yaml.inc SERIAL_CONSOLES = "115200;ttyS4" diff --git a/meta-ibm/conf/machine/witherspoon-tacoma.conf b/meta-ibm/conf/machine/witherspoon-tacoma.conf index 8d2a9078cf..9826d55ecd 100644 --- a/meta-ibm/conf/machine/witherspoon-tacoma.conf +++ b/meta-ibm/conf/machine/witherspoon-tacoma.conf @@ -10,6 +10,7 @@ require conf/machine/include/ast2600.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc require conf/machine/include/p9.inc +require conf/distro/include/ibm-yaml.inc require conf/distro/include/openpower-virtual-pnor.inc require conf/distro/include/phosphor-mmc.inc require conf/distro/include/ibm-mpreboot.inc diff --git a/meta-ibm/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf index c037a78bd7..08f2935f90 100644 --- a/meta-ibm/conf/machine/witherspoon.conf +++ b/meta-ibm/conf/machine/witherspoon.conf @@ -15,6 +15,7 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc require conf/machine/include/p9.inc +require conf/distro/include/ibm-yaml.inc PHOSPHOR_MRW_LICENSE = "Apache-2.0" PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend deleted file mode 100644 index d782a389df..0000000000 --- a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -OBMC_ORG_YAML_SUBDIRS_append_witherspoon = " com/ibm" -OBMC_ORG_YAML_SUBDIRS_append_p10bmc = " com/ibm" |