From c5227a6de58f5f586376ef659d4454c4a0995c6c Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Tue, 20 Jul 2021 23:50:00 +0300 Subject: meta-nicole: native class is not inherited last Moved "inherit native" statements to the last position to remove QA Issues. The message is: WARNING: QA Issue: {RECIPENAME}: native/nativesdk class is not inherited last, this can result in unexpected behaviour. Classes inherited after native/nativesdk: {CLASSFILES} [native-last] Change-Id: Ib6d8f41c437ca62a8d4a9885ff670adb5ad69f8a Signed-off-by: Alexander Filippov --- .../recipes-phosphor/occ/nicole-occ-control-config-native.bb | 2 +- .../recipes-phosphor/vpd/nicole-openpower-fru-inventory-native.bb | 2 +- .../recipes-phosphor/vpd/nicole-openpower-fru-properties-native.bb | 2 +- .../recipes-phosphor/vpd/nicole-openpower-fru-vpd-layout-native.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-yadro') diff --git a/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb b/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb index 83deb434b..31cd0450e 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-occ-control +inherit native PROVIDES += "virtual/openpower-occ-control-config-native" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-inventory-native.bb b/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-inventory-native.bb index 0a5d73c6b..e65a7141e 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-inventory-native.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-inventory-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd +inherit native SRC_URI += "file://inventory" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-properties-native.bb b/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-properties-native.bb index 05be1df15..fc144c1aa 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-properties-native.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-properties-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd +inherit native SRC_URI += "file://properties.yaml" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-vpd-layout-native.bb b/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-vpd-layout-native.bb index 35c4de4de..cfa315957 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-vpd-layout-native.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-vpd-layout-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd +inherit native SRC_URI += "file://layout.yaml" -- cgit v1.2.3 From 5c17c5cc59b9c68dd1a0b03a0f7e9c5ac3756a9f Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Wed, 21 Jul 2021 00:13:43 +0300 Subject: meta-yadro: remove meta-vesnin VESNIN is OpenPOWERv8 based and obsolete. Last released build is based on OpenBMC v2.8 We don't plan to update it to the latest OpenBMC revisions. Change-Id: Ifb6223e5a454bcb320bd0c2f3461b804a9ad829c Signed-off-by: Alexander Filippov --- meta-yadro/meta-vesnin/README.md | 7 - meta-yadro/meta-vesnin/conf/bblayers.conf.sample | 33 - meta-yadro/meta-vesnin/conf/conf-notes.txt | 2 - meta-yadro/meta-vesnin/conf/layer.conf | 10 - meta-yadro/meta-vesnin/conf/local.conf.sample | 237 ------ meta-yadro/meta-vesnin/conf/machine/vesnin.conf | 21 - .../0002-vesnin-remap-aspeed-uart.patch | 41 - .../recipes-kernel/linux/linux-aspeed/vesnin.cfg | 10 - .../recipes-kernel/linux/linux-aspeed_%.bbappend | 5 - .../configuration/vesnin-yaml-config.bb | 23 - .../vesnin-yaml-config/vesnin-ipmi-fru.yaml | 863 --------------------- .../images/obmc-phosphor-image.bbappend | 1 - .../initfs/obmc-phosphor-initfs.bbappend | 5 - .../ipmi/phosphor-ipmi-fru_%.bbappend | 5 - .../ipmi/phosphor-ipmi-host_%.bbappend | 5 - .../leds/vesnin-led-manager-config-native.bb | 19 - .../leds/vesnin-led-manager-config/led.yaml | 43 - .../recipes-phosphor/mboxd/mboxd_%.bbappend | 1 - .../network/first-boot-set-mac_%.bbappend | 1 - .../recipes-phosphor/occ/files/occ_sensor.yaml | 12 - .../occ/openpower-occ-control_%.bbappend | 1 - .../vesnin-openpower-occ-control-config-native.bb | 18 - .../packagegroups/packagegroup-obmc-apps.bbappend | 1 - .../skeleton/obmc-libobmc-intf/gpio_defs.json | 131 ---- .../skeleton/obmc-libobmc-intf_%.bbappend | 1 - ...ace-ColdFire-FSI-with-plain-FSI-over-GPIO.patch | 358 --------- .../skeleton/obmc-op-control-host_%.bbappend | 2 - 27 files changed, 1856 deletions(-) delete mode 100644 meta-yadro/meta-vesnin/README.md delete mode 100644 meta-yadro/meta-vesnin/conf/bblayers.conf.sample delete mode 100644 meta-yadro/meta-vesnin/conf/conf-notes.txt delete mode 100644 meta-yadro/meta-vesnin/conf/layer.conf delete mode 100644 meta-yadro/meta-vesnin/conf/local.conf.sample delete mode 100644 meta-yadro/meta-vesnin/conf/machine/vesnin.conf delete mode 100644 meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/0002-vesnin-remap-aspeed-uart.patch delete mode 100644 meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/vesnin.cfg delete mode 100644 meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed_%.bbappend delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config/vesnin-ipmi-fru.yaml delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/images/obmc-phosphor-image.bbappend delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config-native.bb delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config/led.yaml delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/mboxd/mboxd_%.bbappend delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/network/first-boot-set-mac_%.bbappend delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/occ/files/occ_sensor.yaml delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/occ/openpower-occ-control_%.bbappend delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/occ/vesnin-openpower-occ-control-config-native.bb delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-op-control-host/0001-Replace-ColdFire-FSI-with-plain-FSI-over-GPIO.patch delete mode 100644 meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-op-control-host_%.bbappend (limited to 'meta-yadro') diff --git a/meta-yadro/meta-vesnin/README.md b/meta-yadro/meta-vesnin/README.md deleted file mode 100644 index aa0f56cf3..000000000 --- a/meta-yadro/meta-vesnin/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# VESNIN SERVER - -The world's first OpenPOWER enterprise class high performance server designed -for data intensive applications with outstanding footprint. Four-socket server -supporting up to 48 POWER8 cores and 8 TB memory in ultra dense 2U form factor. - -https://yadro.com/products/vesnin diff --git a/meta-yadro/meta-vesnin/conf/bblayers.conf.sample b/meta-yadro/meta-vesnin/conf/bblayers.conf.sample deleted file mode 100644 index 5571b9d76..000000000 --- a/meta-yadro/meta-vesnin/conf/bblayers.conf.sample +++ /dev/null @@ -1,33 +0,0 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "8" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" - -BBLAYERS ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-yadro \ - ##OEROOT##/meta-yadro/meta-vesnin \ - " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-yadro \ - ##OEROOT##/meta-yadro/meta-vesnin \ - " diff --git a/meta-yadro/meta-vesnin/conf/conf-notes.txt b/meta-yadro/meta-vesnin/conf/conf-notes.txt deleted file mode 100644 index 9b3c01a55..000000000 --- a/meta-yadro/meta-vesnin/conf/conf-notes.txt +++ /dev/null @@ -1,2 +0,0 @@ -Common targets are: - obmc-phosphor-image diff --git a/meta-yadro/meta-vesnin/conf/layer.conf b/meta-yadro/meta-vesnin/conf/layer.conf deleted file mode 100644 index 47ce75ec6..000000000 --- a/meta-yadro/meta-vesnin/conf/layer.conf +++ /dev/null @@ -1,10 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILE_COLLECTIONS += "vesnin-layer" -BBFILE_PATTERN_vesnin-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_vesnin-layer = "gatesgarth hardknott" diff --git a/meta-yadro/meta-vesnin/conf/local.conf.sample b/meta-yadro/meta-vesnin/conf/local.conf.sample deleted file mode 100644 index 6fe59e72b..000000000 --- a/meta-yadro/meta-vesnin/conf/local.conf.sample +++ /dev/null @@ -1,237 +0,0 @@ -# -# This file is your local configuration file and is where all local user settings -# are placed. The comments in this file give some guide to the options a new user -# to the system might want to change but pretty much any configuration option can -# be set in this file. More adventurous users can look at local.conf.extended -# which contains other examples of configuration which can be placed in this file -# but new users likely won't need any of them initially. -# -# Lines starting with the '#' character are commented out and in some cases the -# default values are provided as comments to show people example syntax. Enabling -# the option is a question of removing the # character and making any change to the -# variable as required. - -# -# Machine Selection -# -# You need to select a specific machine to target the build with. There are a selection -# of emulated machines available which can boot and run in the QEMU emulator: -# -#MACHINE ?= "qemuarm" -#MACHINE ?= "qemuarm64" -#MACHINE ?= "qemumips" -#MACHINE ?= "qemuppc" -#MACHINE ?= "qemux86" -#MACHINE ?= "qemux86-64" -# -# There are also the following hardware board target machines included for -# demonstration purposes: -# -#MACHINE ?= "beaglebone" -#MACHINE ?= "genericx86" -#MACHINE ?= "genericx86-64" -#MACHINE ?= "mpc8315e-rdb" -#MACHINE ?= "edgerouter" -# -# This sets the default machine to be qemux86 if no other machine is selected: -MACHINE ??= "vesnin" - -# -# Where to place downloads -# -# During a first build the system will download many different source code tarballs -# from various upstream projects. This can take a while, particularly if your network -# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you -# can preserve this directory to speed up this part of subsequent builds. This directory -# is safe to share between multiple builds on the same machine too. -# -# The default is a downloads directory under TOPDIR which is the build directory. -# -#DL_DIR ?= "${TOPDIR}/downloads" - -# -# Where to place shared-state files -# -# BitBake has the capability to accelerate builds based on previously built output. -# This is done using "shared state" files which can be thought of as cache objects -# and this option determines where those files are placed. -# -# You can wipe out TMPDIR leaving this directory intact and the build would regenerate -# from these files if no changes were made to the configuration. If changes were made -# to the configuration, only shared state files where the state was still valid would -# be used (done using checksums). -# -# The default is a sstate-cache directory under TOPDIR. -# -#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" - -# -# Where to place the build output -# -# This option specifies where the bulk of the building work should be done and -# where BitBake should place its temporary files and output. Keep in mind that -# this includes the extraction and compilation of many applications and the toolchain -# which can use Gigabytes of hard disk space. -# -# The default is a tmp directory under TOPDIR. -# -#TMPDIR = "${TOPDIR}/tmp" - -# -# Default policy config -# -# The distribution setting controls which policy settings are used as defaults. -# The default value is fine for general Yocto project use, at least initially. -# Ultimately when creating custom policy, people will likely end up subclassing -# these defaults. -# -DISTRO ?= "openbmc-openpower" -# As an example of a subclass there is a "bleeding" edge policy configuration -# where many versions are set to the absolute latest code from the upstream -# source control systems. This is just mentioned here as an example, its not -# useful to most new users. -# DISTRO ?= "poky-bleeding" - -# -# Package Management configuration -# -# This variable lists which packaging formats to enable. Multiple package backends -# can be enabled at once and the first item listed in the variable will be used -# to generate the root filesystems. -# Options are: -# - 'package_deb' for debian style deb files -# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) -# - 'package_rpm' for rpm style packages -# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" -# We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" - -# -# SDK/ADT target architecture -# -# This variable specifies the architecture to build SDK/ADT items for and means -# you can build the SDK packages for architectures other than the machine you are -# running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686 and x86_64 -#SDKMACHINE ?= "i686" - -SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*" - -# -# Extra image configuration defaults -# -# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated -# images. Some of these options are added to certain image types automatically. The -# variable can contain the following options: -# "dbg-pkgs" - add -dbg packages for all installed packages -# (adds symbol information for debugging/profiling) -# "dev-pkgs" - add -dev packages for all installed packages -# (useful if you want to develop against libs in the image) -# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages -# (useful if you want to run the package test suites) -# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) -# "tools-debug" - add debugging tools (gdb, strace) -# "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) -# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) -# "debug-tweaks" - make an image suitable for development -# e.g. ssh root access has a blank password -# There are other application targets that can be used here too, see -# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. -# We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES = "debug-tweaks" - -# -# Additional image features -# -# The following is a list of additional classes to use when building images which -# enable extra features. Some available options which can be included in this variable -# are: -# - 'buildstats' collect build statistics -# - 'image-prelink' in order to prelink the filesystem image -# - 'image-swab' to perform host system intrusion detection -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink -# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended -USER_CLASSES ?= "buildstats image-prelink" - -# -# Runtime testing of images -# -# The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. To -# enable this uncomment this line. See classes/testimage(-auto).bbclass for -# further details. -#TEST_IMAGE = "1" -# -# Interactive shell configuration -# -# Under certain circumstances the system may need input from you and to do this it -# can launch an interactive shell. It needs to do this since the build is -# multithreaded and needs to be able to handle the case where more than one parallel -# process may require the user's attention. The default is iterate over the available -# terminal types to find one that works. -# -# Examples of the occasions this may happen are when resolving patches which cannot -# be applied, to use the devshell or the kernel menuconfig -# -# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none -# Note: currently, Konsole support only works for KDE 3.x due to the way -# newer Konsole versions behave -#OE_TERMINAL = "auto" -# By default disable interactive patch resolution (tasks will just fail instead): -PATCHRESOLVE = "noop" - -# -# Disk Space Monitoring during the build -# -# Monitor the disk space during the build. If there is less that 1GB of space or less -# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort -# of the build. The reason for this is that running completely out of space can corrupt -# files and damages the build in ways which may not be easily recoverable. -# It's necessary to monitor /tmp, if there is no space left the build will fail -# with very exotic errors. -BB_DISKMON_DIRS = "\ - STOPTASKS,${TMPDIR},1G,100K \ - STOPTASKS,${DL_DIR},1G,100K \ - STOPTASKS,${SSTATE_DIR},1G,100K \ - STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" - -# -# Shared-state files from other locations -# -# As mentioned above, shared state files are prebuilt cache data objects which can -# used to accelerate build time. This variable can be used to configure the system -# to search other mirror locations for these objects before it builds the data itself. -# -# This can be a filesystem directory, or a remote url such as http or ftp. These -# would contain the sstate-cache results from previous builds (possibly from other -# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the -# cache locations to check for the shared objects. -# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH -# at the end as shown in the examples below. This will be substituted with the -# correct path within the directory structure. -#SSTATE_MIRRORS ?= "\ -#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ -#file://.* file:///some/local/dir/sstate/PATH" - - -# -# Qemu configuration -# -# By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. This assumes there is a -# libsdl library available on your build system. -PACKAGECONFIG_append_pn-qemu-native = " sdl" -PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl-native" - - -# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to -# track the version of this file when it was generated. This can safely be ignored if -# this doesn't mean anything to you. -CONF_VERSION = "1" diff --git a/meta-yadro/meta-vesnin/conf/machine/vesnin.conf b/meta-yadro/meta-vesnin/conf/machine/vesnin.conf deleted file mode 100644 index 6ba66faa4..000000000 --- a/meta-yadro/meta-vesnin/conf/machine/vesnin.conf +++ /dev/null @@ -1,21 +0,0 @@ -KMACHINE = "aspeed" -KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" - -require conf/machine/include/ast2400.inc -require conf/machine/include/obmc-bsp-common.inc -require conf/machine/include/openpower.inc -require conf/machine/include/p8.inc - -UBOOT_MACHINE_vesnin = "ast_g4_ncsi_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -FLASH_SIZE = "32768" - -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS4" - -PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "vesnin-led-manager-config-native" -PREFERRED_PROVIDER_virtual/openpower-fru-properties = "vesnin-openpower-fru-properties-native" -PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout = "vesnin-openpower-fru-vpd-layout-native" -PREFERRED_PROVIDER_virtual/openpower-fru-inventory = "vesnin-openpower-fru-inventory-native" -PREFERRED_PROVIDER_virtual/openpower-occ-control-config-native = "vesnin-openpower-occ-control-config-native" diff --git a/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/0002-vesnin-remap-aspeed-uart.patch b/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/0002-vesnin-remap-aspeed-uart.patch deleted file mode 100644 index a745a18a7..000000000 --- a/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/0002-vesnin-remap-aspeed-uart.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c10401d8c349610ea9cd29d28f87dd630c907aeb Mon Sep 17 00:00:00 2001 -From: Alexander Filippov -Date: Wed, 28 Mar 2018 17:46:28 +0300 -Subject: [PATCH] vesnin: remap aspeed-uart - -Remaps UART2 <-> UART3 - -Signed-off-by: Alexander Filippov ---- - drivers/soc/aspeed/aspeed-lpc-ctrl.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/drivers/soc/aspeed/aspeed-lpc-ctrl.c b/drivers/soc/aspeed/aspeed-lpc-ctrl.c -index 01ed21e8bfee..cbdca53a8805 100644 ---- a/drivers/soc/aspeed/aspeed-lpc-ctrl.c -+++ b/drivers/soc/aspeed/aspeed-lpc-ctrl.c -@@ -23,6 +23,7 @@ - - #define HICR7 0x8 - #define HICR8 0xc -+#define HICRA 0x1c - - struct aspeed_lpc_ctrl { - struct miscdevice miscdev; -@@ -271,6 +272,13 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev) - goto err; - } - -+ /* Switch UART2 to IO3 and UART3 to IO2 */ -+ rc = regmap_write(lpc_ctrl->regmap, HICRA, 0x00C80108); -+ if (rc) { -+ dev_err(dev, "Unable to switch UART 2<->3\n"); -+ goto err; -+ } -+ - return 0; - - err: --- -2.20.1 - diff --git a/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/vesnin.cfg b/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/vesnin.cfg deleted file mode 100644 index 59a232127..000000000 --- a/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/vesnin.cfg +++ /dev/null @@ -1,10 +0,0 @@ -CONFIG_EEPROM_AT24=y -CONFIG_SENSORS_LM75=y -CONFIG_SENSORS_W83795=y -CONFIG_SENSORS_PMBUS=y -CONFIG_RTC_DRV_DS1307_HWMON=y - -CONFIG_FSI=n -CONFIG_FSI_MASTER_HUB=n -CONFIG_FSI_MASTER_AST_CF=n -CONFIG_FSI_SCOM=n diff --git a/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed_%.bbappend deleted file mode 100644 index 5680c6938..000000000 --- a/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_vesnin = "\ - file://vesnin.cfg \ - file://0002-vesnin-remap-aspeed-uart.patch \ -" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb b/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb deleted file mode 100644 index 94000a0a7..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "YAML configuration for Vesnin" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit allarch - -SRC_URI = " \ - file://vesnin-ipmi-fru.yaml \ - " - -S = "${WORKDIR}" - -do_install() { - install -m 0644 -D vesnin-ipmi-fru.yaml \ - ${D}${datadir}/${BPN}/ipmi-fru-read.yaml -} - -FILES_${PN}-dev = " \ - ${datadir}/${BPN}/ipmi-fru-read.yaml \ - " - -ALLOW_EMPTY_${PN} = "1" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config/vesnin-ipmi-fru.yaml b/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config/vesnin-ipmi-fru.yaml deleted file mode 100644 index a1de5712e..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config/vesnin-ipmi-fru.yaml +++ /dev/null @@ -1,863 +0,0 @@ -0: - /system/chassis/bmc: - entityID: 6 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board -1: - /system/chassis/motherboard/cpu0: &CPU_DEFAULTS - entityID: 3 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Custom Field 2 - IPMIFruSection: Board - IPMIFruValueDelimiter: 58 - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board - Value: False -2: - /system/chassis/motherboard/cpu1: - <<: *CPU_DEFAULTS - entityInstance: 2 -3: - /system/chassis/motherboard/cpu2: - <<: *CPU_DEFAULTS - entityInstance: 3 -4: - /system/chassis/motherboard/cpu3: - <<: *CPU_DEFAULTS - entityInstance: 4 -5: - /system/chassis/motherboard: - entityID: 7 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - Model: - IPMIFruProperty: Part Number - IPMIFruSection: Chassis - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board - /system: - entityID: 25 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Chassis - Model: - IPMIFruProperty: Part Number - IPMIFruSection: Chassis - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board -6: - /system/chassis/motherboard/membuf1: &MEMBUF_DEFAULTS - entityID: 23 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board -7: - /system/chassis/motherboard/membuf0: - <<: *MEMBUF_DEFAULTS - entityInstance: 2 -8: - /system/chassis/motherboard/membuf5: - <<: *MEMBUF_DEFAULTS - entityInstance: 3 -9: - /system/chassis/motherboard/membuf4: - <<: *MEMBUF_DEFAULTS - entityInstance: 4 -10: - /system/chassis/motherboard/membuf9: - <<: *MEMBUF_DEFAULTS - entityInstance: 5 -11: - /system/chassis/motherboard/membuf8: - <<: *MEMBUF_DEFAULTS - entityInstance: 6 -12: - /system/chassis/motherboard/membuf13: - <<: *MEMBUF_DEFAULTS - entityInstance: 7 -13: - /system/chassis/motherboard/membuf12: - <<: *MEMBUF_DEFAULTS - entityInstance: 8 -14: - /system/chassis/motherboard/membuf17: - <<: *MEMBUF_DEFAULTS - entityInstance: 9 -15: - /system/chassis/motherboard/membuf16: - <<: *MEMBUF_DEFAULTS - entityInstance: 10 -16: - /system/chassis/motherboard/membuf21: - <<: *MEMBUF_DEFAULTS - entityInstance: 11 -17: - /system/chassis/motherboard/membuf20: - <<: *MEMBUF_DEFAULTS - entityInstance: 12 -18: - /system/chassis/motherboard/membuf25: - <<: *MEMBUF_DEFAULTS - entityInstance: 13 -19: - /system/chassis/motherboard/membuf24: - <<: *MEMBUF_DEFAULTS - entityInstance: 14 -20: - /system/chassis/motherboard/membuf29: - <<: *MEMBUF_DEFAULTS - entityInstance: 15 -21: - /system/chassis/motherboard/membuf28: - <<: *MEMBUF_DEFAULTS - entityInstance: 16 -22: - /system/chassis/motherboard/dimm8: &DIMM_DEFAULTS - entityID: 32 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -23: - /system/chassis/motherboard/dimm9: - <<: *DIMM_DEFAULTS - entityInstance: 2 -24: - /system/chassis/motherboard/dimm10: - <<: *DIMM_DEFAULTS - entityInstance: 3 -25: - /system/chassis/motherboard/dimm11: - <<: *DIMM_DEFAULTS - entityInstance: 4 -26: - /system/chassis/motherboard/dimm12: - <<: *DIMM_DEFAULTS - entityInstance: 5 -27: - /system/chassis/motherboard/dimm13: - <<: *DIMM_DEFAULTS - entityInstance: 6 -28: - /system/chassis/motherboard/dimm14: - <<: *DIMM_DEFAULTS - entityInstance: 7 -29: - /system/chassis/motherboard/dimm15: - <<: *DIMM_DEFAULTS - entityInstance: 8 -30: - /system/chassis/motherboard/dimm0: - <<: *DIMM_DEFAULTS - entityInstance: 9 -31: - /system/chassis/motherboard/dimm1: - <<: *DIMM_DEFAULTS - entityInstance: 10 -32: - /system/chassis/motherboard/dimm2: - <<: *DIMM_DEFAULTS - entityInstance: 11 -33: - /system/chassis/motherboard/dimm3: - <<: *DIMM_DEFAULTS - entityInstance: 12 -34: - /system/chassis/motherboard/dimm4: - <<: *DIMM_DEFAULTS - entityInstance: 13 -35: - /system/chassis/motherboard/dimm5: - <<: *DIMM_DEFAULTS - entityInstance: 14 -36: - /system/chassis/motherboard/dimm6: - <<: *DIMM_DEFAULTS - entityInstance: 15 -37: - /system/chassis/motherboard/dimm7: - <<: *DIMM_DEFAULTS - entityInstance: 16 -38: - /system/chassis/motherboard/dimm16: - <<: *DIMM_DEFAULTS - entityInstance: 17 -39: - /system/chassis/motherboard/dimm17: - <<: *DIMM_DEFAULTS - entityInstance: 18 -40: - /system/chassis/motherboard/dimm18: - <<: *DIMM_DEFAULTS - entityInstance: 19 -41: - /system/chassis/motherboard/dimm19: - <<: *DIMM_DEFAULTS - entityInstance: 20 -42: - /system/chassis/motherboard/dimm20: - <<: *DIMM_DEFAULTS - entityInstance: 21 -43: - /system/chassis/motherboard/dimm21: - <<: *DIMM_DEFAULTS - entityInstance: 22 -44: - /system/chassis/motherboard/dimm22: - <<: *DIMM_DEFAULTS - entityInstance: 23 -45: - /system/chassis/motherboard/dimm23: - <<: *DIMM_DEFAULTS - entityInstance: 24 -46: - /system/chassis/motherboard/dimm24: - <<: *DIMM_DEFAULTS - entityInstance: 25 -47: - /system/chassis/motherboard/dimm25: - <<: *DIMM_DEFAULTS - entityInstance: 26 -48: - /system/chassis/motherboard/dimm26: - <<: *DIMM_DEFAULTS - entityInstance: 27 -49: - /system/chassis/motherboard/dimm27: - <<: *DIMM_DEFAULTS - entityInstance: 28 -50: - /system/chassis/motherboard/dimm28: - <<: *DIMM_DEFAULTS - entityInstance: 29 -51: - /system/chassis/motherboard/dimm29: - <<: *DIMM_DEFAULTS - entityInstance: 30 -52: - /system/chassis/motherboard/dimm30: - <<: *DIMM_DEFAULTS - entityInstance: 31 -53: - /system/chassis/motherboard/dimm31: - <<: *DIMM_DEFAULTS - entityInstance: 32 -54: - /system/chassis/motherboard/dimm40: - <<: *DIMM_DEFAULTS - entityInstance: 33 -55: - /system/chassis/motherboard/dimm41: - <<: *DIMM_DEFAULTS - entityInstance: 34 -56: - /system/chassis/motherboard/dimm42: - <<: *DIMM_DEFAULTS - entityInstance: 35 -57: - /system/chassis/motherboard/dimm43: - <<: *DIMM_DEFAULTS - entityInstance: 36 -58: - /system/chassis/motherboard/dimm44: - <<: *DIMM_DEFAULTS - entityInstance: 37 -59: - /system/chassis/motherboard/dimm45: - <<: *DIMM_DEFAULTS - entityInstance: 38 -60: - /system/chassis/motherboard/dimm46: - <<: *DIMM_DEFAULTS - entityInstance: 39 -61: - /system/chassis/motherboard/dimm47: - <<: *DIMM_DEFAULTS - entityInstance: 40 -62: - /system/chassis/motherboard/dimm32: - <<: *DIMM_DEFAULTS - entityInstance: 41 -63: - /system/chassis/motherboard/dimm33: - <<: *DIMM_DEFAULTS - entityInstance: 42 -64: - /system/chassis/motherboard/dimm34: - <<: *DIMM_DEFAULTS - entityInstance: 43 -65: - /system/chassis/motherboard/dimm35: - <<: *DIMM_DEFAULTS - entityInstance: 44 -66: - /system/chassis/motherboard/dimm36: - <<: *DIMM_DEFAULTS - entityInstance: 45 -67: - /system/chassis/motherboard/dimm37: - <<: *DIMM_DEFAULTS - entityInstance: 46 -68: - /system/chassis/motherboard/dimm38: - <<: *DIMM_DEFAULTS - entityInstance: 47 -69: - /system/chassis/motherboard/dimm39: - <<: *DIMM_DEFAULTS - entityInstance: 48 -70: - /system/chassis/motherboard/dimm48: - <<: *DIMM_DEFAULTS - entityInstance: 49 -71: - /system/chassis/motherboard/dimm49: - <<: *DIMM_DEFAULTS - entityInstance: 50 -72: - /system/chassis/motherboard/dimm50: - <<: *DIMM_DEFAULTS - entityInstance: 51 -73: - /system/chassis/motherboard/dimm51: - <<: *DIMM_DEFAULTS - entityInstance: 52 -74: - /system/chassis/motherboard/dimm52: - <<: *DIMM_DEFAULTS - entityInstance: 53 -75: - /system/chassis/motherboard/dimm53: - <<: *DIMM_DEFAULTS - entityInstance: 54 -76: - /system/chassis/motherboard/dimm54: - <<: *DIMM_DEFAULTS - entityInstance: 55 -77: - /system/chassis/motherboard/dimm55: - <<: *DIMM_DEFAULTS - entityInstance: 56 -78: - /system/chassis/motherboard/dimm56: - <<: *DIMM_DEFAULTS - entityInstance: 57 -79: - /system/chassis/motherboard/dimm57: - <<: *DIMM_DEFAULTS - entityInstance: 58 -80: - /system/chassis/motherboard/dimm58: - <<: *DIMM_DEFAULTS - entityInstance: 59 -81: - /system/chassis/motherboard/dimm59: - <<: *DIMM_DEFAULTS - entityInstance: 60 -82: - /system/chassis/motherboard/dimm60: - <<: *DIMM_DEFAULTS - entityInstance: 61 -83: - /system/chassis/motherboard/dimm61: - <<: *DIMM_DEFAULTS - entityInstance: 62 -84: - /system/chassis/motherboard/dimm62: - <<: *DIMM_DEFAULTS - entityInstance: 63 -85: - /system/chassis/motherboard/dimm63: - <<: *DIMM_DEFAULTS - entityInstance: 64 -86: - /system/chassis/motherboard/dimm72: - <<: *DIMM_DEFAULTS - entityInstance: 65 -87: - /system/chassis/motherboard/dimm73: - <<: *DIMM_DEFAULTS - entityInstance: 66 -88: - /system/chassis/motherboard/dimm74: - <<: *DIMM_DEFAULTS - entityInstance: 67 -89: - /system/chassis/motherboard/dimm75: - <<: *DIMM_DEFAULTS - entityInstance: 68 -90: - /system/chassis/motherboard/dimm76: - <<: *DIMM_DEFAULTS - entityInstance: 69 -91: - /system/chassis/motherboard/dimm77: - <<: *DIMM_DEFAULTS - entityInstance: 70 -92: - /system/chassis/motherboard/dimm78: - <<: *DIMM_DEFAULTS - entityInstance: 71 -93: - /system/chassis/motherboard/dimm79: - <<: *DIMM_DEFAULTS - entityInstance: 72 -94: - /system/chassis/motherboard/dimm64: - <<: *DIMM_DEFAULTS - entityInstance: 73 -95: - /system/chassis/motherboard/dimm65: - <<: *DIMM_DEFAULTS - entityInstance: 74 -96: - /system/chassis/motherboard/dimm66: - <<: *DIMM_DEFAULTS - entityInstance: 75 -97: - /system/chassis/motherboard/dimm67: - <<: *DIMM_DEFAULTS - entityInstance: 76 -98: - /system/chassis/motherboard/dimm68: - <<: *DIMM_DEFAULTS - entityInstance: 77 -99: - /system/chassis/motherboard/dimm69: - <<: *DIMM_DEFAULTS - entityInstance: 78 -100: - /system/chassis/motherboard/dimm70: - <<: *DIMM_DEFAULTS - entityInstance: 79 -101: - /system/chassis/motherboard/dimm71: - <<: *DIMM_DEFAULTS - entityInstance: 80 -102: - /system/chassis/motherboard/dimm80: - <<: *DIMM_DEFAULTS - entityInstance: 81 -103: - /system/chassis/motherboard/dimm81: - <<: *DIMM_DEFAULTS - entityInstance: 82 -104: - /system/chassis/motherboard/dimm82: - <<: *DIMM_DEFAULTS - entityInstance: 83 -105: - /system/chassis/motherboard/dimm83: - <<: *DIMM_DEFAULTS - entityInstance: 84 -106: - /system/chassis/motherboard/dimm84: - <<: *DIMM_DEFAULTS - entityInstance: 85 -107: - /system/chassis/motherboard/dimm85: - <<: *DIMM_DEFAULTS - entityInstance: 86 -108: - /system/chassis/motherboard/dimm86: - <<: *DIMM_DEFAULTS - entityInstance: 87 -109: - /system/chassis/motherboard/dimm87: - <<: *DIMM_DEFAULTS - entityInstance: 88 -110: - /system/chassis/motherboard/dimm88: - <<: *DIMM_DEFAULTS - entityInstance: 89 -111: - /system/chassis/motherboard/dimm89: - <<: *DIMM_DEFAULTS - entityInstance: 90 -112: - /system/chassis/motherboard/dimm90: - <<: *DIMM_DEFAULTS - entityInstance: 91 -113: - /system/chassis/motherboard/dimm91: - <<: *DIMM_DEFAULTS - entityInstance: 92 -114: - /system/chassis/motherboard/dimm92: - <<: *DIMM_DEFAULTS - entityInstance: 93 -115: - /system/chassis/motherboard/dimm93: - <<: *DIMM_DEFAULTS - entityInstance: 94 -116: - /system/chassis/motherboard/dimm94: - <<: *DIMM_DEFAULTS - entityInstance: 95 -117: - /system/chassis/motherboard/dimm95: - <<: *DIMM_DEFAULTS - entityInstance: 96 -118: - /system/chassis/motherboard/dimm104: - <<: *DIMM_DEFAULTS - entityInstance: 97 -119: - /system/chassis/motherboard/dimm105: - <<: *DIMM_DEFAULTS - entityInstance: 98 -120: - /system/chassis/motherboard/dimm106: - <<: *DIMM_DEFAULTS - entityInstance: 99 -121: - /system/chassis/motherboard/dimm107: - <<: *DIMM_DEFAULTS - entityInstance: 100 -122: - /system/chassis/motherboard/dimm108: - <<: *DIMM_DEFAULTS - entityInstance: 101 -123: - /system/chassis/motherboard/dimm109: - <<: *DIMM_DEFAULTS - entityInstance: 102 -124: - /system/chassis/motherboard/dimm110: - <<: *DIMM_DEFAULTS - entityInstance: 103 -125: - /system/chassis/motherboard/dimm111: - <<: *DIMM_DEFAULTS - entityInstance: 104 -126: - /system/chassis/motherboard/dimm96: - <<: *DIMM_DEFAULTS - entityInstance: 105 -127: - /system/chassis/motherboard/dimm97: - <<: *DIMM_DEFAULTS - entityInstance: 106 -128: - /system/chassis/motherboard/dimm98: - <<: *DIMM_DEFAULTS - entityInstance: 107 -129: - /system/chassis/motherboard/dimm99: - <<: *DIMM_DEFAULTS - entityInstance: 108 -130: - /system/chassis/motherboard/dimm100: - <<: *DIMM_DEFAULTS - entityInstance: 109 -131: - /system/chassis/motherboard/dimm101: - <<: *DIMM_DEFAULTS - entityInstance: 110 -132: - /system/chassis/motherboard/dimm102: - <<: *DIMM_DEFAULTS - entityInstance: 111 -133: - /system/chassis/motherboard/dimm103: - <<: *DIMM_DEFAULTS - entityInstance: 112 -134: - /system/chassis/motherboard/dimm112: - <<: *DIMM_DEFAULTS - entityInstance: 113 -135: - /system/chassis/motherboard/dimm113: - <<: *DIMM_DEFAULTS - entityInstance: 114 -136: - /system/chassis/motherboard/dimm114: - <<: *DIMM_DEFAULTS - entityInstance: 115 -137: - /system/chassis/motherboard/dimm115: - <<: *DIMM_DEFAULTS - entityInstance: 116 -138: - /system/chassis/motherboard/dimm116: - <<: *DIMM_DEFAULTS - entityInstance: 117 -139: - /system/chassis/motherboard/dimm117: - <<: *DIMM_DEFAULTS - entityInstance: 118 -140: - /system/chassis/motherboard/dimm118: - <<: *DIMM_DEFAULTS - entityInstance: 119 -141: - /system/chassis/motherboard/dimm119: - <<: *DIMM_DEFAULTS - entityInstance: 120 -142: - /system/chassis/motherboard/dimm120: - <<: *DIMM_DEFAULTS - entityInstance: 121 -143: - /system/chassis/motherboard/dimm121: - <<: *DIMM_DEFAULTS - entityInstance: 122 -144: - /system/chassis/motherboard/dimm122: - <<: *DIMM_DEFAULTS - entityInstance: 123 -145: - /system/chassis/motherboard/dimm123: - <<: *DIMM_DEFAULTS - entityInstance: 124 -146: - /system/chassis/motherboard/dimm124: - <<: *DIMM_DEFAULTS - entityInstance: 125 -147: - /system/chassis/motherboard/dimm125: - <<: *DIMM_DEFAULTS - entityInstance: 126 -148: - /system/chassis/motherboard/dimm126: - <<: *DIMM_DEFAULTS - entityInstance: 127 -149: - /system/chassis/motherboard/dimm127: - <<: *DIMM_DEFAULTS - entityInstance: 128 - -150: - /system/chassis/motherboard/powersupply0: - entityID: 19 - entityInstance: 0 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version - /system/chassis/motherboard/powersupply0/info: - entityID: 19 - entityInstance: 0 - interfaces: - xyz.openbmc_project.Inventory.MultiRecord.PowerSupply: - Data: - IPMIFruProperty: PowerSupply - IPMIFruSection: MultiRecord - /system/chassis/motherboard/powersupply0/dc_output: - entityID: 19 - entityInstance: 0 - interfaces: - xyz.openbmc_project.Inventory.MultiRecord.DcOutput: - Data: - IPMIFruProperty: DcOutput - IPMIFruSection: MultiRecord - -151: - /system/chassis/motherboard/powersupply1: - entityID: 19 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version - /system/chassis/motherboard/powersupply1/info: - entityID: 19 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.MultiRecord.PowerSupply: - Data: - IPMIFruProperty: PowerSupply - IPMIFruSection: MultiRecord - /system/chassis/motherboard/powersupply1/dc_output: - entityID: 19 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.MultiRecord.DcOutput: - Data: - IPMIFruProperty: DcOutput - IPMIFruSection: MultiRecord - -152: - /system/chassis/motherboard/fan0: &FAN_DEFAULTS - entityID: 29 - entityInstance: 0 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Model Number - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - -153: - /system/chassis/motherboard/fan1: - <<: *FAN_DEFAULTS - entityInstance: 1 - -154: - /system/chassis/motherboard/fan2: - <<: *FAN_DEFAULTS - entityInstance: 2 - -155: - /system/chassis/motherboard/fan3: - <<: *FAN_DEFAULTS - entityInstance: 3 - -156: - /system/chassis/motherboard/fan4: - <<: *FAN_DEFAULTS - entityInstance: 4 - -254: - /system/chassis/motherboard/opfw: - entityID: 34 - entityInstance: 0 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version - IPMIFruSection: Product diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/images/obmc-phosphor-image.bbappend deleted file mode 100644 index 36c136893..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ /dev/null @@ -1 +0,0 @@ -OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd first-boot-set-mac" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend deleted file mode 100644 index 3e79e4831..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -RDEPENDS_${PN}_remove += " cf-fsi-firmware " - -do_install_append() { - echo "/etc/hostname" >> ${D}/whitelist -} diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend deleted file mode 100644 index 3ee4501d7..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -DEPENDS_append_vesnin = " vesnin-yaml-config" - -EXTRA_OECONF_vesnin = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/vesnin-yaml-config/ipmi-fru-read.yaml \ - " diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend deleted file mode 100644 index cf846c7fa..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -DEPENDS_append_vesnin = " vesnin-yaml-config" - -EXTRA_OECONF_vesnin = " \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/vesnin-yaml-config/ipmi-fru-read.yaml \ - " diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config-native.bb b/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config-native.bb deleted file mode 100644 index c10301060..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config-native.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Phosphor LED Group Management for Vesnin" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit native -inherit obmc-phosphor-utils - -PROVIDES += "virtual/phosphor-led-manager-config-native" - -SRC_URI += "file://led.yaml" -S = "${WORKDIR}" - -# Copies example led layout yaml file -do_install() { - SRC=${S} - DEST=${D}${datadir}/phosphor-led-manager - install -D ${SRC}/led.yaml ${DEST}/led.yaml -} diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config/led.yaml b/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config/led.yaml deleted file mode 100644 index 3dfc46193..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config/led.yaml +++ /dev/null @@ -1,43 +0,0 @@ -BmcBooted: - heartbeat: - Action: 'Blink' - DutyOn: 50 - Period: 1000 - alarm_yel: - Action: 'On' - Priority: 'Blink' -PowerOn: - power_green: - Action: 'On' - Priority: 'On' -PgoodTimeout: - power_red: - Action: 'On' - Priority: 'On' -HostQuiesced: - alarm_red: - Action: 'On' - Priority: 'Blink' -Overheat: - alarm_red: - Action: 'Blink' - DutyOn: 50 - Period: 1000 - Priority: 'Blink' -PsuSmbalert: - alarm_yel: - Action: 'Blink' - DutyOn: 50 - Period: 1000 - Priority: 'Blink' -EnclosureIdentify: - id_blue: - Action: 'Blink' - Priority: 'On' -FruFault: - alarm_yel: - Action: 'Blink' - DutyOn: 50 - Period: 200 - Priority: 'Blink' - diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/mboxd/mboxd_%.bbappend deleted file mode 100644 index 8b6248a46..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/mboxd/mboxd_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -MBOXD_FLASH_SIZE = "64M" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/network/first-boot-set-mac_%.bbappend deleted file mode 100644 index 29d23c8c4..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/network/first-boot-set-mac_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -SYSTEMD_SERVICE_${PN} += "first-boot-set-mac@eth0.service" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/occ/files/occ_sensor.yaml b/meta-yadro/meta-vesnin/recipes-phosphor/occ/files/occ_sensor.yaml deleted file mode 100644 index 97fd3f76c..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/occ/files/occ_sensor.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- Instance: 0 - SensorID: 0x08 - SensorName: occ0 -- Instance: 1 - SensorID: 0x09 - SensorName: occ1 -- Instance: 6 - SensorID: 0x06 - SensorName: occ2 -- Instance: 7 - SensorID: 0x07 - SensorName: occ3 diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/occ/openpower-occ-control_%.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/occ/openpower-occ-control_%.bbappend deleted file mode 100644 index 6a7aa8c5e..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/occ/openpower-occ-control_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -EXTRA_OECONF_append = " --enable-i2c-occ" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/occ/vesnin-openpower-occ-control-config-native.bb b/meta-yadro/meta-vesnin/recipes-phosphor/occ/vesnin-openpower-occ-control-config-native.bb deleted file mode 100644 index 71ce60ce2..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/occ/vesnin-openpower-occ-control-config-native.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Vesnin OCC Control sensor IDs" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit native -inherit openpower-occ-control - -PROVIDES += "virtual/openpower-occ-control-config-native" - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI += "file://occ_sensor.yaml" - -S = "${WORKDIR}" -do_install() { - install -d ${YAML_DEST}/ - install ${S}/occ_sensor.yaml ${YAML_DEST}/ -} diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend deleted file mode 100644 index e5b837abc..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ /dev/null @@ -1 +0,0 @@ -RDEPENDS_${PN}-inventory += "openpower-occ-control" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json deleted file mode 100644 index 75b0480bd..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "gpio_configs": { - "power_config": { - "power_good_in": "SYS_PWROK_BUFF", - "power_up_outs": [ - {"name": "BMC_POWER_UP", "polarity": false} - ], - "reset_outs": [ - {"name": "CM1_OE_R_N", "polarity": true}, - {"name": "BMC_CP0_RESET_N", "polarity": false} - ], - "pci_reset_outs": [ - {"name": "PEX8718_DEVICES_RESET_N", "polarity": false, "hold": true} - ] - } - }, - - "gpio_definitions": [ - { - "name": "BMC_POWER_UP", - "pin": "E1", - "direction": "out" - }, - { - "name": "SYS_PWROK_BUFF", - "pin": "E6", - "direction": "in" - }, - { - "name": "BMC_WD_CLEAR_PULSE_N", - "pin": "N4", - "direction": "out" - }, - { - "name": "CM1_OE_R_N", - "pin": "Q6", - "direction": "out" - }, - { - "name": "BMC_CP0_RESET_N", - "pin": "O2", - "direction": "out" - }, - { - "name": "PSU_PG", - "pin": "J2", - "direction": "in" - }, - { - "name": "PEX8718_DEVICES_RESET_N", - "pin": "B6", - "direction": "out" - }, - { - "name": "CP0_DEVICES_RESET_N", - "pin": "N3", - "direction": "in" - }, - { - "name": "CP1_DEVICES_RESET_N", - "pin": "N5", - "direction": "in" - }, - { - "name": "CP2_DEVICES_RESET_N", - "pin": "P0", - "direction": "in" - }, - - { - "name": "CP3_DEVICES_RESET_N", - "pin": "P1", - "direction": "in" - }, - { - "name": "IDBTN", - "pin": "Q7", - "direction": "out" - }, - { - "name": "POWER_BUTTON", - "pin": "E0", - "direction": "both" - }, - { - "name": "RESET_BUTTON", - "pin": "E2", - "direction": "both" - }, - { - "name": "CHECKSTOP", - "pin": "P5", - "direction": "falling" - }, - { - "name": "PS0_PRES_N", - "pin": "P7", - "direction": "in" - }, - { - "name": "PS1_PRES_N", - "pin": "N0", - "direction": "in" - }, - { - "name": "FSI_DATA", - "pin": "A5", - "direction": "out" - }, - { - "name": "FSI_CLK", - "pin": "A4", - "direction": "out" - }, - { - "name": "FSI_ENABLE", - "pin": "E5", - "direction": "out" - }, - { - "name": "CRONUS_SEL", - "pin": "A6", - "direction": "out" - }, - { - "name": "CP0_FSI0_DATA_EN", - "pin": "H6", - "direction": "out" - } - ] -} diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend deleted file mode 100644 index 72d991c7e..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-op-control-host/0001-Replace-ColdFire-FSI-with-plain-FSI-over-GPIO.patch b/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-op-control-host/0001-Replace-ColdFire-FSI-with-plain-FSI-over-GPIO.patch deleted file mode 100644 index 33b1bb32f..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-op-control-host/0001-Replace-ColdFire-FSI-with-plain-FSI-over-GPIO.patch +++ /dev/null @@ -1,358 +0,0 @@ -From b6b1cda6a526bad8c7f50aa4427bedbc6e539a4d Mon Sep 17 00:00:00 2001 -From: Artem Senichev -Date: Fri, 23 Nov 2018 10:31:59 +0300 -Subject: [PATCH] Replace ColdFire FSI with plain FSI-over-GPIO - -Workaround to fix ColdFire FSI performance issue: -https://github.com/openbmc/openbmc/issues/3433 -Current implementation based on an old version of skeleton -(revision 517b35ed92ad2c0df5e048711c175bacb632f6d0), mostly it's -a copy-paste of op-hostctl module. - -Signed-off-by: Artem Senichev -Signed-off-by: Alexander Filippov ---- - control_host_obj.c | 259 ++++++++++++++++++++-------------- - 1 file changed, 152 insertions(+), 107 deletions(-) - -diff --git a/control_host_obj.c b/control_host_obj.c -index 27f7fc7..ca45182 100644 ---- a/control_host_obj.c -+++ b/control_host_obj.c -@@ -5,10 +5,10 @@ - #include - #include - #include --#include -- - #include - #include -+#include -+#include - - /* ------------------------------------------------------------------------- */ - static const gchar* dbus_object_path = "/org/openbmc/control"; -@@ -17,36 +17,31 @@ static const gchar* dbus_name = "org.openbmc.control.Host"; - - static GDBusObjectManagerServer *manager = NULL; - --#define PPC_BIT32(bit) (0x80000000UL >> (bit)) -- --#define FSI_EXTERNAL_MODE_PATH "/sys/devices/platform/gpio-fsi/external_mode" --#define FSI_SCAN_PATH "/sys/devices/platform/gpio-fsi/fsi0/rescan" -- --/* TODO: Change this over to the cfam path once the cfam chardev patches have landed */ --#define FSI_RAW_PATH "/sys/devices/platform/gpio-fsi/fsi0/slave@00:00/raw" -- --#define FSI_SCAN_DELAY_US 10000 -+static GPIO* fsi_data; -+static GPIO* fsi_clk; -+static GPIO* fsi_enable; -+static GPIO* cronus_sel; -+static size_t num_optionals; -+static GPIO* optionals; -+static gboolean* optional_pols; - --/* Attention registers */ --#define FSI_A_SI1S 0x081c --#define TRUE_MASK 0x100d --#define INTERRUPT_STATUS_REG 0x100b -+/* Bit bang patterns */ - --/* SBE boot register and values */ --#define SBE_VITAL 0x281c --#define SBE_WARMSTART PPC_BIT32(0) --#define SBE_HW_TRIGGER PPC_BIT32(2) --#define SBE_UPDATE_1ST_NIBBLE PPC_BIT32(3) --#define SBE_IMAGE_SELECT PPC_BIT32(8) --#define SBE_UPDATE_3RD_NIBBLE PPC_BIT32(11) -+//putcfam pu 281c 30000000 -p0 (Primary Side Select) -+static const char* primary = "000011111111110101111000111001100111111111111111111111111111101111111111"; -+//putcfam pu 281c B0000000 -p0 -+static const char* go = "000011111111110101111000111000100111111111111111111111111111101101111111"; -+//putcfam pu 0x281c 30900000 (Golden Side Select) -+static const char* golden = "000011111111110101111000111001100111101101111111111111111111101001111111"; - --/* Once the side is selected and attention bits are set, this starts the SBE */ --#define START_SBE (SBE_WARMSTART | SBE_HW_TRIGGER | SBE_UPDATE_1ST_NIBBLE) -+/* Setup attentions */ -+//putcfam pu 0x081C 20000000 -+static const char* attnA = "000011111111111101111110001001101111111111111111111111111111110001111111"; -+//putcfam pu 0x100D 40000000 -+static const char* attnB = "000011111111111011111100101001011111111111111111111111111111110001111111"; -+//putcfam pu 0x100B FFFFFFFF -+static const char* attnC = "000011111111111011111101001000000000000000000000000000000000001011111111"; - --/* Primary is first side. Golden is second side */ --#define PRIMARY_SIDE (SBE_HW_TRIGGER | SBE_UPDATE_1ST_NIBBLE) --#define GOLDEN_SIDE (SBE_HW_TRIGGER | SBE_UPDATE_1ST_NIBBLE | \ -- SBE_IMAGE_SELECT | SBE_UPDATE_3RD_NIBBLE) - - static gboolean - on_init(Control *control, -@@ -57,126 +52,147 @@ on_init(Control *control, - return TRUE; - } - --static gint --fsi_putcfam(int fd, uint64_t addr64, uint32_t val_host) -+int gpio_clock_cycle(GPIO* gpio, int num_clks) - { -- int rc; -- uint32_t val = htobe32(val_host); -- /* Map FSI to FSI_BYTE, as the 'raw' kernel interface expects this */ -- uint32_t addr = (addr64 & 0x7ffc00) | ((addr64 & 0x3ff) << 2); -- -- rc = lseek(fd, addr, SEEK_SET); -- if (rc < 0) { -- g_print("ERROR HostControl: cfam seek failed (0x%08x): %s\n", addr, -- strerror(errno)); -- return errno; -- }; -- -- rc = write(fd, &val, sizeof(val)); -- if (rc < 0) { -- g_print("ERROR HostControl: cfam write failed: %s\n", -- strerror(errno)); -- return errno; -- } -- -- return 0; -+ g_assert(gpio != NULL); -+ int i = 0; -+ int r = GPIO_OK; -+ for (i = 0; i < num_clks; i++) -+ { -+ if (gpio_write(gpio, 0) == -1) -+ { -+ r = GPIO_WRITE_ERROR; -+ break; -+ } -+ if (gpio_write(gpio, 1) == -1) -+ { -+ r = GPIO_WRITE_ERROR; -+ break; -+ } -+ } -+ -+ return r; - } - --static int fsi_rescan(void) -+int -+fsi_bitbang(const char* pattern) - { -- char *one = "1"; -- int fd, rc; -- -- fd = open(FSI_SCAN_PATH, O_WRONLY); -- if (fd < 0) { -- g_print("ERROR HostControl: Failed to open path '%s': %s\n", -- FSI_SCAN_PATH, strerror(errno)); -- return errno; -- } -- rc = write(fd, one, sizeof(one)); -- close(fd); -- if (rc < 0) { -- g_print("ERROR HostControl: Failed to perform FSI scan: %s\n", -- strerror(errno)); -- return errno; -+ int rc=GPIO_OK; -+ int i; -+ for(i=0;iname = g_strdup("FSI_DATA"); // GPIO struct has non-const char pointer -+ fsi_clk = malloc(sizeof(GPIO)); -+ fsi_clk->name = g_strdup("FSI_CLK"); -+ fsi_enable = malloc(sizeof(GPIO)); -+ fsi_enable->name = g_strdup("FSI_ENABLE"); -+ cronus_sel = malloc(sizeof(GPIO)); -+ cronus_sel->name = g_strdup("CRONUS_SEL"); -+ -+ // WARNING: This portion of the hardcode is usable only with VESNIN. -+ // For the upstream, it should be rewritten for reading this data from the -+ // JSON file. -+ num_optionals = 1; -+ optionals = malloc(sizeof(GPIO)); -+ optionals->name = g_strdup("CP0_FSI0_DATA_EN"); -+ optional_pols = malloc(sizeof(gboolean)); -+ optional_pols[0] = TRUE; -+ -+ gpio_get_params(fsi_data); -+ gpio_get_params(fsi_clk); -+ gpio_get_params(fsi_enable); -+ gpio_get_params(cronus_sel); -+ for (int i = 0; i < num_optionals; ++i) { -+ gpio_get_params(&optionals[i]); -+ } - } - - static void --- -2.20.1 - diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-op-control-host_%.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-op-control-host_%.bbappend deleted file mode 100644 index 068edeac8..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-op-control-host_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://0001-Replace-ColdFire-FSI-with-plain-FSI-over-GPIO.patch" -- cgit v1.2.3 From c0f90c167e1bdb772b6c65583deaa27a409fbf80 Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Tue, 20 Jul 2021 23:43:07 +0300 Subject: meta-yadro: phophor-ipmi-host: fix mailbox patch This commit adapts `0002-Add-support-for-boot-initiator-mailbox.patch` and fixes build. Change-Id: I7a89d66a14862eab26662c97b43c3de7f0b67c8f Signed-off-by: Alexander Filippov --- ...02-Add-support-for-boot-initiator-mailbox.patch | 65 +++++++++++----------- 1 file changed, 32 insertions(+), 33 deletions(-) (limited to 'meta-yadro') diff --git a/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Add-support-for-boot-initiator-mailbox.patch b/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Add-support-for-boot-initiator-mailbox.patch index dd7610975..04ea96421 100644 --- a/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Add-support-for-boot-initiator-mailbox.patch +++ b/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Add-support-for-boot-initiator-mailbox.patch @@ -1,4 +1,4 @@ -From ec6765e9aa35871f8d02cb0b5b47d96be18f4804 Mon Sep 17 00:00:00 2001 +From a193c5ce59758ed5971b5bd7494f1aaf3489ed9d Mon Sep 17 00:00:00 2001 From: Alexander Amelkin Date: Mon, 8 Apr 2019 17:58:42 +0300 Subject: [PATCH] Add support for boot initiator mailbox @@ -21,35 +21,37 @@ Resolves openbmc/openbmc#3391 Change-Id: Iccbf74c0775f20c70e8deaa7b0a8bd995ebbffea Signed-off-by: Alexander Amelkin Signed-off-by: Ivan Mikhaylov + --- - chassishandler.cpp | 328 ++++++++++++++++++++++++++++++++++++++++++++- + chassishandler.cpp | 329 ++++++++++++++++++++++++++++++++++++++++++++- chassishandler.hpp | 1 + - 2 files changed, 325 insertions(+), 4 deletions(-) + 2 files changed, 326 insertions(+), 4 deletions(-) diff --git a/chassishandler.cpp b/chassishandler.cpp -index 3250b2c..48cda21 100644 +index fb3d644..7f92b85 100644 --- a/chassishandler.cpp +++ b/chassishandler.cpp -@@ -136,6 +136,7 @@ namespace internal +@@ -131,6 +131,7 @@ namespace internal { constexpr auto bootModeIntf = "xyz.openbmc_project.Control.Boot.Mode"; +constexpr auto bootMboxIntf = "xyz.openbmc_project.Control.Boot.Mailbox"; + constexpr auto bootTypeIntf = "xyz.openbmc_project.Control.Boot.Type"; constexpr auto bootSourceIntf = "xyz.openbmc_project.Control.Boot.Source"; constexpr auto powerRestoreIntf = - "xyz.openbmc_project.Control.Power.RestorePolicy"; -@@ -151,8 +152,8 @@ settings::Objects& getObjects() +@@ -147,8 +148,9 @@ settings::Objects& getObjects() if (objectsPtr == nullptr) { objectsPtr = std::make_unique( -- dbus, std::vector{bootModeIntf, bootSourceIntf, -- powerRestoreIntf}); -+ dbus, std::vector{bootMboxIntf, bootModeIntf, -+ bootSourceIntf, powerRestoreIntf}); +- dbus, std::vector{bootModeIntf, bootTypeIntf, +- bootSourceIntf, powerRestoreIntf}); ++ dbus, ++ std::vector{bootMboxIntf, bootModeIntf, bootTypeIntf, ++ bootSourceIntf, powerRestoreIntf}); } return *objectsPtr; } -@@ -1670,6 +1671,127 @@ static ipmi::Cc setBootMode(const Mode::Modes& mode) +@@ -1708,6 +1710,127 @@ static ipmi::Cc setBootType(ipmi::Context::ptr& ctx, const Type::Types& type) return ipmi::ccSuccess; } @@ -174,15 +176,15 @@ index 3250b2c..48cda21 100644 +static constexpr size_t normalBlockSize = 16; +static constexpr size_t IANAEnterpriseLength = 3; + - /** @brief implements the Get Chassis system boot option - * @param bootOptionParameter - boot option parameter selector - * @param reserved1 - reserved bit -@@ -1783,6 +1905,87 @@ ipmi::RspType + static constexpr uint8_t setComplete = 0x0; + static constexpr uint8_t setInProgress = 0x1; + static uint8_t transferStatus = setComplete; +@@ -1882,6 +2005,87 @@ ipmi::RspType return ipmi::responseUnspecifiedError(); } } -+ else if (static_cast(bootOptionParameter) == -+ static_cast(BootOptionParameter::bootInitiatorMbox)) ++ else if (types::enum_cast(bootOptionParameter) == ++ BootOptionParameter::bootInitiatorMbox) + { + // Only allow reading the boot initiator mailbox if Mailbox is supported + // @@ -265,9 +267,9 @@ index 3250b2c..48cda21 100644 else { if ((bootOptionParameter >= oemParmStart) && -@@ -1825,9 +2028,8 @@ ipmi::RspType<> ipmiChassisSetSysBootOptions(ipmi::Context::ptr ctx, - using namespace boot_options; - ipmi::Cc rc; +@@ -1946,9 +2150,8 @@ ipmi::RspType<> ipmiChassisSetSysBootOptions(ipmi::Context::ptr ctx, + return ipmi::responseSuccess(); + } - /* 000101 + /* @@ -275,13 +277,13 @@ index 3250b2c..48cda21 100644 - * This is the only parameter used by petitboot. */ - if (parameterSelector == -@@ -1954,6 +2156,124 @@ ipmi::RspType<> ipmiChassisSetSysBootOptions(ipmi::Context::ptr ctx, + if (types::enum_cast(parameterSelector) == +@@ -2084,6 +2287,124 @@ ipmi::RspType<> ipmiChassisSetSysBootOptions(ipmi::Context::ptr ctx, return ipmi::responseUnspecifiedError(); } } -+ else if (parameterSelector == -+ static_cast(BootOptionParameter::bootInitiatorMbox)) ++ else if (types::enum_cast(parameterSelector) == ++ BootOptionParameter::bootInitiatorMbox) + { + // Only allow writing to boot initiator mailbox if: + // 1. Mailbox is supported @@ -398,21 +400,18 @@ index 3250b2c..48cda21 100644 + return ipmi::responseUnspecifiedError(); + } + } - else if (parameterSelector == - static_cast(BootOptionParameter::bootInfo)) + else if (types::enum_cast(parameterSelector) == + BootOptionParameter::bootInfo) { diff --git a/chassishandler.hpp b/chassishandler.hpp -index 93de2c0..33ad25f 100644 +index 2957127..a783bff 100644 --- a/chassishandler.hpp +++ b/chassishandler.hpp -@@ -48,6 +48,7 @@ enum class BootOptionParameter : size_t - { +@@ -51,6 +51,7 @@ enum class BootOptionParameter : size_t + bootFlagValidClr = 0x3, bootInfo = 0x4, bootFlags = 0x5, + bootInitiatorMbox = 0x07, opalNetworkSettings = 0x61 }; --- -2.26.2 - -- cgit v1.2.3 From 6d3569f2b062c510d7209bc595db2f0b0bc1a6a4 Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Tue, 20 Jul 2021 23:45:43 +0300 Subject: meta-nicole: settings: fix mailbox override This commit fixes build by correcting default value of mailbox settings. Change-Id: I5df137ca7dc8f8008d49a0cd010c14691dc6754b Signed-off-by: Alexander Filippov --- .../bootmailbox.override.yml | 23 +++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'meta-yadro') diff --git a/meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager/bootmailbox.override.yml b/meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager/bootmailbox.override.yml index e4e5745f4..b01e8b9b2 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager/bootmailbox.override.yml +++ b/meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager/bootmailbox.override.yml @@ -13,4 +13,25 @@ # So the minimum is 77 bytes. 512 bytes look enough to accomodate # all boot settings, yet not too big to waste space. # 512 - 3 = 509 - Default: 'std::vector(509)' + Default: > + {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0} -- cgit v1.2.3 From 804f8b6394510a06aee1110319949854b66c4d9d Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Wed, 21 Jul 2021 11:38:14 +0300 Subject: obmc-yadro-netconfig: srcrev bump b300465732..1d99186802 Alexander Amelkin (5): Merge pull request #2 from YADRO-KNS/feature/ntp-and-dns-per-iface help: Don't display banner in CLI mode Add support for `help` as the first arg of command Add --cli-hide-cmd option Refix c0b47545069ed4a64bf1e1434315657d64ab3c5d Alexander Filippov (9): Add lists of DNS and NTP per interface Fix dhcp settings Fix DNS list modification multiple DNS and NTP servers in one call Remove gateway from IP adding call ip add/del: Make the network mask optional Improve IP comparison ntp: check given hostname Hide tool from unprivileged user Kirill Pakhomov (2): vlan del: catch exception and display error Merge pull request #11 from YADRO-KNS/bugfix/BBMC-372 Change-Id: Ib2a27383f2dadc2033cc62129b75a8b9413280e5 Signed-off-by: Alexander Filippov --- meta-yadro/recipes-phosphor/cli/obmc-yadro-netconfig_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-yadro') diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-netconfig_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-netconfig_git.bb index e868bbfb4..7ec34edfa 100644 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-netconfig_git.bb +++ b/meta-yadro/recipes-phosphor/cli/obmc-yadro-netconfig_git.bb @@ -16,4 +16,4 @@ DEPENDS = "sdbusplus" # Source code repository S = "${WORKDIR}/git" SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-netconfig.git" -SRCREV = "b300465732616c6d456bdc2df2cce9d1246636a8" +SRCREV = "1d991868023b80a9361a7a46c6e6b8058b482f01" -- cgit v1.2.3 From e3ffaae9fd1cd8f5feb78a4e0a6adbdbbdfce7ef Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Wed, 21 Jul 2021 11:39:08 +0300 Subject: obmc-yadro-lssensors: srcrev bump f76bf429d2..39c37655bb Alexander Filippov (1): Hide tool from unprivileged user Andrei Kartashev (2): Check if sensor value valid Print avail/functional in Status column Change-Id: I3cf35b9fdaaa323da8470b4b27039c550228527f Signed-off-by: Alexander Filippov --- meta-yadro/recipes-phosphor/cli/obmc-yadro-lssensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-yadro') diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-lssensors_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-lssensors_git.bb index 234d3cdad..5a08c7a3e 100644 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-lssensors_git.bb +++ b/meta-yadro/recipes-phosphor/cli/obmc-yadro-lssensors_git.bb @@ -13,4 +13,4 @@ DEPENDS += "sdbusplus" S = "${WORKDIR}/git" SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-lssensors.git" -SRCREV = "f76bf429d212d803cff7e4f1e3ca21097c65f18f" +SRCREV = "39c37655bb777f1876cdddc4b624b38d75105b8e" -- cgit v1.2.3 From 9f9747835f40e60af63c66a44be765b3bfa0edcc Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Wed, 21 Jul 2021 11:39:41 +0300 Subject: obmc-yadro-fwupdate: srcrev bump f141bdf92f..0e3c0714f3 Alexander Filippov (11): reboot-guard: Fix misspelling Share the chassis power state checking meson.build: make dependencies Add BIOS updater implementation intel: Skip reboot if not BMC update was done. Fix misspelling skip unusable updaters vegman/bios: hack for PCA9698 on Vegman rev-E. image_intel: suppress warning on reset Hide tool from unprivileged user split machine type and signature checks Andrei Kartashev (1): make util paths configurable in compile time Artem Senichev (4): Preserve BIOS settings during update Preserve 10GBE region during BIOS update Add handlers for NVRAM and 10GBE partitions bios: Never overwrite 10GBE region Igor Kononenko (1): bios-update:after-install: Reset bios_active to NA Change-Id: Ie6eac6f3b0a9d2f32192413983f5218804865697 Signed-off-by: Alexander Filippov --- meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta-yadro') diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb index 90f377bbe..dd7f39716 100644 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb +++ b/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb @@ -7,7 +7,6 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit meson -inherit pkgconfig DEPENDS += " \ sdbusplus \ @@ -23,5 +22,5 @@ PACKAGECONFIG ??= " obmc-phosphor-image reboot-guard-support " PACKAGECONFIG_append_df-openpower = "openpower-support" SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-fwupdate" -SRCREV = "f141bdf92f92971caa4e8e5eb0727821241416e8" +SRCREV = "0e3c0714f344a2f7f289c851434955360e6f075b" S = "${WORKDIR}/git" -- cgit v1.2.3 From 069dc595d16dcfa89e4b6b706480ad4bd2ffc004 Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Wed, 21 Jul 2021 11:40:06 +0300 Subject: obmc-yadro-cli: srcrev bump 29768c2fb7..76743c3706 Alexander Amelkin (27): install: Beautify the output Move group-to-role conversion functions to clicmd clicmd: Hide restricted functions by role install: Prohibit sudo by default, no lecture Update command permissions user: Add `set mypassword`, fix `user create` Add copyright banners bmc info version: Refactor bmc: Fix help for ifconfig and datetime ntpconfig help: Restrict top-level commands Update permissions per design document vegman: power: Add `reboot`, fix `off` health logs show: Add help bmc: Refix f2ff3222ada5f627a322e920e616c978 bmc datetime show: Fix help message bmc syslog reset: Fix typo in help message Fix error handling in local variable assignments Fix assignments from external commands Add a basic github workflow for shellcheck bmc datetime set: Fix format checking Fix issues found by shellcheck clicmd: Add a generic exec_tool function bmc datetime set: Add range sanity checks bmc ifconfig help: Fix command name display clicmd: Fix autocomplete for path arguments host: virtualmedia mount: Fix help formatting bmc: config syslog: Specify TCP proto in help Alexander Filippov (16): bmc/datetime/ntpconfig: add interface support bmc/syslog: add implementation user: multiple deletion support health: logs: Use dreport instead of journalctl health: logs: export: remove obsolete bundles health: logs: fix error on show hostlogger Fix misspelling Fix 2-level subcommands execution vegman: bmc datetime set: fix execution vegman: bmc power: use hostpwrctl Improve health logs clear command vegman: led: fix ID LED state determination vegman: datetime: Remove manual settings time vegman: datetime: Masquerade manual sync method health: log: journalcopy dreport plugin support health: logs: clean: fix cleaning order Andrei Kartashev (1): show error when no groups match regexp Igor Kononenko (6): vegman: Support virtual media and NBD client remotemedia: Add the NBD export name flag bmc: remoteimage: Remove CLI command host: Update the 'virtualmedia' command host: virtualmedia: Support the HTTP protocol bmc info version: Only show active versions Ivan Mikhaylov (1): vegman: add audit logs for user actions v.mitrofanov (3): host: Add 'config default' command Refactor help formatting host: Add 'nmi' command Change-Id: Ic2dee1c43c1662c2355ad3bdd9b96451f3a9f212 Signed-off-by: Alexander Filippov --- meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'meta-yadro') diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb index 558c7612c..5cdf3164d 100644 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb +++ b/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb @@ -13,10 +13,11 @@ DEPENDS = "phosphor-user-manager" RDEPENDS_${PN} = " \ ${VIRTUAL-RUNTIME_base-utils} \ bash \ - obmc-console \ obmc-yadro-fwupdate \ obmc-yadro-lssensors \ obmc-yadro-netconfig \ + phosphor-debug-collector-dreport \ + phosphor-debug-collector-scripts \ sudo \ systemd \ " @@ -27,11 +28,12 @@ RDEPENDS_${PN} = " \ # Directory with command handlers FILES_${PN} += "${datadir}/cli" +MACHINE_NAME ?= "${MACHINE}" # Custom installation procedure do_install() { ${B}/install.sh \ --dir ${D} \ - --machine ${@'${MACHINE}'.split('-')[0]} \ + --machine ${@'${MACHINE_NAME}'.split('-')[0]} \ --admin priv-admin \ --operator priv-operator \ --user priv-user @@ -40,4 +42,4 @@ do_install() { # Source code repository S = "${WORKDIR}/git" SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-cli" -SRCREV = "29768c2fb743318d459a40281e328ee8e8944a75" +SRCREV = "76743c3706516bae6b2bb8749706b4ea673e9358" -- cgit v1.2.3