summaryrefslogtreecommitdiffstats
path: root/meta-rcs
diff options
context:
space:
mode:
authorTimothy Pearson <tpearson@raptorengineering.com>2019-04-20 03:22:07 +0000
committerTimothy Pearson <tpearson@raptorengineering.com>2019-04-27 08:06:39 +0000
commitb1061f3bf6fadb3beb25a68696a8b6634c00ae77 (patch)
treed7d15c8348679bee3d77e7b071e964a887bf2905 /meta-rcs
parentc56138aa10f2f3d182dc39dd4dc20fdbcc6c22a2 (diff)
downloadtalos-openbmc-b1061f3bf6fadb3beb25a68696a8b6634c00ae77.tar.gz
talos-openbmc-b1061f3bf6fadb3beb25a68696a8b6634c00ae77.zip
Re-enable MRW integration after OpenBMC update
Diffstat (limited to 'meta-rcs')
-rw-r--r--meta-rcs/meta-talos/conf/distro/openbmc-talos.conf1
-rw-r--r--meta-rcs/meta-talos/conf/machine/talos.conf1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta-rcs/meta-talos/conf/distro/openbmc-talos.conf b/meta-rcs/meta-talos/conf/distro/openbmc-talos.conf
index 2570a9a19..f8569d43e 100644
--- a/meta-rcs/meta-talos/conf/distro/openbmc-talos.conf
+++ b/meta-rcs/meta-talos/conf/distro/openbmc-talos.conf
@@ -1 +1,2 @@
require conf/distro/openbmc-openpower.conf
+require conf/distro/include/openpower-mrw.inc
diff --git a/meta-rcs/meta-talos/conf/machine/talos.conf b/meta-rcs/meta-talos/conf/machine/talos.conf
index fdf7c6574..8891d29f3 100644
--- a/meta-rcs/meta-talos/conf/machine/talos.conf
+++ b/meta-rcs/meta-talos/conf/machine/talos.conf
@@ -38,3 +38,4 @@ MACHINE_EXTRA_RDEPENDS += "obmc-ipl-status-led-monitor obmc-hardbeep"
PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "talos-ipmi-inventory-map-native"
PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "talos-led-manager-config-native"
+PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native_df-mrw = "talos-led-manager-config-native"
OpenPOWER on IntegriCloud