diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2015-09-16 20:48:01 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2015-09-16 20:48:01 +0300 |
| commit | e34bf49e742be2f94a54795b794b88b4452e89a5 (patch) | |
| tree | 2687a84713b6a2bab09eaa87d059b4d1d06a5199 /meta-phosphor/conf/machine | |
| parent | 37eda0c49a9fc0a15002500e40da9c8bec70ebf3 (diff) | |
| parent | 0d2b029c7fbf4abaa0b34bfc4a8ea77bae71c624 (diff) | |
| download | openbmc-e34bf49e742be2f94a54795b794b88b4452e89a5.tar.xz | |
Merge commit '0d2b029c7fbf4abaa0b34bfc4a8ea77bae71c624' into HEAD
Diffstat (limited to 'meta-phosphor/conf/machine')
| -rw-r--r-- | meta-phosphor/conf/machine/include/qemuphosphor.inc | 5 | ||||
| -rw-r--r-- | meta-phosphor/conf/machine/include/sample.inc | 19 |
2 files changed, 19 insertions, 5 deletions
diff --git a/meta-phosphor/conf/machine/include/qemuphosphor.inc b/meta-phosphor/conf/machine/include/qemuphosphor.inc deleted file mode 100644 index 04db4ba9f5..0000000000 --- a/meta-phosphor/conf/machine/include/qemuphosphor.inc +++ /dev/null @@ -1,5 +0,0 @@ -# The qemu helper scripts don't work with -# cpio images. - -# Prefer linux-yocto with qemu. -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" diff --git a/meta-phosphor/conf/machine/include/sample.inc b/meta-phosphor/conf/machine/include/sample.inc new file mode 100644 index 0000000000..7db2883507 --- /dev/null +++ b/meta-phosphor/conf/machine/include/sample.inc @@ -0,0 +1,19 @@ +OBMC_MACHINE_FEATURES += "\ + obmc-phosphor-fan-mgmt \ + obmc-phosphor-chassis-mgmt \ + obmc-phosphor-sensor-mgmt \ + obmc-phosphor-flash-mgmt \ + " + +VIRTUAL-RUNTIME_obmc-phosphor-fan-ctl = " \ + obmc-phosphor-qemu \ + " +VIRTUAL-RUNTIME_obmc-phosphor-sensor-ctl = " \ + obmc-phosphor-qemu \ + " +VIRTUAL-RUNTIME_obmc-phosphor-chassis-ctl = " \ + obmc-phosphor-qemu \ + " +VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl = " \ + obmc-phosphor-qemu \ + " |