diff options
| author | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2023-11-17 04:54:01 +0300 |
|---|---|---|
| committer | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2023-12-22 09:58:22 +0300 |
| commit | 82a926bb1160cd6ee5afd9565bf4436e55b574a3 (patch) | |
| tree | 16adf6378611abb9fb6cc0369590d212c48df383 /meta-ampere | |
| parent | 225f1523ddddad280de98013eaa67ea6c8da6dc0 (diff) | |
| download | openbmc-82a926bb1160cd6ee5afd9565bf4436e55b574a3.tar.xz | |
meta-ampere: mtjade: leds: change to json configuration
Change LED configuration format to json to adapt new default setting in
phosphor-led-manager application.
Tested:
1. Check if all LED Groups are created, the same as using yaml file
root@mtmitchell-dcscm:~# busctl tree xyz.openbmc_project.LED.GroupManager
`- /xyz
`- /xyz/openbmc_project
`- /xyz/openbmc_project/led
`- /xyz/openbmc_project/led/groups
|- /xyz/openbmc_project/led/groups/bmc_booted
|- /xyz/openbmc_project/led/groups/power_on
|- /xyz/openbmc_project/led/groups/enclosure_identify
|- /xyz/openbmc_project/led/groups/enclosure_identify_blink
`- /xyz/openbmc_project/led/groups/systemFault
2. Check if no error message in journal log
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: I7de6bfe333bad04f045c38bb9ff7aeb64eaed8bd
Diffstat (limited to 'meta-ampere')
5 files changed, 43 insertions, 52 deletions
diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index 4003815896..6de7844591 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -35,4 +35,3 @@ PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" -PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "mtjade-led-manager-config-native" diff --git a/meta-ampere/meta-jade/recipes-phosphor/leds/mtjade-led-manager-config-native.bb b/meta-ampere/meta-jade/recipes-phosphor/leds/mtjade-led-manager-config-native.bb deleted file mode 100644 index 694ca237a1..0000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/leds/mtjade-led-manager-config-native.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Phosphor LED Group Management for Mt. Jade" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit native - -PROVIDES += "virtual/phosphor-led-manager-config-native" - -SRC_URI += "file://led.yaml" -S = "${WORKDIR}" - -# Overwrite the example led layout yaml file prior -# to building the phosphor-led-manager package -do_install() { - SRC=${S} - DEST=${D}${datadir}/phosphor-led-manager - install -D ${SRC}/led.yaml ${DEST}/led.yaml -} diff --git a/meta-ampere/meta-jade/recipes-phosphor/leds/mtjade-led-manager-config/led.yaml b/meta-ampere/meta-jade/recipes-phosphor/leds/mtjade-led-manager-config/led.yaml deleted file mode 100644 index 3e321ed5c6..0000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/leds/mtjade-led-manager-config/led.yaml +++ /dev/null @@ -1,32 +0,0 @@ -bmc_booted: - power: - Action: 'Blink' - DutyOn: 50 - Period: 1000 - Priority: 'On' - -power_on: - power: - Action: 'On' - DutyOn: 50 - Period: 0 - Priority: 'On' - -systemFault: - fault: - Action: 'On' - DutyOn: 50 - Period: 0 - Priority: 'Blink' - -enclosure_identify: - identify: - Action: 'On' - DutyOn: 50 - Period: 1000 - -enclosure_identify_blink: - identify: - Action: 'Blink' - DutyOn: 50 - Period: 1000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-ampere/meta-jade/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json new file mode 100644 index 0000000000..0bc0adceea --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json @@ -0,0 +1,36 @@ +{ + "leds": [ + { + "group": "bmc_booted", + "members": [ + ] + }, + { + "group": "power_on", + "members": [ + ] + }, + { + "group": "enclosure_identify", + "members": [ + { + "Name": "identify", + "Action": "On", + "DutyOn": 50, + "Period": 1000 + } + ] + }, + { + "group": "enclosure_identify_blink", + "members": [ + { + "Name": "identify", + "Action": "Blink", + "DutyOn": 50, + "Period": 1000 + } + ] + } + ] +} diff --git a/meta-ampere/meta-jade/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/leds/phosphor-led-manager_%.bbappend new file mode 100644 index 0000000000..7e8821f157 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/leds/phosphor-led-manager_%.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += " file://led-group-config.json" + +do_install:append() { + install -m 0644 ${WORKDIR}/led-group-config.json ${D}${datadir}/phosphor-led-manager/ +} |