diff options
Diffstat (limited to 'meta-yadro/meta-vesnin')
10 files changed, 41 insertions, 97 deletions
diff --git a/meta-yadro/meta-vesnin/conf/machine/vesnin.conf b/meta-yadro/meta-vesnin/conf/machine/vesnin.conf index fc448de86..6ba66faa4 100644 --- a/meta-yadro/meta-vesnin/conf/machine/vesnin.conf +++ b/meta-yadro/meta-vesnin/conf/machine/vesnin.conf @@ -14,8 +14,6 @@ FLASH_SIZE = "32768" SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS4" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "vesnin-ipmi-inventory-map-native" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-inventory = "vesnin-ipmi-inventory-map-read-native" 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" diff --git a/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/0001-vesnin-dts-add-mbox-and-lpc_host.patch b/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/0001-vesnin-dts-add-mbox-and-lpc_host.patch deleted file mode 100644 index ba03640d6..000000000 --- a/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/0001-vesnin-dts-add-mbox-and-lpc_host.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 229cd43c240a8395ac6ed684a5eee7a0586f9724 Mon Sep 17 00:00:00 2001 -From: Alexander Filippov <a.filippov@yadro.com> -Date: Tue, 4 Jun 2019 14:12:00 +0300 -Subject: [PATCH] vesnin: dts: add mbox and lpc_host - -These nodes were removed from our DTS by the ask of Andrew Jeffery as -its are not upstreamed yet. But its are still required to start the -host. - -Signed-off-by: Alexander Filippov <a.filippov@yadro.com> ---- - arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts b/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts -index 0b9e29c3212e..20f07f5bb4f4 100644 ---- a/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts -+++ b/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts -@@ -120,6 +120,16 @@ - status = "okay"; - }; - -+&lpc_host { -+ sio_regs: regs { -+ compatible = "aspeed,bmc-misc"; -+ }; -+}; -+ -+&mbox { -+ status = "okay"; -+}; -+ - &uart3 { - status = "okay"; - pinctrl-names = "default"; --- -2.20.1 - 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 index fb286691d..a745a18a7 100644 --- 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 @@ -1,4 +1,4 @@ -From 85027d94696464269ae77702ead788a14fc8305f Mon Sep 17 00:00:00 2001 +From c10401d8c349610ea9cd29d28f87dd630c907aeb Mon Sep 17 00:00:00 2001 From: Alexander Filippov <a.filippov@yadro.com> Date: Wed, 28 Mar 2018 17:46:28 +0300 Subject: [PATCH] vesnin: remap aspeed-uart @@ -7,14 +7,14 @@ Remaps UART2 <-> UART3 Signed-off-by: Alexander Filippov <a.filippov@yadro.com> --- - drivers/misc/aspeed-lpc-ctrl.c | 8 ++++++++ + drivers/soc/aspeed/aspeed-lpc-ctrl.c | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/drivers/misc/aspeed-lpc-ctrl.c b/drivers/misc/aspeed-lpc-ctrl.c -index 332210e06e98..ce5138474130 100644 ---- a/drivers/misc/aspeed-lpc-ctrl.c -+++ b/drivers/misc/aspeed-lpc-ctrl.c -@@ -27,6 +27,7 @@ +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 @@ -22,7 +22,7 @@ index 332210e06e98..ce5138474130 100644 struct aspeed_lpc_ctrl { struct miscdevice miscdev; -@@ -274,6 +275,13 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev) +@@ -271,6 +272,13 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev) goto err; } diff --git a/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed_%.bbappend index 5a8925301..5680c6938 100644 --- a/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,6 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_vesnin = "\ file://vesnin.cfg \ - file://0001-vesnin-dts-add-mbox-and-lpc_host.patch \ 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 new file mode 100644 index 000000000..dc786e562 --- /dev/null +++ b/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb @@ -0,0 +1,23 @@ +SUMMARY = "YAML configuration for Vesnin" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${YADROBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +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/ipmi/vesnin-ipmi-inventory-map/config.yaml b/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config/vesnin-ipmi-fru.yaml index 26c7831b9..26c7831b9 100644 --- a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map/config.yaml +++ b/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config/vesnin-ipmi-fru.yaml 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 new file mode 100644 index 000000000..3ee4501d7 --- /dev/null +++ b/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -0,0 +1,5 @@ +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 new file mode 100644 index 000000000..cf846c7fa --- /dev/null +++ b/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -0,0 +1,5 @@ +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/ipmi/vesnin-ipmi-inventory-map-native.bb b/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map-native.bb deleted file mode 100644 index efea9368a..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map-native.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Vesnin IPMI to DBus Inventory mapping." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${YADROBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-ipmi-fru - -SRC_URI += "file://config.yaml" - -PROVIDES += "virtual/phosphor-ipmi-fru-inventory" - -S = "${WORKDIR}" - -do_install() { - # TODO: install this to inventory_datadir - # after ipmi-fru-parser untangles the host - # firmware config from the machine inventory. - DEST=${D}${config_datadir} - - install -d ${DEST} - install config.yaml ${DEST} -} diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map-read-native.bb b/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map-read-native.bb deleted file mode 100644 index e4d3bd509..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/vesnin-ipmi-inventory-map-read-native.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Vesnin IPMI to DBus Inventory mapping." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${YADROBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-ipmi-host - -FILESEXTRAPATHS_prepend := "${THISDIR}/vesnin-ipmi-inventory-map:" - -SRC_URI += "file://config.yaml" - -PROVIDES += "virtual/phosphor-ipmi-fru-read-inventory" - -S = "${WORKDIR}" - -do_install() { - # TODO: install this to inventory_datadir - # after ipmi-fru-parser untangles the host - # firmware config from the machine inventory. - DEST=${D}${config_datadir} - - install -d ${DEST} - install config.yaml ${DEST} -} |