Remove largely unmaintained Mihawk
A fork of it is maintained but its upstream layer has largely been
unmaintained.
No future products are planned to be based on this layer.
Mihawk is similar to Witherspoon.
Signed-off-by: Myung Bae <myungbae@us.ibm.com>
Change-Id: I82f7d777b78cd126237d51e42f1e11abdf80ae68
diff --git a/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
index 986c2ca..8ce54e5 100644
--- a/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
@@ -1,9 +1,5 @@
DEPENDS:append:ibm-ac-server = " acx22-yaml-config"
-DEPENDS:append:mihawk = " acx22-yaml-config"
EXTRA_OECONF:ibm-ac-server = " \
INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
- "
-EXTRA_OECONF:mihawk = " \
- INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
"
\ No newline at end of file
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json
deleted file mode 100644
index 7f26c24..0000000
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
- "0" : {
- "name" : "IPMB",
- "is_valid" : true,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "ipmb",
- "protocol_type" : "ipmb-1.0",
- "session_supported" : "session-less",
- "is_ipmi" : true
- }
- },
- "1" : {
- "name" : "eth0",
- "is_valid" : true,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "lan-802.3",
- "protocol_type" : "ipmb-1.0",
- "session_supported" : "multi-session",
- "is_ipmi" : true
- }
- },
- "2" : {
- "name" : "eth1",
- "is_valid" : true,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "lan-802.3",
- "protocol_type" : "ipmb-1.0",
- "session_supported" : "multi-session",
- "is_ipmi" : true
- }
- },
- "3" : {
- "name" : "RESERVED",
- "is_valid" : false,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "reserved",
- "protocol_type" : "na",
- "session_supported" : "session-less",
- "is_ipmi" : true
- }
- },
- "4" : {
- "name" : "RESERVED",
- "is_valid" : false,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "reserved",
- "protocol_type" : "na",
- "session_supported" : "session-less",
- "is_ipmi" : true
- }
- },
- "5" : {
- "name" : "RESERVED",
- "is_valid" : false,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "reserved",
- "protocol_type" : "na",
- "session_supported" : "session-less",
- "is_ipmi" : true
- }
- },
- "6" : {
- "name" : "RESERVED",
- "is_valid" : false,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "reserved",
- "protocol_type" : "na",
- "session_supported" : "session-less",
- "is_ipmi" : true
- }
- },
- "7" : {
- "name" : "RESERVED",
- "is_valid" : false,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "reserved",
- "protocol_type" : "na",
- "session_supported" : "session-less",
- "is_ipmi" : true
- }
- },
- "8" : {
- "name" : "INTRABMC",
- "is_valid" : true,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "oem",
- "protocol_type" : "oem",
- "session_supported" : "session-less",
- "is_ipmi" : true
- }
- },
- "9" : {
- "name" : "RESERVED",
- "is_valid" : false,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "reserved",
- "protocol_type" : "na",
- "session_supported" : "session-less",
- "is_ipmi" : true
- }
- },
- "10" : {
- "name" : "RESERVED",
- "is_valid" : false,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "reserved",
- "protocol_type" : "na",
- "session_supported" : "session-less",
- "is_ipmi" : true
- }
- },
- "11" : {
- "name" : "RESERVED",
- "is_valid" : false,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "reserved",
- "protocol_type" : "na",
- "session_supported" : "session-less",
- "is_ipmi" : true
- }
- },
- "12" : {
- "name" : "RESERVED",
- "is_valid" : false,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "reserved",
- "protocol_type" : "na",
- "session_supported" : "session-less",
- "is_ipmi" : true
- }
- },
- "13" : {
- "name" : "RESERVED",
- "is_valid" : false,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "reserved",
- "protocol_type" : "na",
- "session_supported" : "session-less",
- "is_ipmi" : true
- }
- },
- "14" : {
- "name" : "SELF",
- "is_valid" : false,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "ipmb",
- "protocol_type" : "ipmb-1.0",
- "session_supported" : "session-less",
- "is_ipmi" : true
- }
- },
- "15" : {
- "name" : "SMS",
- "is_valid" : true,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "system-interface",
- "protocol_type" : "kcs",
- "session_supported" : "session-less",
- "is_ipmi" : true
- }
- }
-}
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json
deleted file mode 100644
index ed4cb0b..0000000
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "inlet": [
- {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/ambient_temp", "record_id": 255}
- ],
- "baseboard": [
- {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_pcie_temp", "record_id": 253},
- {"instance": 2, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_pcie_temp", "record_id": 254}
- ],
- "cpu": [
- {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core0_temp", "record_id": 17},
- {"instance": 2, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core1_temp", "record_id": 20},
- {"instance": 3, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core2_temp", "record_id": 23},
- {"instance": 4, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core3_temp", "record_id": 26},
- {"instance": 5, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core4_temp", "record_id": 29},
- {"instance": 6, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core5_temp", "record_id": 32},
- {"instance": 7, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core6_temp", "record_id": 35},
- {"instance": 8, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core7_temp", "record_id": 38},
- {"instance": 9, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core8_temp", "record_id": 41},
- {"instance": 10, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core9_temp", "record_id": 44},
- {"instance": 11, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core10_temp", "record_id": 47},
- {"instance": 12, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core11_temp", "record_id": 50},
- {"instance": 13, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core12_temp", "record_id": 53},
- {"instance": 14, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core13_temp", "record_id": 56},
- {"instance": 15, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core14_temp", "record_id": 59},
- {"instance": 16, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core15_temp", "record_id": 62},
- {"instance": 17, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core16_temp", "record_id": 65},
- {"instance": 18, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core17_temp", "record_id": 68},
- {"instance": 19, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core18_temp", "record_id": 71},
- {"instance": 20, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core19_temp", "record_id": 74},
- {"instance": 21, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core20_temp", "record_id": 77},
- {"instance": 22, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core21_temp", "record_id": 80},
- {"instance": 23, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core22_temp", "record_id": 83},
- {"instance": 24, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core23_temp", "record_id": 86},
- {"instance": 25, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core0_temp", "record_id": 91},
- {"instance": 26, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core1_temp", "record_id": 94},
- {"instance": 27, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core2_temp", "record_id": 97},
- {"instance": 28, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core3_temp", "record_id": 100},
- {"instance": 29, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core4_temp", "record_id": 103},
- {"instance": 30, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core5_temp", "record_id": 106},
- {"instance": 31, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core6_temp", "record_id": 109},
- {"instance": 32, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core7_temp", "record_id": 112},
- {"instance": 33, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core8_temp", "record_id": 115},
- {"instance": 34, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core9_temp", "record_id": 118},
- {"instance": 35, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core10_temp", "record_id": 121},
- {"instance": 36, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core11_temp", "record_id": 124},
- {"instance": 37, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core12_temp", "record_id": 127},
- {"instance": 38, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core13_temp", "record_id": 130},
- {"instance": 39, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core14_temp", "record_id": 133},
- {"instance": 40, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core15_temp", "record_id": 136},
- {"instance": 41, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core16_temp", "record_id": 139},
- {"instance": 42, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core17_temp", "record_id": 142},
- {"instance": 43, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core18_temp", "record_id": 145},
- {"instance": 44, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core19_temp", "record_id": 148},
- {"instance": 45, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core20_temp", "record_id": 151},
- {"instance": 46, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core21_temp", "record_id": 154},
- {"instance": 47, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core22_temp", "record_id": 157},
- {"instance": 48, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core23_temp", "record_id": 160}
- ]
-}
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dev_id.json b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dev_id.json
deleted file mode 100644
index 3a45719..0000000
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dev_id.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{"id": 0, "revision": 128, "addn_dev_support": 141,
- "manuf_id": 42817, "prod_id": 1, "aux": 0}
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json
deleted file mode 100644
index 97e8f32..0000000
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "path": "/xyz/openbmc_project/sensors/power/total_power"
-}
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index 4dc7c85..69cc839 100644
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,15 +1,10 @@
DEPENDS:append:ibm-ac-server = " acx22-yaml-config"
-DEPENDS:append:mihawk = " acx22-yaml-config"
DEPENDS:append:p10bmc = " p10bmc-yaml-config"
EXTRA_OECONF:ibm-ac-server = " \
YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
PROP_YAML=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-extra-properties.yaml \
"
-EXTRA_OECONF:mihawk = " \
- YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
- PROP_YAML=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-extra-properties.yaml \
- "
EXTRA_OECONF:p10bmc = " \
YAML_GEN=${STAGING_DIR_HOST}${datadir}/p10bmc-yaml-config/ipmi-fru-read.yaml \
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 64d1cf2..7d9a077 100644
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,5 +1,4 @@
DEPENDS:append:ibm-ac-server = " acx22-yaml-config"
-DEPENDS:append:mihawk = " acx22-yaml-config"
DEPENDS:append:p10bmc = " p10bmc-yaml-config"
# host watchdog does not work with witherspoon-tacoma host firmware
@@ -10,11 +9,7 @@
-Dinvsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
-Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
"
-EXTRA_OEMESON:mihawk = " \
- -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \
- -Dinvsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
- -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
- "
+
EXTRA_OEMESON:p10bmc = " \
-Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/p10bmc-yaml-config/ipmi-fru-read.yaml \
"
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
index 7883432..7880771 100644
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
@@ -1,8 +1,4 @@
-ALT_RMCPP_IFACE:mihawk = "eth1"
-SYSTEMD_SERVICE:${PN}:append:mihawk = " \
- ${PN}@${ALT_RMCPP_IFACE}.service \
- ${PN}@${ALT_RMCPP_IFACE}.socket \
- "
+
ALT_RMCPP_IFACE:p10bmc = "eth1"
SYSTEMD_SERVICE:${PN}:append:p10bmc = " \