From 68bbb71d364a9495fe77c3d80c139a2f17f619fe Mon Sep 17 00:00:00 2001 From: Tim Lee Date: Tue, 14 Nov 2023 16:04:43 +0800 Subject: meta-nuvoton: adopt meta-evb-npcm845 from meta-evb Adopt meta-evb-npcm845 from meta-evb layer that make more clearer about the scope of evb layer's description. Tested: /openbmc$ . setup evb-npcm845 Common targets are: obmc-phosphor-image Signed-off-by: Tim Lee Change-Id: Ib922057b5bce54b864f1c0ced1b132ea1e71fd91 --- .../conf/templates/default/bblayers.conf.sample | 1 + .../host/phosphor-host-postd_%.bbappend | 1 - .../leds/evb-npcm845-led-manager-config-native.bb | 17 ----------------- .../leds/evb-npcm845-led-manager-config/led.yaml | 17 ----------------- .../recipes-phosphor/sensors/dbus-sensors_%.bbappend | 5 ----- .../host/phosphor-host-postd_%.bbappend | 1 + .../leds/evb-npcm845-led-manager-config-native.bb | 17 +++++++++++++++++ .../leds/evb-npcm845-led-manager-config/led.yaml | 17 +++++++++++++++++ .../recipes-phosphor/sensors/dbus-sensors_%.bbappend | 5 +++++ 9 files changed, 41 insertions(+), 40 deletions(-) delete mode 100644 meta-evb/meta-evb-nuvoton/meta-evb-npcm845/recipes-phosphor/host/phosphor-host-postd_%.bbappend delete mode 100644 meta-evb/meta-evb-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config-native.bb delete mode 100644 meta-evb/meta-evb-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config/led.yaml delete mode 100644 meta-evb/meta-evb-nuvoton/meta-evb-npcm845/recipes-phosphor/sensors/dbus-sensors_%.bbappend create mode 100644 meta-nuvoton/meta-evb-npcm845/recipes-phosphor/host/phosphor-host-postd_%.bbappend create mode 100644 meta-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config-native.bb create mode 100644 meta-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config/led.yaml create mode 100644 meta-nuvoton/meta-evb-npcm845/recipes-phosphor/sensors/dbus-sensors_%.bbappend diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/templates/default/bblayers.conf.sample b/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/templates/default/bblayers.conf.sample index 71d9e569d8..1d4d4a570a 100644 --- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/templates/default/bblayers.conf.sample +++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/templates/default/bblayers.conf.sample @@ -14,6 +14,7 @@ BBLAYERS ?= " \ ##OEROOT##/meta-arm/meta-arm \ ##OEROOT##/meta-arm/meta-arm-toolchain \ ##OEROOT##/meta-nuvoton \ + ##OEROOT##/meta-nuvoton/meta-evb-npcm845 \ ##OEROOT##/meta-evb \ ##OEROOT##/meta-evb/meta-evb-nuvoton \ ##OEROOT##/meta-evb/meta-evb-nuvoton/meta-evb-npcm845 \ diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/recipes-phosphor/host/phosphor-host-postd_%.bbappend b/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/recipes-phosphor/host/phosphor-host-postd_%.bbappend deleted file mode 100644 index 62841f0990..0000000000 --- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/recipes-phosphor/host/phosphor-host-postd_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -SNOOP_DEVICE = "npcm7xx-lpc-bpc0" diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config-native.bb b/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config-native.bb deleted file mode 100644 index 926eab8beb..0000000000 --- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config-native.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Phosphor LED Group Management Configuration" -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}" - -do_install() { - SRC=${S} - DEST=${D}${datadir}/phosphor-led-manager - install -D ${SRC}/led.yaml ${DEST}/led.yaml -} diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config/led.yaml b/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config/led.yaml deleted file mode 100644 index 9ae22d348c..0000000000 --- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config/led.yaml +++ /dev/null @@ -1,17 +0,0 @@ -BmcBooted: - heartbeat: - Action: 'Blink' - DutyOn: 50 - Period: 1000 -PowerOn: - identify: - Action: 'On' -EnclosureFault: - identify: - Action: 'On' -EnclosureIdentify: - identify: - Action: 'Blink' - DutyOn: 50 - Period: 1000 - diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/recipes-phosphor/sensors/dbus-sensors_%.bbappend deleted file mode 100644 index b20a5c53a1..0000000000 --- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/recipes-phosphor/sensors/dbus-sensors_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -PACKAGECONFIG:evb-npcm845 = " \ - hwmontempsensor \ - fansensor \ - adcsensor \ - " diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/host/phosphor-host-postd_%.bbappend b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/host/phosphor-host-postd_%.bbappend new file mode 100644 index 0000000000..62841f0990 --- /dev/null +++ b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/host/phosphor-host-postd_%.bbappend @@ -0,0 +1 @@ +SNOOP_DEVICE = "npcm7xx-lpc-bpc0" diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config-native.bb b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config-native.bb new file mode 100644 index 0000000000..926eab8beb --- /dev/null +++ b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config-native.bb @@ -0,0 +1,17 @@ +SUMMARY = "Phosphor LED Group Management Configuration" +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}" + +do_install() { + SRC=${S} + DEST=${D}${datadir}/phosphor-led-manager + install -D ${SRC}/led.yaml ${DEST}/led.yaml +} diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config/led.yaml b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config/led.yaml new file mode 100644 index 0000000000..9ae22d348c --- /dev/null +++ b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config/led.yaml @@ -0,0 +1,17 @@ +BmcBooted: + heartbeat: + Action: 'Blink' + DutyOn: 50 + Period: 1000 +PowerOn: + identify: + Action: 'On' +EnclosureFault: + identify: + Action: 'On' +EnclosureIdentify: + identify: + Action: 'Blink' + DutyOn: 50 + Period: 1000 + diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/sensors/dbus-sensors_%.bbappend new file mode 100644 index 0000000000..b20a5c53a1 --- /dev/null +++ b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -0,0 +1,5 @@ +PACKAGECONFIG:evb-npcm845 = " \ + hwmontempsensor \ + fansensor \ + adcsensor \ + " -- cgit v1.2.3