Merge pull request #80 from Intel-BMC/updateHEAD1-0.91intel

Update

44 files changed, 557 insertions, 798 deletions

diff --git a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb
index ede8d9db5..9f1461905 100644
--- a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb
+++ b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb
@@ -26,7 +26,6 @@ RDEPENDS:${PN}-chassis = " \
         phosphor-hostlogger \
         phosphor-sel-logger \
         phosphor-logging \
-        virtual/obmc-gpio-presence \
         "
 
 SUMMARY:${PN}-system = "Ampere System"
diff --git a/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils/0001-flashcp-support-offset-option.patch b/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils/0001-flashcp-support-offset-option.patch
deleted file mode 100644
index 0edae05f8..000000000
--- a/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils/0001-flashcp-support-offset-option.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 32c17dd886a5b506781b86c6227bb059ce33420b Mon Sep 17 00:00:00 2001
-From: Tung Nguyen <tung.nguyen@amperecomputing.com>
-Date: Sun, 5 Sep 2021 09:22:08 +0000
-Subject: [PATCH] flashcp support offset option
-
-The flashcp command from mtd-utils just support to flash from offset 0.
-Add offset option to specify the start offset so that firmware can be
-flashed correctly
-
-Signed-off-by: Tung Nguyen <tung.nguyen@amperecomputing.com>
----
- misc-utils/flashcp.c | 50 +++++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 47 insertions(+), 3 deletions(-)
-
-diff --git a/misc-utils/flashcp.c b/misc-utils/flashcp.c
-index 341c210..0a0e75b 100644
---- a/misc-utils/flashcp.c
-+++ b/misc-utils/flashcp.c
-@@ -91,7 +91,7 @@ static NORETURN void showusage(bool error)
- 			"\n"
- 			"Flash Copy - Written by Abraham van der Merwe <abraham@2d3d.co.za>\n"
- 			"\n"
--			"usage: %1$s [ -v | --verbose | -A | --erase-all ] <filename> <device>\n"
-+			"usage: %1$s [ -v | --verbose | -A | --erase-all ] <filename> <device> <offset>\n"
- 			"       %1$s -h | --help\n"
- 			"       %1$s -V | --version\n"
- 			"\n"
-@@ -102,6 +102,7 @@ static NORETURN void showusage(bool error)
- 			"   -V | --version   Show version information and exit\n"
- 			"   <filename>       File which you want to copy to flash\n"
- 			"   <device>         Flash device to write to (e.g. /dev/mtd0, /dev/mtd1, etc.)\n"
-+			"   <offset>         The start offset. Optional, default: 0\n"
- 			"\n",
- 			PROGRAM_NAME);
- 
-@@ -156,6 +157,16 @@ static void safe_rewind (int fd,const char *filename)
- 	}
- }
- 
-+static int safe_rewind_offset(int fd, const char *filename, off_t offset)
-+{
-+	if (lseek(fd, offset, SEEK_SET) < 0) {
-+		log_printf(LOG_ERROR, "While seeking to start of %s: %m\n", filename);
-+		return EXIT_FAILURE;
-+	}
-+
-+	return EXIT_SUCCESS;
-+}
-+
- /******************************************************************************/
- 
- static int dev_fd = -1,fil_fd = -1;
-@@ -169,6 +180,8 @@ static void cleanup (void)
- int main (int argc,char *argv[])
- {
- 	const char *filename = NULL,*device = NULL;
-+	off_t offset;
-+
- 	int i,flags = FLAG_NONE;
- 	ssize_t result;
- 	size_t size,written;
-@@ -225,6 +238,20 @@ int main (int argc,char *argv[])
- 				showusage(true);
- 		}
- 	}
-+
-+	if (optind + 3 == argc) {
-+		flags |= FLAG_FILENAME;
-+		filename = argv[optind];
-+		DEBUG("Got filename: %s\n", filename);
-+
-+		flags |= FLAG_DEVICE;
-+		device = argv[optind + 1];
-+		DEBUG("Got device: %s\n", device);
-+
-+		offset = strtoul(argv[optind + 2], NULL, 16);
-+		DEBUG("Got offset: 0x%x\n", offset);
-+	}
-+
- 	if (optind+2 == argc) {
- 		flags |= FLAG_FILENAME;
- 		filename = argv[optind];
-@@ -233,6 +260,8 @@ int main (int argc,char *argv[])
- 		flags |= FLAG_DEVICE;
- 		device = argv[optind+1];
- 		DEBUG("Got device: %s\n",device);
-+
-+		offset = 0;
- 	}
- 
- 	if (flags & FLAG_HELP || device == NULL)
-@@ -264,6 +293,12 @@ int main (int argc,char *argv[])
- 		exit (EXIT_FAILURE);
- 	}
- 
-+	/* does offset is out of the mtd */
-+	if (offset > mtd.size) {
-+		log_printf(LOG_ERROR, "%s offset won't fit into %s!\n", offset, device);
-+		exit(EXIT_FAILURE);
-+	}
-+
- 	/* diff block flashcp */
- 	if (flags & FLAG_PARTITION)
- 	{
-@@ -284,6 +319,8 @@ int main (int argc,char *argv[])
- 	}
- 	else
- 	{
-+		/* Erase from the offset */
-+		erase.start = offset;
- 		erase.length = (filestat.st_size + mtd.erasesize - 1) / mtd.erasesize;
- 		erase.length *= mtd.erasesize;
- 	}
-@@ -330,6 +367,12 @@ int main (int argc,char *argv[])
- 	size = filestat.st_size;
- 	i = BUFSIZE;
- 	written = 0;
-+
-+	/* if offset is greater than 0 */
-+	if (offset)
-+		if (safe_rewind_offset(dev_fd, device, offset) != EXIT_SUCCESS)
-+			return EXIT_FAILURE;
-+
- 	while (size)
- 	{
- 		if (size < BUFSIZE) i = size;
-@@ -374,8 +417,9 @@ int main (int argc,char *argv[])
- 	 * verify that flash == file data *
- 	 **********************************/
- 
--	safe_rewind (fil_fd,filename);
--	safe_rewind (dev_fd,device);
-+	safe_rewind(fil_fd, filename);
-+	safe_rewind_offset(dev_fd, device, offset);
-+
- 	size = filestat.st_size;
- 	i = BUFSIZE;
- 	written = 0;
--- 
-2.25.1
-
diff --git a/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils_%.bbappend b/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils_%.bbappend
deleted file mode 100644
index 6f3e20319..000000000
--- a/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://0001-flashcp-support-offset-option.patch "
diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb
index 1b5a119b1..1b5a119b1 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb
+++ b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb
diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml
index 3fa190852..23f54e331 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml
+++ b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml
@@ -1,5 +1,5 @@
 description: >
-    Mt.Jade inventory fixups
+   Ampere inventory fixups
 
 events:
     - name: Add Chassis interface
diff --git a/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
new file mode 100644
index 000000000..75177dce1
--- /dev/null
+++ b/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -0,0 +1,9 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+inherit obmc-phosphor-systemd
+
+HOSTIPMI_PROVIDER_LIBRARY:remove = "libstrgfnhandler.so"
+
+do_install:append () {
+	rm -rf ${D}${libdir}/ipmid-providers
+}
diff --git a/meta-ampere/meta-jade/conf/bblayers.conf.sample b/meta-ampere/meta-jade/conf/bblayers.conf.sample
index 6e0893eb3..6427c8b1b 100644
--- a/meta-ampere/meta-jade/conf/bblayers.conf.sample
+++ b/meta-ampere/meta-jade/conf/bblayers.conf.sample
@@ -17,15 +17,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-ampere \
   ##OEROOT##/meta-ampere/meta-jade \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-ampere \
-  ##OEROOT##/meta-ampere/meta-jade \
-  "
diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf
index 633efa012..40bd0f81e 100644
--- a/meta-ampere/meta-jade/conf/machine/mtjade.conf
+++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf
@@ -14,8 +14,6 @@ FLASH_KERNEL_OFFSET = "1024"
 FLASH_ROFS_OFFSET   = "10240"
 FLASH_RWFS_OFFSET   = "43008"
 
-OBMC_POWER_SUPPLY_INSTANCES = "0 1"
-
 MACHINE_FEATURES += "\
         obmc-phosphor-chassis-mgmt \
         obmc-phosphor-flash-mgmt \
@@ -32,9 +30,9 @@ OBMC_IMAGE_EXTRA_INSTALL:append = "\
                                    ampere-flash-utils \
                                    ampere-mac-update \
                                    mtjade-gpio-config \
-                                   mtd-utils \
                                    ampere-platform-init \
                                    ampere-ipmi-oem \
+                                   phosphor-nvme \
                                   "
 
 PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ampere-apps"
diff --git a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils.bb b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils.bb
index 241070c4e..844709b91 100644
--- a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils.bb
+++ b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils.bb
@@ -9,6 +9,7 @@ RDEPENDS:${PN} = "bash"
 DEPENDS = "zlib"
 
 SRC_URI += "\
+            file://ampere_firmware_upgrade.sh \
             file://ampere_flash_bios.sh \
            "
 
@@ -19,5 +20,6 @@ LDFLAGS += "-L ${ROOT}/usr/lib/ -lz "
 
 do_install:append() {
     install -d ${D}/usr/sbin
+    install -m 0755 ${WORKDIR}/ampere_firmware_upgrade.sh ${D}/${sbindir}/ampere_firmware_upgrade.sh
     install -m 0755 ${S}/ampere_flash_bios.sh ${D}/${sbindir}/ampere_flash_bios.sh
 }
diff --git a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_firmware_upgrade.sh b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_firmware_upgrade.sh
new file mode 100755
index 000000000..130682d12
--- /dev/null
+++ b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_firmware_upgrade.sh
@@ -0,0 +1,144 @@
+#!/bin/bash
+
+do_fru_upgrade() {
+	FRU_DEVICE="/sys/bus/i2c/devices/3-0050/eeprom"
+
+	if ! command -v ampere_fru_upgrade;
+	then
+		echo "Bypass fru update as no ampere_fru_upgrade available"
+		exit
+	fi
+	ampere_fru_upgrade -d $FRU_DEVICE -f "$IMAGE"
+
+	systemctl restart xyz.openbmc_project.FruDevice.service
+	systemctl restart phosphor-ipmi-host.service
+}
+
+do_smpmpro_upgrade() {
+	I2C_BUS_DEV="1"
+	EEPROM_ADDR="0x50"
+
+	if ! command -v ampere_eeprom_prog;
+	then
+		echo "Bypass SCP firmware update as no ampere_eeprom_prog available"
+		exit
+	fi
+	echo "SECPRO mode: $SECPRO"
+	# Turn off the Host if it is currently ON
+	chassisstate=$(obmcutil chassisstate | awk -F. '{print $NF}')
+	echo "Current Chassis State: $chassisstate"
+	if [ "$chassisstate" == 'On' ];
+	then
+		echo "Turning the Chassis off"
+		obmcutil chassisoff
+		sleep 15
+		# Check if HOST was OFF
+		chassisstate_off=$(obmcutil chassisstate | awk -F. '{print $NF}')
+		if [ "$chassisstate_off" == 'On' ];
+		then
+			echo "Error : Failed turning the Chassis off"
+			exit
+		fi
+	fi
+
+	if [[ $SECPRO == 1 ]]; then
+		# 3 is S0_SPECIAL_BOOT
+		gpioset 0 3=1
+		# 66 is S1_SPECIAL_BOOT
+		gpioset 0 66=1
+	fi
+
+	# Switch EEPROM control to BMC AST2500 I2C
+	# 226 is BMC_GPIOAC2_SPI0_PROGRAM_SEL
+	gpioset 0 226=0
+
+	# 08 is BMC_GPIOB0_I2C_BACKUP_SEL
+	if [[ $DEV_SEL == 1 ]]; then
+		echo "Run update primary Boot EEPROM"
+		gpioset 0 8=1       # Main EEPROM
+	elif [[ $DEV_SEL == 2 ]]; then
+		echo "Run update secondary Boot EEPROM"
+		gpioset 0 8=0       # Second EEPROM
+	else
+		echo "Please choose Main (1) or Second EEPROM (2)"
+		exit 0
+	fi
+
+	# Write Firmware to EEPROM and read back for validation
+	ampere_eeprom_prog -b $I2C_BUS_DEV -s $EEPROM_ADDR -p -f "$IMAGE"
+
+	# Switch EEPROM control to Host
+	# 08 is BMC_GPIOB0_I2C_BACKUP_SEL
+	gpioset 0 8=1
+	# 226 is BMC_GPIOAC2_SPI0_PROGRAM_SEL
+	gpioset 0 226=1
+
+	if [ "$chassisstate" == 'On' ];
+	then
+		sleep 5
+		echo "Turn on the Host"
+		obmcutil poweron
+	fi
+
+	# Deassert SECPRO GPIO PINs
+	if [[ $SECPRO == 1 ]]; then
+		chassisstate=$(obmcutil chassisstate | awk -F. '{print $NF}')
+		if [ "$chassisstate_off" == 'Off' ]; then
+			obmcutil poweron
+		fi
+
+		sleep 30s
+		echo "De-asserting special GPIO PINs"
+		# 3 is S0_SPECIAL_BOOT
+		gpioset 0 3=0
+		# 66 is S1_SPECIAL_BOOT
+		gpioset 0 66=0
+	fi
+}
+
+
+if [ $# -eq 0 ]; then
+	echo "Usage:"
+	echo "      $(basename "$0") <Type> <Image file> <DEV_SEL> [SECPRO]"
+	echo "Where:"
+	echo "    <Type>: smpmpro or fru"
+	echo "            If Type is smpmpro, then DEV_SEL must is 1 (MAIN EEPROM), 2 (Failover)"
+	echo "    SECPRO: Optional, input '1' to enter & flash secpro mode. Default: 0"
+	exit 0
+fi
+
+TYPE=$1
+IMAGE=$2
+if [ -z "$3" ]
+then
+	DEV_SEL="1"    # by default, select Main image
+else
+	DEV_SEL=$3
+fi
+
+SECPRO=0
+if [ -n "$4" ]; then
+	if [[ "$4" == "1" ]]; then
+		SECPRO=1
+	fi
+fi
+
+MANIFEST="$(echo "$IMAGE" | cut -d'/' -f-4)/MANIFEST"
+if [ -f "$MANIFEST" ]; then
+	echo "MANIFEST: $MANIFEST"
+	if grep -qF "SECPRO" "$MANIFEST"; then
+		SECPRO=1
+	fi
+fi
+
+# Restrict to flash failover in case of SECPRO
+if [ $SECPRO == 1 ] && [ "$DEV_SEL" == 2 ]; then
+	echo "Not allow to flash the failover with SECPRO image"
+	exit
+fi
+
+if [[ $TYPE == "smpmpro" ]]; then
+	do_smpmpro_upgrade
+elif [[ $TYPE == "fru" ]]; then
+	do_fru_upgrade
+fi
diff --git a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh
index b7f4bc52e..b13e4b50a 100755
--- a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh
+++ b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh
@@ -15,10 +15,8 @@
 # limitations under the License.
 
 do_flash () {
-        OFFSET=$1
-
 	# Check the PNOR partition available
-	HOST_MTD=$(< /proc/mtd grep "pnor" | sed -n 's/^\(.*\):.*/\1/p')
+	HOST_MTD=$(< /proc/mtd grep "pnor-uefi" | sed -n 's/^\(.*\):.*/\1/p')
 	if [ -z "$HOST_MTD" ];
 	then
 		# If the PNOR partition is not available, then bind again driver
@@ -26,7 +24,7 @@ do_flash () {
 		echo 1e630000.spi > /sys/bus/platform/drivers/aspeed-smc/bind
 		sleep 2
 
-		HOST_MTD=$(< /proc/mtd grep "pnor" | sed -n 's/^\(.*\):.*/\1/p')
+		HOST_MTD=$(< /proc/mtd grep "pnor-uefi" | sed -n 's/^\(.*\):.*/\1/p')
 		if [ -z "$HOST_MTD" ];
 		then
 			echo "Fail to probe Host SPI-NOR device"
@@ -34,8 +32,8 @@ do_flash () {
 		fi
 	fi
 
-	echo "--- Flashing firmware to @/dev/$HOST_MTD offset=$OFFSET"
-	flashcp -v "$IMAGE" /dev/"$HOST_MTD" "$OFFSET"
+	echo "--- Flashing firmware to @/dev/$HOST_MTD"
+	flashcp -v "$IMAGE" /dev/"$HOST_MTD"
 }
 
 
@@ -50,6 +48,12 @@ if [ ! -f "$IMAGE" ]; then
 	exit 1
 fi
 
+if [ -z "$2" ]; then
+       DEV_SEL="1"    # by default, select primary device
+else
+       DEV_SEL="$2"
+fi
+
 # Turn off the Host if it is currently ON
 chassisstate=$(obmcutil chassisstate | awk -F. '{print $NF}')
 echo "--- Current Chassis State: $chassisstate"
@@ -74,8 +78,21 @@ if ! gpioset 0 226=0; then
 	exit 1
 fi
 
+# Switch the host SPI bus (between primary and secondary)
+# 227 is BMC_SPI0_BACKUP_SEL
+if [[ $DEV_SEL == 1 ]]; then
+	echo "Run update primary Host SPI-NOR"
+	gpioset 0 227=0       # Primary SPI
+elif [[ $DEV_SEL == 2 ]]; then
+	echo "Run update secondary Host SPI-NOR"
+	gpioset 0 227=1       # Second SPI
+else
+	echo "Please choose primary SPI (1) or second SPI (2)"
+	exit 0
+fi
+
 # Flash the firmware
-do_flash 0x400000
+do_flash
 
 # Switch the host SPI bus to HOST."
 echo "--- Switch the host SPI bus to HOST."
diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service
index 78862eb32..fe776a5b9 100644
--- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service
+++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service
@@ -1,10 +1,10 @@
 [Unit]
 Description=Ampere set GPIOs before power off
 Requires=op-wait-power-off@%i.service
-Before=op-wait-power-off@%i.service
+After=op-wait-power-off@%i.service
 Conflicts=obmc-chassis-poweron@%i.target
 
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/env ampere_gpio_utils.sh power off
-SyslogIdentifier=ampere_gpio_utils
\ No newline at end of file
+SyslogIdentifier=ampere_gpio_utils
diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere_gpio_utils.sh b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere_gpio_utils.sh
index 1a098f446..5d1a1a27a 100644
--- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere_gpio_utils.sh
+++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere_gpio_utils.sh
@@ -10,14 +10,16 @@ function usage() {
 
 set_gpio_power_off() {
 	echo "Setting GPIO before Power off"
-	gpio_configure_output "$OCP_AUX_PWREN" 1
 	gpio_configure_output "$OCP_MAIN_PWREN" 0
-	gpio_configure_output "$SPI0_PROGRAM_SEL" 0
+	rm -f /run/openbmc/host@0-on
 }
 
 set_gpio_power_on() {
 	echo "Setting GPIO before Power on"
-	gpio_configure_output "$OCP_AUX_PWREN" 1
+	val=$(gpio_get_val "$S0_CPU_FW_BOOT_OK")
+	if [ "$val" == 1 ]; then
+		exit
+	fi
 	gpio_configure_output "$OCP_MAIN_PWREN" 1
 	gpio_configure_output "$SPI0_PROGRAM_SEL" 1
 	gpio_configure_output "$SPI0_BACKUP_SEL" 0
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
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf
deleted file mode 100644
index c5fc23ace..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-INVENTORY=/system/chassis/motherboard/powersupply0
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=64
-NAME=powersupply0
-DRIVERS=/sys/bus/i2c/drivers/pmbus,6-0058
-EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf
deleted file mode 100644
index e591227d2..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-INVENTORY=/system/chassis/motherboard/powersupply1
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=65
-NAME=powersupply1
-DRIVERS=/sys/bus/i2c/drivers/pmbus,6-0059
-EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
deleted file mode 100644
index 527cbbda0..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service"
-INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service"
-POWERSUPPLY_TGT = "multi-user.target"
-FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}"
-
-SYSTEMD_LINK:${PN}-presence:append:mtjade = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
-
-POWERSUPPLY_ENV_FMT  = "obmc/gpio/phosphor-power-supply-{0}.conf"
-
-SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:mtjade = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
deleted file mode 100644
index e7b3256a8..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
+++ /dev/null
@@ -1,141 +0,0 @@
-[
-    {
-        "path": "system/chassis/motherboard/powersupply0",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/fan_tach/PSU0_fan1",
-                    "/xyz/openbmc_project/sensors/temperature/PSU0_TEMP",
-                    "/xyz/openbmc_project/sensors/voltage/PSU0_VINPUT",
-                    "/xyz/openbmc_project/sensors/voltage/PSU0_VOUTPUT",
-                    "/xyz/openbmc_project/sensors/power/PSU0_PINPUT",
-                    "/xyz/openbmc_project/sensors/power/PSU0_POUTPUT",
-                    "/xyz/openbmc_project/sensors/current/PSU0_IINPUT",
-                    "/xyz/openbmc_project/sensors/current/PSU0_IOUTPUT"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis/motherboard/powersupply1",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "inventory",
-                    "fType": "sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/fan_tach/PSU1_fan1",
-                    "/xyz/openbmc_project/sensors/temperature/PSU1_TEMP",
-                    "/xyz/openbmc_project/sensors/voltage/PSU1_VINPUT",
-                    "/xyz/openbmc_project/sensors/voltage/PSU1_VOUTPUT",
-                    "/xyz/openbmc_project/sensors/power/PSU1_PINPUT",
-                    "/xyz/openbmc_project/sensors/power/PSU1_POUTPUT",
-                    "/xyz/openbmc_project/sensors/current/PSU1_IINPUT",
-                    "/xyz/openbmc_project/sensors/current/PSU1_IOUTPUT"
-                ]
-            }
-        ]
-    },
-    {
-        "path": "system/chassis",
-        "endpoints":
-        [
-            {
-                "types":
-                {
-                    "rType": "chassis",
-                    "fType": "all_sensors"
-                },
-                "paths":
-                [
-                    "/xyz/openbmc_project/sensors/fan_tach/FAN3_1",
-                    "/xyz/openbmc_project/sensors/fan_tach/FAN3_2",
-                    "/xyz/openbmc_project/sensors/fan_tach/FAN4_1",
-                    "/xyz/openbmc_project/sensors/fan_tach/FAN4_2",
-                    "/xyz/openbmc_project/sensors/fan_tach/FAN5_1",
-                    "/xyz/openbmc_project/sensors/fan_tach/FAN5_2",
-                    "/xyz/openbmc_project/sensors/fan_tach/FAN6_1",
-                    "/xyz/openbmc_project/sensors/fan_tach/FAN6_2",
-                    "/xyz/openbmc_project/sensors/fan_tach/FAN7_1",
-                    "/xyz/openbmc_project/sensors/fan_tach/FAN7_2",
-                    "/xyz/openbmc_project/sensors/fan_tach/FAN8_1",
-                    "/xyz/openbmc_project/sensors/fan_tach/FAN8_2",
-                    "/xyz/openbmc_project/sensors/fan_tach/PSU0_fan1",
-                    "/xyz/openbmc_project/sensors/fan_tach/PSU1_fan1",
-
-                    "/xyz/openbmc_project/sensors/temperature/TS1_Temp",
-                    "/xyz/openbmc_project/sensors/temperature/TS2_Temp",
-                    "/xyz/openbmc_project/sensors/temperature/TS3_Temp",
-                    "/xyz/openbmc_project/sensors/temperature/TS4_Temp",
-                    "/xyz/openbmc_project/sensors/temperature/TS5_Temp",
-                    "/xyz/openbmc_project/sensors/temperature/TS6_Temp",
-                    "/xyz/openbmc_project/sensors/temperature/PSU0_TEMP",
-                    "/xyz/openbmc_project/sensors/temperature/PSU1_TEMP",
-
-                    "/xyz/openbmc_project/sensors/voltage/S0_0V8_VDDC_SOC",
-                    "/xyz/openbmc_project/sensors/voltage/S0_0V75_PCP",
-                    "/xyz/openbmc_project/sensors/voltage/S0_1V2_VDDQ0123",
-                    "/xyz/openbmc_project/sensors/voltage/S0_0V6_VTT0123",
-                    "/xyz/openbmc_project/sensors/voltage/S0_2V5_VPP0123",
-                    "/xyz/openbmc_project/sensors/voltage/S0_1V2_VDDQ4567",
-                    "/xyz/openbmc_project/sensors/voltage/S0_0V6_VTT4567",
-                    "/xyz/openbmc_project/sensors/voltage/S0_2V5_VPP4567",
-                    "/xyz/openbmc_project/sensors/voltage/S0_0V85_RCA",
-                    "/xyz/openbmc_project/sensors/voltage/S0_1V8_VDDH",
-                    "/xyz/openbmc_project/sensors/voltage/S0_1V5_VDDH",
-                    "/xyz/openbmc_project/sensors/voltage/S0_1V8_SOC",
-                    "/xyz/openbmc_project/sensors/voltage/S0_1V8_PCP",
-                    "/xyz/openbmc_project/sensors/voltage/S0_3V3_SOC",
-                    "/xyz/openbmc_project/sensors/voltage/S0_CPU_VCORE",
-                    "/xyz/openbmc_project/sensors/voltage/S0_DIMM_DDR_Volt",
-                    "/xyz/openbmc_project/sensors/voltage/S0_DIMM_VR1_Volt",
-                    "/xyz/openbmc_project/sensors/voltage/S0_DIMM_VR2_Volt",
-                    "/xyz/openbmc_project/sensors/voltage/S0_RCA_VR_Volt",
-                    "/xyz/openbmc_project/sensors/voltage/S0_SOC_Volt",
-                    "/xyz/openbmc_project/sensors/voltage/S1_0V8_VDDC_SOC",
-                    "/xyz/openbmc_project/sensors/voltage/S1_0V75_PCP",
-                    "/xyz/openbmc_project/sensors/voltage/S1_1V2_VDDQ0123",
-                    "/xyz/openbmc_project/sensors/voltage/S1_0V6_VTT0123",
-                    "/xyz/openbmc_project/sensors/voltage/S1_2V5_VPP0123",
-                    "/xyz/openbmc_project/sensors/voltage/S1_1V2_VDDQ4567",
-                    "/xyz/openbmc_project/sensors/voltage/S1_0V6_VTT4567",
-                    "/xyz/openbmc_project/sensors/voltage/S1_2V5_VPP4567",
-                    "/xyz/openbmc_project/sensors/voltage/S1_0V85_RCA",
-                    "/xyz/openbmc_project/sensors/voltage/S1_1V8_VDDH",
-                    "/xyz/openbmc_project/sensors/voltage/S1_1V5_VDDH",
-                    "/xyz/openbmc_project/sensors/voltage/S1_1V8_SOC",
-                    "/xyz/openbmc_project/sensors/voltage/S1_1V8_PCP",
-                    "/xyz/openbmc_project/sensors/voltage/S1_3V3_SOC",
-                    "/xyz/openbmc_project/sensors/voltage/3V3_SB",
-                    "/xyz/openbmc_project/sensors/voltage/VBAT_RTC",
-                    "/xyz/openbmc_project/sensors/voltage/PSU0_VINPUT",
-                    "/xyz/openbmc_project/sensors/voltage/PSU0_VOUTPUT",
-                    "/xyz/openbmc_project/sensors/voltage/PSU1_VINPUT",
-                    "/xyz/openbmc_project/sensors/voltage/PSU1_VOUTPUT",
-
-                    "/xyz/openbmc_project/sensors/power/PSU0_PINPUT",
-                    "/xyz/openbmc_project/sensors/power/PSU1_PINPUT",
-                    "/xyz/openbmc_project/sensors/power/PSU0_POUTPUT",
-                    "/xyz/openbmc_project/sensors/power/PSU1_POUTPUT",
-                    "/xyz/openbmc_project/sensors/power/total_power",
-
-                    "/xyz/openbmc_project/sensors/current/PSU0_IINPUT",
-                    "/xyz/openbmc_project/sensors/current/PSU0_IOUTPUT",
-                    "/xyz/openbmc_project/sensors/current/PSU1_IINPUT",
-                    "/xyz/openbmc_project/sensors/current/PSU1_IOUTPUT"
-                ]
-            }
-        ]
-    }
-]
diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
deleted file mode 100644
index ab3030879..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-DEPENDS:append:mtjade = " inventory-cleanup"
-
-FILESEXTRAPATHS:prepend:mtjade := "${THISDIR}/${PN}:"
-PACKAGECONFIG:append:mtjade = " associations"
-SRC_URI:append:mtjade = " file://associations.json"
-
-do_install:append:mtjade() {
-    install -d ${D}${base_datadir}
-    install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}
-}
diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard
deleted file mode 100644
index f0498347b..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard
+++ /dev/null
@@ -1,2 +0,0 @@
-SYSFS_PATH=/sys/bus/i2c/devices/3-0050/eeprom
-FRUID=0
diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
deleted file mode 100644
index 5150e2312..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ /dev/null
@@ -1,26 +0,0 @@
-inherit obmc-phosphor-systemd
-
-DEPENDS:append:mtjade = " mtjade-yaml-config"
-
-EXTRA_OECONF:mtjade = " \
-    YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-fru-read.yaml \
-    PROP_YAML=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-extra-properties.yaml \
-    "
-FILESEXTRAPATHS:prepend:mtjade := "${THISDIR}/${PN}:"
-
-EEPROM_NAMES = "motherboard"
-
-EEPROMFMT = "system/chassis/{0}"
-EEPROM_ESCAPEDFMT = "system-chassis-{0}"
-EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}"
-EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}"
-
-ENVFMT = "obmc/eeproms/{0}"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade := "${@compose_list(d, 'ENVFMT', 'EEPROMS')}"
-
-TMPL = "obmc-read-eeprom@.service"
-TGT = "multi-user.target"
-INSTFMT = "obmc-read-eeprom@{0}.service"
-FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}"
-
-SYSTEMD_LINK:${PN}:append:mtjade := "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index fce5b74eb..04fff3d63 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"
 
