meta-ampere: mtjade: Change from phosphor-nvme to nvmesensor
This commit removes phosphor-nvme implementation in mtjade
platform and configures to use dbus-sensors's nvmesensor.
Signed-off-by: Chau Ly <chaul@amperecomputing.com>
Change-Id: Ib9ce787e34265382a222697fb102fe63b4ba8a03
diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf
index 667c000..c13d458 100644
--- a/meta-ampere/meta-jade/conf/machine/mtjade.conf
+++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf
@@ -29,7 +29,6 @@
mtjade-gpio-config \
ampere-platform-init \
ampere-ipmi-oem \
- phosphor-nvme \
phosphor-ipmi-blobs \
phosphor-ipmi-blobs-binarystore \
ampere-driver-binder \
diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend
index b458b0c..b3be643 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend
@@ -1 +1,2 @@
PACKAGECONFIG:remove = " intelcpusensor ipmbsensor"
+PACKAGECONFIG:append = " nvmesensor"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json
deleted file mode 100644
index 9c2aade..0000000
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
- "config": [
- {
- "NVMeDriveIndex": 0,
- "NVMeDriveBusID": 50
- },
- {
- "NVMeDriveIndex": 1,
- "NVMeDriveBusID": 51
- },
- {
- "NVMeDriveIndex": 2,
- "NVMeDriveBusID": 52
- },
- {
- "NVMeDriveIndex": 3,
- "NVMeDriveBusID": 53
- },
- {
- "NVMeDriveIndex": 4,
- "NVMeDriveBusID": 54
- },
- {
- "NVMeDriveIndex": 5,
- "NVMeDriveBusID": 55
- },
- {
- "NVMeDriveIndex": 6,
- "NVMeDriveBusID": 56
- },
- {
- "NVMeDriveIndex": 7,
- "NVMeDriveBusID": 57
- },
- {
- "NVMeDriveIndex": 8,
- "NVMeDriveBusID": 60
- },
- {
- "NVMeDriveIndex": 9,
- "NVMeDriveBusID": 61
- },
- {
- "NVMeDriveIndex": 10,
- "NVMeDriveBusID": 62
- },
- {
- "NVMeDriveIndex": 11,
- "NVMeDriveBusID": 63
- },
- {
- "NVMeDriveIndex": 12,
- "NVMeDriveBusID": 64
- },
- {
- "NVMeDriveIndex": 13,
- "NVMeDriveBusID": 65
- },
- {
- "NVMeDriveIndex": 14,
- "NVMeDriveBusID": 66
- },
- {
- "NVMeDriveIndex": 15,
- "NVMeDriveBusID": 67
- },
- {
- "NVMeDriveIndex": 16,
- "NVMeDriveBusID": 70
- },
- {
- "NVMeDriveIndex": 17,
- "NVMeDriveBusID": 71
- },
- {
- "NVMeDriveIndex": 18,
- "NVMeDriveBusID": 72
- },
- {
- "NVMeDriveIndex": 19,
- "NVMeDriveBusID": 73
- },
- {
- "NVMeDriveIndex": 20,
- "NVMeDriveBusID": 74
- },
- {
- "NVMeDriveIndex": 21,
- "NVMeDriveBusID": 75
- },
- {
- "NVMeDriveIndex": 22,
- "NVMeDriveBusID": 76
- },
- {
- "NVMeDriveIndex": 23,
- "NVMeDriveBusID": 77
- },
- {
- "NVMeDriveIndex": 24,
- "NVMeDriveBusID": 80
- },
- {
- "NVMeDriveIndex": 25,
- "NVMeDriveBusID": 81
- }
- ],
- "threshold": [
- {
- "criticalHigh": 80,
- "criticalLow": 0,
- "warningHigh": 70,
- "warningLow": 5,
- "maxValue": 127,
- "minValue": -128
- }
- ]
-}
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
deleted file mode 100644
index 5eadc25..0000000
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " file://nvme_config.json"
-
-do_install:append() {
- install -m 0644 -D ${WORKDIR}/nvme_config.json \
- ${D}/etc/nvme
-}