meta-ampere: move ipmi config to common
The same channel_config.json and power_reading.json are used across
Ampere platforms so move to meta-ampere/meta-common to avoid duplicate.
Tested:
1. Check if "ipmitool lan print 1/2/3" works.
2. On Mt.Jade, check if "ipmitool dcmi power reading" works
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: I77f401d0b74455c3951fb746f8bea2ddb1c3667b
diff --git a/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
new file mode 100644
index 0000000..eadb7e4
--- /dev/null
+++ b/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -0,0 +1 @@
+FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json b/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json
similarity index 100%
rename from meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json
rename to meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json
diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json b/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
similarity index 100%
rename from meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
rename to meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json b/meta-ampere/meta-mitchell/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json
deleted file mode 100644
index 4998665..0000000
--- a/meta-ampere/meta-mitchell/recipes-phosphor/ipmi/phosphor-ipmi-config/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" : "usb0",
- "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
- }
- },
- "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" : "ipmi_ssif",
- "is_valid" : true,
- "active_sessions" : 0,
- "channel_info" : {
- "medium_type" : "smbus-v2.0",
- "protocol_type" : "ipmi-smbus",
- "session_supported" : "session-less",
- "is_ipmi" : true
- }
- }
-}