diff options
| author | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2023-11-16 09:31:56 +0300 |
|---|---|---|
| committer | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2023-12-22 09:58:12 +0300 |
| commit | 225f1523ddddad280de98013eaa67ea6c8da6dc0 (patch) | |
| tree | ef3300381b366daab8c6985e9bd257810e61cf2d /meta-ampere | |
| parent | 46dfdf0c8225e490dcea6722df442fd296e3fc78 (diff) | |
| download | openbmc-225f1523ddddad280de98013eaa67ea6c8da6dc0.tar.xz | |
meta-ampere: mtmitchell: leds: change to json configuration
phosphor-led-manager changed to use json configuration by default.
However, Mt.Mitchell still uses yaml configuration which consequently
fail to parse for platform LED configuration.
This commit changes configuration from yaml to json to adapt upstream
codes.
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: Ibdc2a566d89d8d661f299aff84539e471061090a
Diffstat (limited to 'meta-ampere')
5 files changed, 55 insertions, 50 deletions
diff --git a/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf b/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf index db5ac7bc60..7bf86d0fdd 100644 --- a/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf +++ b/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf @@ -33,6 +33,5 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif" -PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "ampere-led-manager-config-native" OVERRIDES .= ":ampere" diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/leds/ampere-led-manager-config-native.bb b/meta-ampere/meta-mitchell/recipes-phosphor/leds/ampere-led-manager-config-native.bb deleted file mode 100644 index 3b15b53a59..0000000000 --- a/meta-ampere/meta-mitchell/recipes-phosphor/leds/ampere-led-manager-config-native.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Phosphor LED Group Management for Mt. Mitchell" -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" - -# Overwrite the example led layout yaml file prior -# to building the phosphor-led-manager package -do_install() { - DEST=${D}${datadir}/phosphor-led-manager - install -D ${WORKDIR}/led.yaml ${DEST}/led.yaml -} diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/leds/ampere-led-manager-config/led.yaml b/meta-ampere/meta-mitchell/recipes-phosphor/leds/ampere-led-manager-config/led.yaml deleted file mode 100644 index 3e321ed5c6..0000000000 --- a/meta-ampere/meta-mitchell/recipes-phosphor/leds/ampere-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-mitchell/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-ampere/meta-mitchell/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json new file mode 100644 index 0000000000..84b78bf42c --- /dev/null +++ b/meta-ampere/meta-mitchell/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json @@ -0,0 +1,48 @@ +{ + "leds": [ + { + "group": "bmc_booted", + "members": [ + ] + }, + { + "group": "power_on", + "members": [ + ] + }, + { + "group": "systemFault", + "members": [ + { + "Name": "fault", + "Action": "On", + "DutyOn": 50, + "Period": 0, + "Priority": "Blink" + } + ] + }, + { + "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-mitchell/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ampere/meta-mitchell/recipes-phosphor/leds/phosphor-led-manager_%.bbappend new file mode 100644 index 0000000000..7e8821f157 --- /dev/null +++ b/meta-ampere/meta-mitchell/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/ +} |