diff options
author | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2021-09-23 11:25:32 +0300 |
---|---|---|
committer | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2021-09-25 04:09:27 +0300 |
commit | 208c2ae8c42071a5a0cbbe28972503381693e84c (patch) | |
tree | 99a48a383d1cdebe5d2126b93c06fa7bc928e041 | |
parent | ec10f537bae99a4dc042e10b7667facdad11cc31 (diff) | |
download | openbmc-208c2ae8c42071a5a0cbbe28972503381693e84c.tar.xz |
meta-ampere: mtjade: clean up unused codes
There are some redundant codes inside meta-mtjade:
- ampere-reset-host-check@.service: no longer be used.
- redundant :mtjade in phosphor-software-manager_%.bbappend
- Incorrect GPIO function call in ampere_platform_init.sh
This commit fixes the above issues.
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: Iadde88ba6472815556a2c0839c1e3e127c2a04d4
4 files changed, 6 insertions, 33 deletions
diff --git a/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index 7e855bcf5..853e5464a 100644 --- a/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -6,13 +6,13 @@ SRC_URI += " \ PACKAGECONFIG[flash_bios] = "-Dhost-bios-upgrade=enabled, -Dhost-bios-upgrade=disabled" -PACKAGECONFIG:append:mtjade = " flash_bios" +PACKAGECONFIG:append = " flash_bios" SYSTEMD_SERVICE:${PN}:updater += "${@bb.utils.contains('PACKAGECONFIG', 'flash_bios', 'obmc-flash-host-bios@.service', '', d)}" RDEPENDS:${PN} += "bash" -do_install:append:mtjade() { +do_install:append() { install -d ${D}/usr/sbin install -m 0755 ${WORKDIR}/firmware_update.sh ${D}/usr/sbin/firmware_update.sh } diff --git a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager/ampere-reset-host-check@.service b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager/ampere-reset-host-check@.service deleted file mode 100644 index 83f6581be..000000000 --- a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager/ampere-reset-host-check@.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Check Host%i status on BMC reset -Wants=phosphor-ipmi-host.service -After=phosphor-ipmi-host.service -Wants=obmc-host-reset-running@%i.target -Before=obmc-host-reset-running@%i.target -Wants=op-reset-chassis-on@%i.service -After=op-reset-chassis-on@%i.service -Conflicts=obmc-host-stop@%i.target -ConditionPathExists=/run/openbmc/chassis@%i-on - -[Service] -RemainAfterExit=yes -Type=oneshot -ExecStart=/usr/sbin/ampere_host_check.sh 1 0 - -[Install] -WantedBy=obmc-host-reset@%i.target
\ No newline at end of file diff --git a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend index b25ba5d94..03df6a30e 100644 --- a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -4,12 +4,3 @@ DEPS_CFG = "resetreason.conf" DEPS_TGT = "phosphor-discover-system-state@.service" SYSTEMD_OVERRIDE:${PN}-discover:append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" -FILES:${PN} += "${systemd_system_unitdir}/*" - -SRC_URI += " \ - file://ampere-reset-host-check@.service \ - " - -do_install:append() { - install -m 0644 ${WORKDIR}/ampere-reset-host-check@.service ${D}${systemd_unitdir}/system/phosphor-reset-host-check@.service -} diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-platform-init/ampere_platform_init.sh b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-platform-init/ampere_platform_init.sh index a15be6046..a2578fa2f 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-platform-init/ampere_platform_init.sh +++ b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-platform-init/ampere_platform_init.sh @@ -21,10 +21,10 @@ gpio_configure_input 144 gpio_configure_input 145 # GPIOY3 BMC_VGA_SEL -gpio_direction_output 195 1 +gpio_configure_output 195 1 # GPIO_BMC_READY -gpio_direction_output 229 1 +gpio_configure_output 229 1 # ======================================================= # Below GPIOs are controlled by other services so just @@ -32,10 +32,10 @@ gpio_direction_output 229 1 cmdline=`cat /proc/cmdline` if [[ $cmdline == *resetreason=power* ]]; then # BMC_GPIOR2_EXT_HIGHTEMP_L - gpio_direction_output 138 1 + gpio_configure_output 138 1 # GPIOS5 GPIO_BMC_VR_PMBUS_SEL_L - gpio_direction_output 149 1 + gpio_configure_output 149 1 # GPIOH7 GPIO_BMC_I2C6_RESET_L gpio_configure_output 63 1 |