-DEPENDS:append:mtjade = " mtjade-yaml-config"
+DEPENDS:append = " ${MACHINE}-yaml-config"
 
 RRECOMMENDS:${PN} += "ipmitool"
 RDEPENDS:${PN} += "bash"
@@ -10,14 +10,16 @@ SRC_URI += " \
             file://ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service \
             "
 
-EXTRA_OECONF:mtjade = " \
-    SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-sensors-${MACHINE}.yaml \
-    FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-fru-read.yaml \
-    "
+EXTRA_OECONF = " \
+                SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/${MACHINE}-yaml-config/ipmi-sensors.yaml \
+               "
 
 AMPERE_SOFTPOWEROFF_TMPL = "ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service"
 
-do_install:append:mtjade(){
+PACKAGECONFIG:append = " dynamic-sensors"
+HOSTIPMI_PROVIDER_LIBRARY += "libdynamiccmds.so"
+
+do_install:append(){
     install -d ${D}${includedir}/phosphor-ipmi-host
     install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host
     install -m 0755 ${WORKDIR}/ampere-phosphor-softpoweroff ${D}/${bindir}/phosphor-softpoweroff
diff --git a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 56db56883..7b27a7edd 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -3,13 +3,17 @@ RDEPENDS:${PN}-extras:append:mtjade = " \
                                        phosphor-image-signing \
                                        phosphor-virtual-sensor \
                                        phosphor-misc-usb-ctrl \
-                                     "
+                                       fault-monitor \
+                                       id-button \
+                                       psu-hotswap-reset \
+                                      "
 
 RDEPENDS:${PN}-inventory:append:mtjade = " \
-                                          fault-monitor \
-                                          id-button \
-                                          psu-hotswap-reset \
                                           host-gpio-handling \
                                           dbus-sensors \
                                           entity-manager \
-                                        "
+                                         "
+
+RDEPENDS:${PN}-extras:remove:mtjade = " phosphor-hwmon"
+VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors"
+RDEPENDS:${PN}-extras:append:mtjade = " phosphor-virtual-sensor"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf
deleted file mode 100644
index 5d1ed0944..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=TS1_Temp
-CRITHI_temp1=50000
-CRITLO_temp1=1000
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf
deleted file mode 100644
index 2429d8e14..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=TS2_Temp
-CRITHI_temp1=50000
-CRITLO_temp1=1000
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf
deleted file mode 100644
index 60d2783ae..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=TS3_Temp
-CRITHI_temp1=50000
-CRITLO_temp1=1000
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf
deleted file mode 100644
index 9b7987400..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=TS4_Temp
-CRITHI_temp1=50000
-CRITLO_temp1=1000
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf
deleted file mode 100644
index c9fc00c05..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=TS5_Temp
-CRITHI_temp1=50000
-CRITLO_temp1=1000
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf
deleted file mode 100644
index 6c71eca5d..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=TS6_Temp
-CRITHI_temp1=50000
-CRITLO_temp1=1000
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf
deleted file mode 100644
index 944085d4d..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-LABEL_temp1= "PSU0_TEMP"
-CRITHI_temp1=64000
-
-LABEL_power2= "PSU0_POUTPUT"
-
-LABEL_fan1="PSU0_fan1"
-CRITHI_fan1=20300
-
-LABEL_in1= "PSU0_VINPUT"
-LABEL_in2= "PSU0_VOUTPUT"
-
-LABEL_curr1= "PSU0_IINPUT"
-LABEL_curr2= "PSU0_IOUTPUT"
-
-LABEL_power1= "PSU0_PINPUT"
-
-INTERVAL=10000000
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf
deleted file mode 100644
index 15b965551..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-LABEL_temp1 = "PSU1_TEMP"
-CRITHI_temp1=64000
-
-LABEL_power2 = "PSU1_POUTPUT"
-
-LABEL_fan1 = "PSU1_fan1"
-CRITHI_fan1=20300
-
-LABEL_in1= "PSU1_VINPUT"
-LABEL_in2= "PSU1_VOUTPUT"
-
-LABEL_curr1= "PSU1_IINPUT"
-LABEL_curr2= "PSU1_IOUTPUT"
-
-LABEL_power1 = "PSU1_PINPUT"
-
-INTERVAL=10000000
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
deleted file mode 100644
index b14392bea..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-LABEL_fan5 = "FAN3_1"
-CRITLO_fan5=500
-CRITHI_fan5=23100
-
-LABEL_fan6 = "FAN3_2"
-CRITLO_fan6=500
-CRITHI_fan6=23100
-
-LABEL_fan7 = "FAN4_1"
-CRITLO_fan7=500
-CRITHI_fan7=23100
-
-LABEL_fan8 = "FAN4_2"
-CRITLO_fan8=500
-CRITHI_fan8=23100
-
-LABEL_fan9 = "FAN5_1"
-CRITLO_fan9=500
-CRITHI_fan9=23100
-
-LABEL_fan10 = "FAN5_2"
-CRITLO_fan10=500
-CRITHI_fan10=23100
-
-LABEL_fan11 = "FAN6_1"
-CRITLO_fan11=500
-CRITHI_fan11=23100
-
-LABEL_fan12 = "FAN6_2"
-CRITLO_fan12=500
-CRITHI_fan12=23100
-
-LABEL_fan13 = "FAN7_1"
-CRITLO_fan13=500
-CRITHI_fan13=23100
-
-LABEL_fan14 = "FAN7_2"
-CRITLO_fan14=500
-CRITHI_fan14=23100
-
-LABEL_fan15 = "FAN8_1"
-CRITLO_fan15=500
-CRITHI_fan15=23100
-
-LABEL_fan16 = "FAN8_2"
-CRITLO_fan16=500
-CRITHI_fan16=23100
-
-PWM_TARGET_fan5 = "3"
-PWM_TARGET_fan6 = "3"
-PWM_TARGET_fan7 = "4"
-PWM_TARGET_fan8 = "4"
-PWM_TARGET_fan9 = "5"
-PWM_TARGET_fan10 = "5"
-PWM_TARGET_fan11 = "6"
-PWM_TARGET_fan12 = "6"
-PWM_TARGET_fan13 = "7"
-PWM_TARGET_fan14 = "7"
-PWM_TARGET_fan15 = "8"
-PWM_TARGET_fan16 = "8"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-adc14.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-adc14.conf
deleted file mode 100644
index a5c5c2a45..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-adc14.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LABEL_in1=3V3_SB
-GAIN_in1=3
-CRITHI_in1=3960
-CRITLO_in1=2320
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-battery.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-battery.conf
deleted file mode 100644
index 3cc58229d..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-battery.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-LABEL_in1=VBAT_RTC
-GAIN_in1=3
-CRITHI_in1=3564
-CRITLO_in1=2106
-
-# GPIOS4 needs to be pulled high for battery voltage reading
-GPIOCHIP_in1=0
-GPIO_in1=148
-
-# Read it every day so it does not impact battery life
-INTERVAL=86400000000
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon.conf
deleted file mode 100644
index 4e46123ae..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon.conf
+++ /dev/null
@@ -1,123 +0,0 @@
-LABEL_in1=S0_0V8_VDDC_SOC
-CRITHI_in1=960
-CRITLO_in1=560
-
-LABEL_in2=S1_0V8_VDDC_SOC
-CRITHI_in2=960
-CRITLO_in2=560
-
-LABEL_in3=S0_0V75_PCP
-CRITHI_in3=1323
-CRITLO_in3=504
-
-LABEL_in4=S1_0V75_PCP
-CRITHI_in4=1323
-CRITLO_in4=504
-
-LABEL_in5=S0_1V2_VDDQ0123
-CRITHI_in5=1442
-CRITLO_in5=840
-
-LABEL_in6=S1_1V2_VDDQ0123
-CRITHI_in6=1442
-CRITLO_in6=840
-
-LABEL_in7=S0_0V6_VTT0123
-CRITHI_in7=720
-CRITLO_in7=420
-
-LABEL_in8=S1_0V6_VTT0123
-CRITHI_in8=720
-CRITLO_in8=420
-
-LABEL_in9=S0_2V5_VPP0123
-GAIN_in9=2
-CRITHI_in9=3000
-CRITLO_in9=1755
-
-LABEL_in10=S1_2V5_VPP0123
-GAIN_in10=2
-CRITHI_in10=3000
-CRITLO_in10=1755
-
-LABEL_in11=S0_1V2_VDDQ4567
-CRITHI_in11=1442
-CRITLO_in11=840
-
-LABEL_in12=S1_1V2_VDDQ4567
-CRITHI_in12=1442
-CRITLO_in12=840
-
-LABEL_in13=S0_0V6_VTT4567
-CRITHI_in13=720
-CRITLO_in13=420
-
-LABEL_in14=S1_0V6_VTT4567
-CRITHI_in14=720
-CRITLO_in14=420
-
-LABEL_in15=S0_2V5_VPP4567
-GAIN_in15=2
-CRITHI_in15=3000
-CRITLO_in15=1755
-
-LABEL_in16=S1_2V5_VPP4567
-GAIN_in16=2
-CRITHI_in16=3000
-CRITLO_in16=1755
-
-LABEL_in17=S0_0V85_RCA
-CRITHI_in17=1080
-CRITLO_in17=630
-
-LABEL_in18=S1_0V85_RCA
-CRITHI_in18=1080
-CRITLO_in18=630
-
-LABEL_in19=S0_1V8_VDDH
-GAIN_in19=2
-CRITHI_in19=2156
-CRITLO_in19=1265
-
-LABEL_in20=S1_1V8_VDDH
-GAIN_in20=2
-CRITHI_in20=2156
-CRITLO_in20=1265
-
-LABEL_in21=S0_1V5_VDDH
-CRITHI_in21=1800
-CRITLO_in21=1053
-
-LABEL_in22=S1_1V5_VDDH
-CRITHI_in22=1800
-CRITLO_in22=1053
-
-LABEL_in23=S0_1V8_SOC
-GAIN_in23=2
-CRITHI_in23=2156
-CRITLO_in23=1265
-
-LABEL_in24=S1_1V8_SOC
-GAIN_in24=2
-CRITHI_in24=2156
-CRITLO_in24=1265
-
-LABEL_in25=S0_1V8_PCP
-GAIN_in25=2
-CRITHI_in25=2156
-CRITLO_in25=1265
-
-LABEL_in26=S1_1V8_PCP
-GAIN_in26=2
-CRITHI_in26=2156
-CRITLO_in26=1265
-
-LABEL_in27=S0_3V3_SOC
-GAIN_in27=3
-CRITHI_in27=3960
-CRITLO_in27=2320
-
-LABEL_in28=S1_3V3_SOC
-GAIN_in28=3
-CRITHI_in28=3960
-CRITLO_in28=2320
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
deleted file mode 100644
index a77a59be0..000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ /dev/null
@@ -1,31 +0,0 @@
-FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:"
-
-EXTRA_OEMESON:append:mtjade = " -Dnegative-errno-on-fail=true"
-
-CHIPS:mtjade = " \
-        bus@1e78a000/i2c-bus@100/tmp175@28 \
-        bus@1e78a000/i2c-bus@100/tmp175@29 \
-        bus@1e78a000/i2c-bus@100/tmp175@2a \
-        bus@1e78a000/i2c-bus@100/tmp175@2b \
-        bus@1e78a000/i2c-bus@100/tmp175@2c \
-        bus@1e78a000/i2c-bus@100/tmp175@2d \
-        bus@1e78a000/i2c-bus@1c0/psu@58 \
-        bus@1e78a000/i2c-bus@1c0/psu@59 \
-        pwm-tacho-controller@1e786000 \
-        "
-
-ITEMSFMT = "ahb/apb/{0}.conf"
-
-ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS:${MACHINE}')}"
-
-ITEMS += "iio-hwmon.conf iio-hwmon-adc14.conf iio-hwmon-battery.conf"
-
-ENVS = "obmc/${MACHINE}/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
-
-do_install:append:mtjade() {
-  SOURCEDIR="${WORKDIR}/obmc/${MACHINE}/hwmon"
-  DESTDIR="${D}${sysconfdir}/default/obmc"
-  install -d ${DESTDIR}
-  cp -r ${SOURCEDIR} ${DESTDIR}
-}
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
new file mode 100644
index 000000000..9c2aade75
--- /dev/null
+++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json
@@ -0,0 +1,118 @@
+{
+    "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
new file mode 100644
index 000000000..5eadc25f7
--- /dev/null
+++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += " file://nvme_config.json"
+
+do_install:append() {
+    install -m 0644 -D ${WORKDIR}/nvme_config.json \
+                   ${D}/etc/nvme
+}
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
index d0dc76782..abacb4f65 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
+++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
@@ -8,12 +8,25 @@
         "Threshold" :
         {
         },
+        "Associations":
+        [
+            [
+                "chassis",
+                "all_sensors",
+                "/xyz/openbmc_project/inventory/system/chassis/Mt_Jade"
+            ],
+            [
+                "inventory",
+                "sensors",
+                "/xyz/openbmc_project/inventory/system/chassis/Mt_Jade"
+            ]
+        ],
         "Params":
         {
             "DbusParam":
             [
                 {
-                    "ParamName": "PSU0_POUTPUT",
+                    "ParamName": "P0",
                     "Desc":
                     {
                         "Name": "PSU0_POUTPUT",
@@ -21,7 +34,7 @@
                     }
                 },
                 {
-                    "ParamName": "PSU1_POUTPUT",
+                    "ParamName": "P1",
                     "Desc":
                     {
                         "Name": "PSU1_POUTPUT",
@@ -30,7 +43,206 @@
                 }
             ]
         },
-        "Expression": "PSU0_POUTPUT + PSU1_POUTPUT"
+        "Expression": "(P0 + P1) >= 0 ? (P0 + P1) : NULL"
+    },
+    {
+        "Desc":{
+            "Name":"nvme_max",
+            "SensorType":"temperature"
+        },
+        "Threshold":{
+            "CriticalHigh": 80,
+            "CriticalLow": 0,
+            "WarningHigh": 70,
+            "WarningLow": 5
+        },
+        "Params":{
+            "DbusParam": [
+                {
+                    "ParamName": "n0",
+                    "Desc": {
+                        "Name": "nvme0",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n1",
+                    "Desc": {
+                        "Name": "nvme1",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n2",
+                    "Desc": {
+                        "Name": "nvme2",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n3",
+                    "Desc": {
+                        "Name": "nvme3",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n4",
+                    "Desc": {
+                        "Name": "nvme4",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n5",
+                    "Desc": {
+                        "Name": "nvme5",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n6",
+                    "Desc": {
+                        "Name": "nvme6",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n7",
+                    "Desc": {
+                        "Name": "nvme7",
+                        "SensorType": "temperature"
+                    }
+                },
+                                {
+                    "ParamName": "n8",
+                    "Desc": {
+                        "Name": "nvme8",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n9",
+                    "Desc": {
+                        "Name": "nvme9",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n10",
+                    "Desc": {
+                        "Name": "nvme10",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n11",
+                    "Desc": {
+                        "Name": "nvme11",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n12",
+                    "Desc": {
+                        "Name": "nvme12",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n13",
+                    "Desc": {
+                        "Name": "nvme13",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n14",
+                    "Desc": {
+                        "Name": "nvme14",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n15",
+                    "Desc": {
+                        "Name": "nvme15",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n16",
+                    "Desc": {
+                        "Name": "nvme16",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n17",
+                    "Desc": {
+                        "Name": "nvme17",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n18",
+                    "Desc": {
+                        "Name": "nvme18",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n19",
+                    "Desc": {
+                        "Name": "nvme19",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n20",
+                    "Desc": {
+                        "Name": "nvme20",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n21",
+                    "Desc": {
+                        "Name": "nvme21",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n22",
+                    "Desc": {
+                        "Name": "nvme22",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n23",
+                    "Desc": {
+                        "Name": "nvme23",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n24",
+                    "Desc": {
+                        "Name": "nvme24",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "n25",
+                    "Desc": {
+                        "Name": "nvme25",
+                        "SensorType": "temperature"
+                    }
+                }
+            ]
+        },
+        "Expression": "max(0,(n0 == n0) ? n0 : NULL,(n1 == n1) ? n1 : NULL,(n2 == n2) ? n2 : NULL,(n3 == n3) ? n3 : NULL,(n4 == n4) ? n4 : NULL,(n5 == n5) ? n5 : NULL,(n6 == n6) ? n6 : NULL,(n7 == n7) ? n7 : NULL,(n8 == n8) ? n8 : NULL,(n9 == n9) ? n9 : NULL,(n10 == n10) ? n10 : NULL,(n11 == n11) ? n11 : NULL,(n12 == n12) ? n12 : NULL,(n13 == n13) ? n13 : NULL,(n14 == n14) ? n14 : NULL,(n15 == n15) ? n15 : NULL,(n16 == n16) ? n16 : NULL,(n17 == n17) ? n17 : NULL,(n18 == n18) ? n18 : NULL,(n19 == n19) ? n19 : NULL,(n20 == n20) ? n20 : NULL,(n21 == n21) ? n21 : NULL,(n22 == n22) ? n22 : NULL,(n23 == n23) ? n23 : NULL,(n24 == n24) ? n24 : NULL,(n25 == n25) ? n25 : NULL)"
     }
 ]
 
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index 3a1af4f3b..0d1b5e63c 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -1,10 +1,10 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:mtjade += " \
-            file://virtual_sensor_config.json \
-           "
+SRC_URI:append += " \
+                   file://virtual_sensor_config.json \
+                  "
 
-do_install:append:mtjade() {
+do_install:append() {
     install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/
 }