meta-quanta: gbs: Use gBMC KCS daemon
Signed-off-by: Brandon Kim <brandonkim@google.com>
Change-Id: If3358964f776d0f9ae55f4eee5ea05d6d95b050a
diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf
index 2419052..e9456b5 100644
--- a/meta-quanta/meta-gbs/conf/machine/gbs.conf
+++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf
@@ -11,6 +11,7 @@
require conf/machine/include/obmc-bsp-common.inc
GBMC_NCSI_IF_NAME = "eth0"
+GBMC_KCS_DEV = "ipmi-kcs1"
# Overwrite flash offsets
FLASH_ROFS_OFFSET = "7296"
@@ -34,7 +35,7 @@
PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-gbs-apps"
PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-gbs-apps"
PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-gbs-apps"
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"
+PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "gbmc-kcs-config"
PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "gbs-led-manager-config-native"
# Remove unneeded binaries from image
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs/99-ipmi-kcs.rules b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs/99-ipmi-kcs.rules
deleted file mode 100644
index 1de5562..0000000
--- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs/99-ipmi-kcs.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="ipmi-kcs1", SYMLINK+="ipmi_kcs1"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
deleted file mode 100644
index a7f60d4..0000000
--- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-KCS_DEVICE_gbs = "ipmi_kcs1"
-
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
-SRC_URI_append_gbs = " file://99-ipmi-kcs.rules"
-
-do_install_append_gbs() {
- install -d ${D}/lib/udev/rules.d
- install -m 0644 ${WORKDIR}/99-ipmi-kcs.rules ${D}/lib/udev/rules.d
-}