diff options
Diffstat (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor')
14 files changed, 118 insertions, 5 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/obmc-console.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf index 638ae7e5d..638ae7e5d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/obmc-console.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/obmc-console.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf index a5ba3f328..a5ba3f328 100755 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/obmc-console.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/client.2201.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/client.2201.conf new file mode 100644 index 000000000..7264e8278 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/client.2201.conf @@ -0,0 +1 @@ +socket-id = guests diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf new file mode 100644 index 000000000..638ae7e5d --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf @@ -0,0 +1,5 @@ +lpc-address = 0x3f8 +sirq = 4 +local-tty = ttyS0 +local-tty-baud = 115200 +logsize = 256k diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf new file mode 100644 index 000000000..e98587f15 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf @@ -0,0 +1,3 @@ +lpc-address = 0x2f8 +sirq = 3 +socket-id = guests diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf new file mode 100644 index 000000000..7264e8278 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf @@ -0,0 +1 @@ +socket-id = guests diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf new file mode 100644 index 000000000..010d82468 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf @@ -0,0 +1,3 @@ +lpc-address = 0x3f8 +sirq = 4 +logsize = 256k diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf new file mode 100644 index 000000000..e98587f15 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf @@ -0,0 +1,3 @@ +lpc-address = 0x2f8 +sirq = 3 +socket-id = guests diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend index 72d991c7e..c10b7ce04 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend @@ -1 +1,64 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_remove = "file://${BPN}.conf" +SRC_URI += "file://server.ttyVUART0.conf" + +install_concurrent_console_config() { + # Install configuration for the servers and clients. Keep commandline + # compatibility with previous configurations by defaulting to not + # specifying a socket-id for VUART0/2200 + install -m 0755 -d ${D}${sysconfdir}/${BPN} + + # Remove the default client configuration as we don't to define a + # socket-id for the 2200 console + rm -f ${D}${sysconfdir}/${BPN}/client.2200.conf + + # However, now link to /dev/null as a way of not specifying a + # socket-id while having a configuration file present. We need to + # provide a configuration path to meet the requirements of the packaged + # unit file. + ln -sr ${D}/dev/null ${D}${sysconfdir}/${BPN}/client.2200.conf + + # We need to populate socket-id for remaining consoles + install -m 0644 ${WORKDIR}/client.2201.conf ${D}${sysconfdir}/${BPN}/ + + # Install configuration for remaining servers - the base recipe + # installs the configuration for the first. + install -m 0644 ${WORKDIR}/server.ttyVUART1.conf ${D}${sysconfdir}/${BPN}/ +} + +SRC_URI_append_rainier = " file://client.2201.conf" +SRC_URI_append_rainier = " file://server.ttyVUART1.conf" + +REGISTERED_SERVICES_${PN}_append_rainier = " obmc_console_guests:tcp:2201:" + +SYSTEMD_SERVICE_${PN}_append_rainier = " obmc-console-ssh@2200.service \ + obmc-console-ssh@2201.service \ + " +SYSTEMD_SERVICE_${PN}_remove_rainier = "obmc-console-ssh.socket" + +FILES_${PN}_remove_rainier = "/lib/systemd/system/obmc-console-ssh@.service.d/use-socket.conf" + +EXTRA_OECONF_append_rainier = " --enable-concurrent-servers" + +do_install_append_rainier() { + install_concurrent_console_config +} + +SRC_URI_append_witherspoon-tacoma = " file://client.2201.conf" +SRC_URI_append_witherspoon-tacoma = " file://server.ttyVUART1.conf" + +REGISTERED_SERVICES_${PN}_append_witherspoon-tacoma = " obmc_console_guests:tcp:2201:" + +SYSTEMD_SERVICE_${PN}_append_witherspoon-tacoma = " obmc-console-ssh@2200.service \ + obmc-console-ssh@2201.service \ + " +SYSTEMD_SERVICE_${PN}_remove_witherspoon-tacoma = "obmc-console-ssh.socket" + +FILES_${PN}_remove_witherspoon-tacoma = "/lib/systemd/system/obmc-console-ssh@.service.d/use-socket.conf" + +EXTRA_OECONF_append_witherspoon-tacoma = " --enable-concurrent-servers" + +do_install_append_witherspoon-tacoma() { + install_concurrent_console_config +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb new file mode 100644 index 000000000..2281192fe --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb @@ -0,0 +1,23 @@ +SUMMARY = "Wistron OEM commands" +DESCRIPTION = "Wistron OEM commands" +HOMEPAGE = "https://github.com/openbmc/wistron-ipmi-oem" +PR = "r1" +PV = "0.1+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" + +inherit autotools pkgconfig +inherit obmc-phosphor-ipmiprovider-symlink + +DEPENDS += "phosphor-ipmi-host" +DEPENDS += "autoconf-archive-native" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/openbmc/wistron-ipmi-oem" +SRCREV = "44cee319dd113335a7885a1ff63a287dc7706682" + +FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" +FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" + +HOSTIPMI_PROVIDER_LIBRARY += "libwistronoem.so" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend index 9dff37d10..5c1d740ba 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -1,2 +1,3 @@ PACKAGECONFIG_append_witherspoon-128 = " openpower-pels" +PACKAGECONFIG_append_witherspoon-tacoma = " openpower-pels" PACKAGECONFIG_append_rainier = " openpower-pels" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 46f8b2766..972dacf45 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -19,13 +19,15 @@ RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-contr RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " witherspoon-fan-watchdog" RDEPENDS_${PN}-extras_append_ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui" RDEPENDS_${PN}-extras_append_rainier = " ${POWER_SERVICE_PACKAGES_RAINIER} phosphor-webui" -RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing" +RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem" RDEPENDS_${PN}-extras_remove_rainier = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS_${PN}-extras_remove_swift = "obmc-ikvm" RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS_${PN}-logging_remove_rainier = "ibm-logging" +RDEPENDS_${PN}-logging_remove_witherspoon-tacoma = "ibm-logging" RDEPENDS_${PN}-extras_append_rainier = " pldm" -RDEPENDS_${PN}-extras_append_witherspoon-128 = " pldm" -RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm" +RDEPENDS_${PN}-extras_append_witherspoon-128 = " pldm openpower-hw-diags" + +RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm openpower-hw-diags" ${PN}-software-extras_append_ibm-ac-server = " phosphor-software-manager-sync" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend index 1caacd1e5..1105e0cf6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend @@ -4,9 +4,9 @@ inherit obmc-phosphor-systemd SRC_URI += "file://psu.json" -EXTRA_OEMESON_${PN}-sequencer += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" +EXTRA_OEMESON += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" -DEPENDS_${PN}-sequencer += " power-sequencer" +DEPENDS += " power-sequencer" do_install_append(){ install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend index 3fc3d487e..6c0cbeba9 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend @@ -7,3 +7,11 @@ do_install_append_swift() { DEST=${D}${inventory_envdir} printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a340.i2c-bus/i2c-8/8-0051/eeprom" >> ${DEST}/inventory } + +do_install_append_witherspoon-tacoma() { + DEST=${D}${inventory_envdir} + printf "FRUS=BMC,ETHERNET" > ${DEST}/inventory + printf "\nPATHS=/system/chassis/motherboard/bmc,/system/chassis/motherboard/bmc/eth0" >> ${DEST}/inventory + printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a600.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory +} + |