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, 90 insertions, 40 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
deleted file mode 100644
index 9f14619059..0000000000
--- a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-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 = " \
-        ampere-flash-utils \
-        phosphor-software-manager \
-        "
diff --git a/meta-ampere/meta-common/recipes-phosphor/host/ampere-hostctrl.bb b/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl.bb
index b0498f8ebb..b0498f8ebb 100644
--- a/meta-ampere/meta-common/recipes-phosphor/host/ampere-hostctrl.bb
+++ b/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl.bb
diff --git a/meta-ampere/meta-common/recipes-phosphor/host/ampere-hostctrl/ampere-host-force-reset@.service b/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl/ampere-host-force-reset@.service
index 6e03c8b816..6e03c8b816 100644
--- a/meta-ampere/meta-common/recipes-phosphor/host/ampere-hostctrl/ampere-host-force-reset@.service
+++ b/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl/ampere-host-force-reset@.service
diff --git a/meta-ampere/meta-common/recipes-phosphor/host/ampere-hostctrl/ampere-host-on-host-check@.service b/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl/ampere-host-on-host-check@.service
index e3c87397dc..e3c87397dc 100644
--- a/meta-ampere/meta-common/recipes-phosphor/host/ampere-hostctrl/ampere-host-on-host-check@.service
+++ b/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl/ampere-host-on-host-check@.service
diff --git a/meta-ampere/meta-common/recipes-phosphor/host/ampere-hostctrl/ampere_host_check.sh b/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl/ampere_host_check.sh
index 9759b880cc..9759b880cc 100644
--- a/meta-ampere/meta-common/recipes-phosphor/host/ampere-hostctrl/ampere_host_check.sh
+++ b/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl/ampere_host_check.sh
diff --git a/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet.bb b/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet.bb
index d1dff35ec5..d1dff35ec5 100644
--- a/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet.bb
+++ b/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet.bb
diff --git a/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/00-bmc-usb0.network b/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/00-bmc-usb0.network
index 640fe04b9c..640fe04b9c 100644
--- a/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/00-bmc-usb0.network
+++ b/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/00-bmc-usb0.network
diff --git a/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/ampere-usbnet.service b/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere-usbnet.service
index 3499543258..3499543258 100644
--- a/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/ampere-usbnet.service
+++ b/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere-usbnet.service
diff --git a/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/ampere_usbnet.sh b/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere_usbnet.sh
index fd2dce610e..fd2dce610e 100644
--- a/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/ampere_usbnet.sh
+++ b/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere_usbnet.sh
diff --git a/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils.bb b/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils.bb
new file mode 100644
index 0000000000..5d308dc69e
--- /dev/null
+++ b/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils.bb
@@ -0,0 +1,16 @@
+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://ampere_add_redfishevent.sh \
+          "
+
+RDEPENDS:${PN} = "bash"
+
+do_install() {
+    install -d ${D}/usr/sbin
+    install -m 0755 ${WORKDIR}/ampere_add_redfishevent.sh ${D}/${sbindir}/
+}
diff --git a/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils/ampere_add_redfishevent.sh b/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils/ampere_add_redfishevent.sh
new file mode 100644
index 0000000000..1170c6a7ca
--- /dev/null
+++ b/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils/ampere_add_redfishevent.sh
@@ -0,0 +1,26 @@
+#!/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-common/recipes-phosphor/settings/phosphor-settings-manager/ampere_settings.override.yml b/meta-ampere/meta-common/recipes-phosphor/settings/phosphor-settings-manager/ampere_settings.override.yml
new file mode 100644
index 0000000000..83a1623d6c
--- /dev/null
+++ b/meta-ampere/meta-common/recipes-phosphor/settings/phosphor-settings-manager/ampere_settings.override.yml
@@ -0,0 +1,37 @@
+/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-common/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
new file mode 100644
index 0000000000..cb97369c09
--- /dev/null
+++ b/meta-ampere/meta-common/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append = " file://ampere_settings.override.yml"
diff --git a/meta-ampere/meta-common/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
new file mode 100644
index 0000000000..7698091fc8
--- /dev/null
+++ b/meta-ampere/meta-common/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
@@ -0,0 +1,9 @@
+FILESEXTRAPATHS:append := "${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 = ""