summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/conf/machine/talos.conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/conf/machine/talos.conf')
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/conf/machine/talos.conf19
1 files changed, 17 insertions, 2 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/conf/machine/talos.conf b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/conf/machine/talos.conf
index 6f689df85..0f2e6634a 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/conf/machine/talos.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/conf/machine/talos.conf
@@ -3,6 +3,10 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
UBOOT_MACHINE = "ast_g5_ncsi_config"
+OBMC_MACHINE_FEATURES += "obmc-mrw"
+
+OBMC_POWER_SUPPLY_INSTANCES = "0 1"
+
PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'fpga-trigger'
require conf/machine/include/ast2500.inc
@@ -10,8 +14,19 @@ require conf/machine/include/obmc-bsp-common.inc
require conf/machine/include/rcs.inc
require conf/machine/include/p9.inc
-PHOSPHOR_MRW_URI = "https://git.raptorcs.com/talos-openpower/talos-xml"
-PHOSPHOR_MRW_REV = "14b471fbf37f5fb60261de001df83caf5f96d81f"
+PHOSPHOR_MRW_URI = "git://scm.raptorcs.com/scm/git/talos-xml;protocol=https"
+PHOSPHOR_MRW_REV = "572148010e4bf8dbf9c3578bd5c1ca17d13cee73"
+
+# Inhibit phosphor-hwmon-config-mrw
+VIRTUAL-RUNTIME_phosphor-hwmon-config = ""
+
+# Inhibit phosphor-fan-presence-mrw-native
+PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config = \
+ "phosphor-fan-presence-config-native"
+
+# Inhibit phosphor-fan-control-fan-config-mrw-native
+PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config = \
+ "phosphor-fan-control-fan-config-native"
DISTRO_FEATURES_append = "\
obmc-openpower \
OpenPOWER on IntegriCloud