From 9b906962a8fadef214fffc5c87dd1913578abe26 Mon Sep 17 00:00:00 2001
From: XP Chen <xiao-peng.chen@fii-na.com>
Date: Thu, 6 May 2021 15:23:19 -0500
Subject: meta-fii/meta-kudo: Modify kudo system init

1. Modify kudo-boot.bb with latest sbin
2. Update init_once.sh with modified GPIO pins
3. Fix install for kudo-lib.sh for kudo-fw.bb

Signed-off-by: XP Chen <xiao-peng.chen@fii-na.com>
Change-Id: Id91d1325c70721bdc4e9fc7c541d43df33f05806
Signed-off-by: Mohaimen Alsamarai <mohaimen.alsamarai@fii-na.com>
---
 meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb         | 6 ++++--
 meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb      | 7 +++----
 .../recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service | 4 ++--
 .../meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'meta-fii')

diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb
index 3f5a30ec6c..03ce088fc8 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb
@@ -14,14 +14,15 @@ RDEPENDS_${PN} += "libsystemd"
 RDEPENDS_${PN} += "bash"
 
 
-SRC_URI_append_kudo = " \
+SRC_URI = " \
     file://kudo-fw.sh \
     file://kudo-fw-ver.service \
     file://kudo-fw-ver.sh \
+    file://kudo-lib.sh \
     "
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN}_append_kudo = " \
+SYSTEMD_SERVICE_${PN} = " \
     kudo-fw-ver.service \
     "
 
@@ -29,6 +30,7 @@ do_install () {
     install -d ${D}/${sbindir}
     install -m 0755 ${WORKDIR}/kudo-fw.sh ${D}/${sbindir}/kudo-fw.sh
     install -m 0755 ${WORKDIR}/kudo-fw-ver.sh ${D}/${sbindir}/kudo-fw-ver.sh
+    install -m 0755 ${WORKDIR}/kudo-lib.sh ${D}/${sbindir}/kudo-lib.sh
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/kudo-fw-ver.service ${D}${systemd_system_unitdir}
 }
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb
index ebb32074dc..87e4f747b1 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb
@@ -12,7 +12,7 @@ DEPENDS += "systemd"
 RDEPENDS_${PN} += "libsystemd"
 RDEPENDS_${PN} += "bash"
 
-SRC_URI += " \
+SRC_URI = " \
     file://init_once.sh \
     file://host-powerctrl.service \
     "
@@ -23,9 +23,8 @@ SYSTEMD_SERVICE_${PN} = " \
     "
 
 do_install () {
-    install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/init_once.sh ${D}${bindir}/
-
+    install -d ${D}${sbindir}
+    install -m 0755 ${WORKDIR}/init_once.sh ${D}${sbindir}/
     install -d ${D}${systemd_unitdir}/system/
     install -m 0644 ${WORKDIR}/host-powerctrl.service ${D}${systemd_unitdir}/system
 }
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service
index 2a8d73930e..14c14d480b 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service
@@ -1,11 +1,11 @@
 [Unit]
-Description = Ampere Host Power Control Sequence
+Description = Host Power Control Sequence
 
 [Service]
 Restart=no
 RemainAfterExit=true
 Type=oneshot
-ExecStart=/usr/bin/init_once.sh
+ExecStart=/usr/sbin/init_once.sh
 StandardOutput=syslog
 
 [Install]
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh
index 1e928e5098..b589379fb8 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh
@@ -13,8 +13,8 @@ set_gpio_ctrl 85 out 1
 set_gpio_ctrl 86 out 1
 
 # LED control
-# LED_BMC_LIVE #0
-set_gpio_ctrl 0 out 1
+# LED_BMC_LIVE #7
+set_gpio_ctrl 7 out 1
 
 # SPI control
 # Send command to CPLD to switch the bios spi interface to host
-- 
cgit v1.2.3