diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2021-02-21 21:25:18 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-04-12 21:51:03 +0300 |
| commit | 12e8df88921dd8308fba9aca862b7ab5965a1c2f (patch) | |
| tree | b748f780e7c3b5523e230015cdcefc9e6a0b8501 /meta-ibm/conf | |
| parent | 830ca604fe9896aafade07e93416ae058cc2e6ad (diff) | |
| download | openbmc-12e8df88921dd8308fba9aca862b7ab5965a1c2f.tar.xz | |
meta-ibm: set OBMC_ORG_YAML_SUBDIRS in machines
The OBMC_ORG_YAML_SUBDIRS variable is intended to be set system-wide
and not via bbappends. There was an existing 'ibm-distrovars.inc'
that was unused. Rename it as appropriate, add it to the machines,
and remove the bbappend files.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Id5acd359f41c17ec9e68d1f0717e2f5c1bf96dcf
Diffstat (limited to 'meta-ibm/conf')
| -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 |
5 files changed, 4 insertions, 0 deletions
diff --git a/meta-ibm/conf/distro/include/ibm-distrovars.inc b/meta-ibm/conf/distro/include/ibm-yaml.inc index dde13f233..dde13f233 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 bb54c6a78..2bb67ed08 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 22b59b426..2cab74e4d 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 8d2a9078c..9826d55ec 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 c037a78bd..08f2935f9 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" |