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

23 files changed, 23 insertions, 38 deletions

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-jade/recipes-ampere/platform/mtjade-utils.bb b/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils.bb
index 21bdb4bf0f..5d308dc69e 100644
--- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils.bb
+++ b/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils.bb
@@ -5,18 +5,12 @@ 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 \
+           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-common/recipes-ampere/platform/ampere-utils/ampere_add_redfishevent.sh
index 1170c6a7ca..1170c6a7ca 100644
--- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_add_redfishevent.sh
+++ b/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils/ampere_add_redfishevent.sh
diff --git a/meta-ampere/meta-jade/recipes-phosphor/settings/phosphor-settings-manager/mtjade_settings.override.yml b/meta-ampere/meta-common/recipes-phosphor/settings/phosphor-settings-manager/ampere_settings.override.yml
index 83a1623d6c..83a1623d6c 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/settings/phosphor-settings-manager/mtjade_settings.override.yml
+++ b/meta-ampere/meta-common/recipes-phosphor/settings/phosphor-settings-manager/ampere_settings.override.yml
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-jade/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
index 51081539ed..7698091fc8 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
+++ b/meta-ampere/meta-common/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"
 
 #
 # Ampere Mt. Jade power control involves different action during
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-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-jade/recipes-ampere/packagegroups/packagegroup-ampere-apps.bb
index 9f14619059..9a7032cc19 100644
--- a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb
+++ b/meta-ampere/meta-jade/recipes-ampere/packagegroups/packagegroup-ampere-apps.bb
@@ -35,6 +35,5 @@ RDEPENDS:${PN}-system = " \
 
 SUMMARY:${PN}-flash = "Ampere Flash"
 RDEPENDS:${PN}-flash = " \
-        ampere-flash-utils \
         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-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"