5 files changed, 6 insertions, 122 deletions
diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend
new file mode 100644
index 000000000..bfd03f8c5
--- /dev/null
+++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG:remove = " cpusensor ipmbsensor"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb
index c9f27020f..376ebc075 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb
+++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb
@@ -5,27 +5,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5
 inherit allarch
 
 SRC_URI = " \
-    file://ipmi-sensors-${MACHINE}.yaml \
-    file://mtjade-ipmi-fru.yaml \
-    file://mtjade-ipmi-fru-properties.yaml \
+    file://mtjade-ipmi-sensors.yaml \
     "
 
 S = "${WORKDIR}"
 
 do_install() {
-    install -m 0644 -D ipmi-sensors-${MACHINE}.yaml \
-        ${D}${datadir}/${BPN}/ipmi-sensors-${MACHINE}.yaml
-    cat mtjade-ipmi-fru.yaml > fru-read.yaml
-    install -m 0644 -D mtjade-ipmi-fru-properties.yaml \
-        ${D}${datadir}/${BPN}/ipmi-extra-properties.yaml
-    install -m 0644 -D fru-read.yaml \
-        ${D}${datadir}/${BPN}/ipmi-fru-read.yaml
+    install -m 0644 -D mtjade-ipmi-sensors.yaml \
+        ${D}${datadir}/${BPN}/ipmi-sensors.yaml
 }
 
 FILES:${PN}-dev = " \
-    ${datadir}/${BPN}/ipmi-sensors-${MACHINE}.yaml \
-    ${datadir}/${BPN}/ipmi-extra-properties.yaml \
-    ${datadir}/${BPN}/ipmi-fru-read.yaml \
-    "
+                   ${datadir}/${BPN}/ipmi-sensors.yaml \
+                  "
 
 ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru-properties.yaml b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru-properties.yaml
deleted file mode 100644
index db8de9f40..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru-properties.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-/system/chassis/motherboard:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru.yaml b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru.yaml
index 80bcce434..e69de29bb 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru.yaml
+++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru.yaml
@@ -1,85 +0,0 @@
-0x00:
-  /system/chassis/motherboard:
-    entityID: 7
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Item.NetworkInterface:
-        MACAddress:
-          IPMIFruProperty: Custom Field 1
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Decorator.VendorInformation:
-        CustomField1:
-          IPMIFruProperty: FRU File ID
-          IPMIFruSection: Board
-      xyz.openbmc_project.Common.UUID:
-        UUID:
-          IPMIFruProperty: UUID
-          IPMIFruSection: MultiRecord
-  /system/chassis:
-    entityID: 23
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Chassis
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Chassis
-        Model:
-          IPMIFruProperty: Type
-          IPMIFruSection: Chassis
-      xyz.openbmc_project.Inventory.Decorator.VendorInformation:
-        CustomField2:
-          IPMIFruProperty: Custom Field 1
-          IPMIFruSection: Chassis
-  /system:
-    entityID: 7
-    entityInstance: 2
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        PartNumber:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.AssetTag:
-        AssetTag:
-          IPMIFruProperty: Asset Tag
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.VendorInformation:
-        CustomField1:
-          IPMIFruProperty: FRU File ID
-          IPMIFruSection: Product
-        CustomField2:
-          IPMIFruProperty: Custom Field 1
-          IPMIFruSection: Product
diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/ipmi-sensors-mtjade.yaml b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-sensors.yaml
index 959f353f3..959f353f3 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/ipmi-sensors-mtjade.yaml
+++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-sensors.yaml