summaryrefslogtreecommitdiff
path: root/meta-phosphor/conf/distro/openbmc-phosphor.conf
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2015-09-16 20:48:01 +0300
committerPatrick Williams <patrick@stwcx.xyz>2015-09-16 20:48:01 +0300
commite34bf49e742be2f94a54795b794b88b4452e89a5 (patch)
tree2687a84713b6a2bab09eaa87d059b4d1d06a5199 /meta-phosphor/conf/distro/openbmc-phosphor.conf
parent37eda0c49a9fc0a15002500e40da9c8bec70ebf3 (diff)
parent0d2b029c7fbf4abaa0b34bfc4a8ea77bae71c624 (diff)
downloadopenbmc-e34bf49e742be2f94a54795b794b88b4452e89a5.tar.xz
Merge commit '0d2b029c7fbf4abaa0b34bfc4a8ea77bae71c624' into HEAD
Diffstat (limited to 'meta-phosphor/conf/distro/openbmc-phosphor.conf')
-rw-r--r--meta-phosphor/conf/distro/openbmc-phosphor.conf4
1 files changed, 4 insertions, 0 deletions
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} \
+ "