meta-ampere: refine code structure

Restructure Ampere recipes to better reuse existing resource for
multiple platforms later.

Tested:
1. Compile without error.
2. Run regression test for related features without error.

Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: I5d034d21273b99be651f20dc2eb5549c1092f079

14 files changed, 58 insertions, 123 deletions

diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf
index bec22ca9fa..c6706d581d 100644
--- a/meta-ampere/meta-jade/conf/machine/mtjade.conf
+++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf
@@ -22,9 +22,8 @@ MACHINE_FEATURES += "\
 VOLATILE_LOG_DIR = "no"
 
 OBMC_IMAGE_EXTRA_INSTALL:append = "\
-                                   mtjade-utils \
+                                   ampere-utils \
                                    ampere-usbnet \
-                                   ampere-flash-utils \
                                    ampere-mac-update \
                                    mtjade-gpio-config \
                                    ampere-platform-init \
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
deleted file mode 100644
index 844709b91a..0000000000
--- a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-
-SUMMARY = "Ampere Computing LLC Flashing Utilities"
-DESCRIPTION = "Application to support flashing utilities on Ampere platforms"
-PR = "r0"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-RDEPENDS:${PN} = "bash"
-DEPENDS = "zlib"
-
-SRC_URI += "\
-            file://ampere_firmware_upgrade.sh \
-            file://ampere_flash_bios.sh \
-           "
-
-S = "${WORKDIR}"
-ROOT = "${STAGING_DIR_TARGET}"
-
-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/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-jade/recipes-ampere/packagegroups/packagegroup-ampere-apps.bb
new file mode 100644
index 0000000000..9a7032cc19
--- /dev/null
+++ b/meta-ampere/meta-jade/recipes-ampere/packagegroups/packagegroup-ampere-apps.bb
@@ -0,0 +1,39 @@
+SUMMARY = "OpenBMC for Ampere - Applications"
+PR = "r1"
+
+inherit packagegroup
+inherit obmc-phosphor-utils
+
+PROVIDES = "${PACKAGES}"
+PACKAGES = " \
+        ${PN}-chassis \
+        ${PN}-flash \
+        ${PN}-system \
+        "
+
+PROVIDES += "virtual/obmc-chassis-mgmt"
+PROVIDES += "virtual/obmc-flash-mgmt"
+PROVIDES += "virtual/obmc-system-mgmt"
+
+RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt"
+RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt"
+RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt"
+
+SUMMARY:${PN}-chassis = "Ampere Chassis"
+RDEPENDS:${PN}-chassis = " \
+        obmc-op-control-power \
+        ampere-hostctrl \
+        phosphor-hostlogger \
+        phosphor-sel-logger \
+        phosphor-logging \
+        "
+
+SUMMARY:${PN}-system = "Ampere System"
+RDEPENDS:${PN}-system = " \
+        smbios-mdr \
+        "
+
+SUMMARY:${PN}-flash = "Ampere Flash"
+RDEPENDS:${PN}-flash = " \
+        phosphor-software-manager \
+        "
diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils.bbappend b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils.bbappend
new file mode 100644
index 0000000000..d3f4f1a021
--- /dev/null
+++ b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils.bbappend
@@ -0,0 +1,18 @@
+FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"
+
+SRC_URI:append = " \
+                  file://gpio-defs.sh \
+                  file://gpio-lib.sh \
+                  file://ampere_power_util.sh \
+                  file://ampere_firmware_upgrade.sh \
+                  file://ampere_flash_bios.sh \
+                 "
+
+do_install:append() {
+    install -d ${D}/usr/sbin
+    install -m 0755 ${WORKDIR}/gpio-lib.sh ${D}/${sbindir}/
+    install -m 0755 ${WORKDIR}/gpio-defs.sh ${D}/${sbindir}/
+    install -m 0755 ${WORKDIR}/ampere_power_util.sh ${D}/${sbindir}/
+    install -m 0755 ${WORKDIR}/ampere_firmware_upgrade.sh ${D}/${sbindir}/
+    install -m 0755 ${WORKDIR}/ampere_flash_bios.sh ${D}/${sbindir}/
+}
diff --git a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_firmware_upgrade.sh b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/ampere_firmware_upgrade.sh
index 130682d12a..130682d12a 100755
--- a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_firmware_upgrade.sh
+++ b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/ampere_firmware_upgrade.sh
diff --git a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/ampere_flash_bios.sh
index b13e4b50a6..b13e4b50a6 100755
--- a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh
+++ b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/ampere_flash_bios.sh
diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_power_util.sh b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/ampere_power_util.sh
index d9ca2ed08c..d9ca2ed08c 100644
--- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_power_util.sh
+++ b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/ampere_power_util.sh
diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-defs.sh b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/gpio-defs.sh
index fc0edd6fc9..fc0edd6fc9 100644
--- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-defs.sh
+++ b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/gpio-defs.sh
diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-lib.sh b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/gpio-lib.sh
index c8721fe976..c8721fe976 100644
--- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-lib.sh
+++ b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/gpio-lib.sh
diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils.bb b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils.bb
deleted file mode 100644
index 21bdb4bf0f..0000000000
--- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Ampere Platform Environment Definitions"
-DESCRIPTION = "Ampere Platform Environment Definitions"
-PR = "r1"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-SRC_URI = " \
-          file://gpio-defs.sh \
-          file://gpio-lib.sh \
-          file://ampere_power_util.sh \
-          file://ampere_add_redfishevent.sh \
-          "
-
-RDEPENDS:${PN} = "bash"
-
-do_install() {
-    install -d ${D}/usr/sbin
-    install -m 0755 ${WORKDIR}/gpio-lib.sh ${D}/${sbindir}/
-    install -m 0755 ${WORKDIR}/gpio-defs.sh ${D}/${sbindir}/
-    install -m 0755 ${WORKDIR}/ampere_power_util.sh ${D}/${sbindir}/
-    install -m 0755 ${WORKDIR}/ampere_add_redfishevent.sh ${D}/${sbindir}/
-}
diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_add_redfishevent.sh b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_add_redfishevent.sh
deleted file mode 100644
index 1170c6a7ca..0000000000
--- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_add_redfishevent.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-registry=$1
-msgarg=$2
-
-if [ -z "$registry" ]; then
-	echo "Usage:"
-	echo "     $0 <redfish registry> <argument>"
-	exit
-fi
-
-# Check if logger-systemd exist. Do nothing if not exists
-if ! command -v logger-systemd;
-then
-	echo "logger-systemd does not exist. Skip log events for $registry $msgarg"
-	exit
-fi
-
-# Log events
-logger-systemd --journald << EOF
-MESSAGE=
-PRIORITY=
-SEVERITY=
-REDFISH_MESSAGE_ID=$registry
-REDFISH_MESSAGE_ARGS=$msgarg
-EOF
diff --git a/meta-ampere/meta-jade/recipes-phosphor/settings/phosphor-settings-manager/mtjade_settings.override.yml b/meta-ampere/meta-jade/recipes-phosphor/settings/phosphor-settings-manager/mtjade_settings.override.yml
deleted file mode 100644
index 83a1623d6c..0000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/settings/phosphor-settings-manager/mtjade_settings.override.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-/xyz/openbmc_project/ipmi/sol/eth0:
-    - Interface: xyz.openbmc_project.Ipmi.SOL
-      Properties:
-          Enable:
-              Default: 'true'
-          Privilege:
-              Default: 4
-          Progress:
-              Default: 0
-          RetryCount:
-              Default: 7
-          RetryIntervalMS:
-              Default: 100
-          Threshold:
-              Default: 1
-
-/xyz/openbmc_project/ipmi/sol/eth1:
-    - Interface: xyz.openbmc_project.Ipmi.SOL
-      Properties:
-          Enable:
-              Default: 'true'
-          Privilege:
-              Default: 4
-          Progress:
-              Default: 0
-          RetryCount:
-              Default: 7
-          RetryIntervalMS:
-              Default: 100
-          Threshold:
-              Default: 1
-
-/xyz/openbmc_project/control/host0/power_restore_policy:
-    - Interface: xyz.openbmc_project.Control.Power.RestorePolicy
-      Properties:
-          PowerRestorePolicy:
-              Default: RestorePolicy::Policy::AlwaysOn
diff --git a/meta-ampere/meta-jade/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
deleted file mode 100644
index d64eaec4e6..0000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI:append:mtjade = " file://mtjade_settings.override.yml"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
deleted file mode 100644
index 51081539ed..0000000000
--- a/meta-ampere/meta-jade/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:"
-
-#
-# Ampere Mt. Jade power control involves different action during
-# the course of action which does not involve rebooting the Host.
-# Thus disable the use of Host Power-On watchdog.
-#
-WATCHDOG_FMT = ""
-ENABLE_WATCHDOG_FMT = ""