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 | |
parent | 37eda0c49a9fc0a15002500e40da9c8bec70ebf3 (diff) | |
parent | 0d2b029c7fbf4abaa0b34bfc4a8ea77bae71c624 (diff) | |
download | openbmc-e34bf49e742be2f94a54795b794b88b4452e89a5.tar.xz |
Merge commit '0d2b029c7fbf4abaa0b34bfc4a8ea77bae71c624' into HEAD
Diffstat (limited to 'meta-phosphor/conf')
-rw-r--r-- | meta-phosphor/conf/bblayers.conf.sample | 1 | ||||
-rw-r--r-- | meta-phosphor/conf/conf-notes.txt | 3 | ||||
-rw-r--r-- | meta-phosphor/conf/distro/openbmc-phosphor.conf | 4 | ||||
-rw-r--r-- | meta-phosphor/conf/local.conf.sample | 4 | ||||
-rw-r--r-- | meta-phosphor/conf/machine/include/qemuphosphor.inc | 5 | ||||
-rw-r--r-- | meta-phosphor/conf/machine/include/sample.inc | 19 |
6 files changed, 27 insertions, 9 deletions
diff --git a/meta-phosphor/conf/bblayers.conf.sample b/meta-phosphor/conf/bblayers.conf.sample index caab032ad..2f0321f1b 100644 --- a/meta-phosphor/conf/bblayers.conf.sample +++ b/meta-phosphor/conf/bblayers.conf.sample @@ -9,7 +9,6 @@ BBLAYERS ?= " \ ##OEROOT##/meta \ ##OEROOT##/meta-yocto \ ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-phosphor/meta-sample-bsp \ " BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/meta \ diff --git a/meta-phosphor/conf/conf-notes.txt b/meta-phosphor/conf/conf-notes.txt index 357035572..f2db15fcb 100644 --- a/meta-phosphor/conf/conf-notes.txt +++ b/meta-phosphor/conf/conf-notes.txt @@ -2,5 +2,4 @@ Common targets are: obmc-phosphor-image You can also run generated qemu images with a command like: - idir=tmp/deploy/images/qemuphosphor - runqemu qemuarm $idir/zImage-qemuphosphor.bin $idir/obmc-phosphor-image-qemuphosphor.ext4 + runqemu qemuarm diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf index ee457c844..94f17526b 100644 --- a/meta-phosphor/conf/distro/openbmc-phosphor.conf +++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf @@ -25,3 +25,7 @@ DISTRO_FEATURES = "\ obmc-phosphor-system-mgmt \ ${DISTRO_FEATURES_LIBC} \ " + +MACHINE_FEATURES += " \ + ${OBMC_MACHINE_FEATURES} \ + " diff --git a/meta-phosphor/conf/local.conf.sample b/meta-phosphor/conf/local.conf.sample index e6b6d662b..6a919278d 100644 --- a/meta-phosphor/conf/local.conf.sample +++ b/meta-phosphor/conf/local.conf.sample @@ -34,7 +34,7 @@ #MACHINE ?= "edgerouter" # # This sets the default machine to be qemux86 if no other machine is selected: -MACHINE ??= "qemuphosphor" +MACHINE ??= "qemuarm" # # Where to place downloads @@ -242,3 +242,5 @@ INHERIT += "extrausers" EXTRA_USERS_PARAMS = " \ usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ " + +require conf/machine/include/sample.inc diff --git a/meta-phosphor/conf/machine/include/qemuphosphor.inc b/meta-phosphor/conf/machine/include/qemuphosphor.inc deleted file mode 100644 index 04db4ba9f..000000000 --- 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 000000000..7db288350 --- /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 \ + " |