diff options
Diffstat (limited to 'meta-fii')
13 files changed, 22 insertions, 24 deletions
diff --git a/meta-fii/meta-kudo/conf/local.conf.sample b/meta-fii/meta-kudo/conf/local.conf.sample index cc5544d95..8d07a5b5b 100644 --- a/meta-fii/meta-kudo/conf/local.conf.sample +++ b/meta-fii/meta-kudo/conf/local.conf.sample @@ -3,7 +3,7 @@ DISTRO ?= "openbmc-phosphor" PACKAGE_CLASSES ?= "package_rpm" SANITY_TESTED_DISTROS_append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" -USER_CLASSES ?= "buildstats image-mklibs image-prelink" +USER_CLASSES ?= "buildstats image-prelink" PATCHRESOLVE = "noop" BB_DISKMON_DIRS = "\ STOPTASKS,${TMPDIR},1G,100K \ diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index a016fd760..768719d8b 100644 --- a/meta-fii/meta-kudo/conf/machine/kudo.conf +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -5,18 +5,18 @@ require conf/machine/include/npcm7xx.inc require conf/machine/include/obmc-bsp-common.inc FLASH_SIZE = "65536" -FLASH_UBOOT_OFFSET = "0" -FLASH_KERNEL_OFFSET = "2048" -FLASH_ROFS_OFFSET = "7168" -FLASH_RWFS_OFFSET = "62400" +FLASH_UBOOT_OFFSET_flash-65536 = "0" +FLASH_KERNEL_OFFSET_flash-65536 = "2048" +FLASH_ROFS_OFFSET_flash-65536 = "7168" +FLASH_RWFS_OFFSET_flash-65536 = "62400" UBOOT_MACHINE = "PolegSVB_config" UBOOT_DEVICETREE = "nuvoton-npcm730-kudo" IGPS_MACHINE = "EB" GBMC_MAC_EEPROM_OF_NAME = "bmcfru" -GBMC_MAC_IF_MAP = "eth0" GBMC_NCSI_IF_NAME = "eth0" +GBMC_MAC_IF_MAP = "[0]=eth1" IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot" diff --git a/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb b/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb index c5a4328ae..c0793adf6 100644 --- a/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb +++ b/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb @@ -15,7 +15,7 @@ EXTRA_OECMAKE="-DENABLE_TEST=0 -DYOCTO=1" LIBRARY_NAMES = "libfiioemcmds.so" SRC_URI = "git://github.com/openbmc/foxconn-ipmi-oem.git" -SRCREV = "163226efd02b91994aaa474005979560965ac3d6" +SRCREV = "35c1ac40e476caa19c84a546d4f85ba96cb5dbbd" HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" NETIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh index 498fe7d0a..e0697b906 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh @@ -1,5 +1,5 @@ - #!/bin/bash + BMC_CPLD_VER_FILE="/run/cpld0.version" MB_CPLD_VER_FILE="/run/cpld1.version" ver='' @@ -25,4 +25,4 @@ echo "BMC CPLD version : ${ver}" echo "${ver}" > "${BMC_CPLD_VER_FILE}" fw_rev cpldm echo "MB CPLD version : ${ver}" -echo "${ver}" > "${MB_CPLD_VER_FILE}"
\ No newline at end of file +echo "${ver}" > "${MB_CPLD_VER_FILE}" diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh index 1ef73cc13..d103747b2 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh @@ -41,6 +41,8 @@ function fwbios() { dd if=$1 bs=1024 skip=17156 count=256 of=/run/initramfs/myscp.img fwscp /run/initramfs/myscp.img fi + # Disable LPI mode NV_SI_CPU_LPI_FREQ_DISABLE. + nvparm -s 0x1 -o 0x114090 rm -f $1 } diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb index 8d2fb1324..2c82ac8f6 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb @@ -1,6 +1,5 @@ SUMMARY = "Phosphor OpenBMC Kudo SCP Firmware Upgrade Command" DESCRIPTION = "Phosphor OpenBMC Kudo SCP Firmware Upgrade Comman Daemon" -FILESEXTRAPATHS_prepend := "${THISDIR}/kudo-scp-update:" PR = "r1" LICENSE = "Apache-2.0" diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service index 14c14d480..54c7c7aa1 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service @@ -1,5 +1,7 @@ [Unit] Description = Host Power Control Sequence +Wants=ssifbridge.service +After=ssifbridge.service [Service] Restart=no diff --git a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb index 41a345d8e..07d038024 100644 --- a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb +++ b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb @@ -1,4 +1,4 @@ -SUMMARY = "OpenBMC for KUDO system - Applications" +SUMMARY = "OpenBMC for kudo system - Applications" PR = "r1" inherit packagegroup @@ -17,7 +17,7 @@ RPROVIDES_${PN}-kudo-system += "virtual-obmc-system-mgmt" RPROVIDES_${PN}-kudo-fw += "virtual-obmc-flash-mgmt" RPROVIDES_${PN}-fan-mgmt += "virtual-obmc-fan-mgmt" -SUMMARY_${PN}-kudo-system = "KUDO System" +SUMMARY_${PN}-kudo-system = "kudo System" RDEPENDS_${PN}-kudo-system = " \ ipmitool \ ethtool \ @@ -34,7 +34,7 @@ RDEPENDS_${PN}-kudo-system = " \ kudo-cmd \ " -SUMMARY_${PN}-kudo-fw = "KUDO Firmware" +SUMMARY_${PN}-kudo-fw = "kudo Firmware" RDEPENDS_${PN}-kudo-fw = " \ kudo-fw \ kudo-bios-update \ diff --git a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/kudo.json b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/kudo.json index 6437e77b0..a2cb8750b 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/kudo.json +++ b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/kudo.json @@ -2311,9 +2311,9 @@ "temp13_Name":"CPU0_RCA_VR_T", "power1_Name":"CPU0_CPU_PW", "power2_Name":"CPU0_SOC_TDP_PW", - "pout3_Name":"CPU0_DIMM_VR1_PW", - "pout4_Name":"CPU0_DIMM_VR2_PW", - "pout5_Name":"CPU0_RCA_VR_PW", + "power3_Name":"CPU0_DIMM_VR1_PW", + "power4_Name":"CPU0_DIMM_VR2_PW", + "power5_Name":"CPU0_RCA_VR_PW", "vout0_Name":"CPU0_CPU_VCORE", "vout1_Name":"CPU0_SOC_V", "vout2_Name":"CPU0_DIMM_VR1_V", diff --git a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/kudo_uart_mux_ctrl.sh b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/kudo_uart_mux_ctrl.sh index 27407783e..7b131afbf 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/kudo_uart_mux_ctrl.sh +++ b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/kudo_uart_mux_ctrl.sh @@ -18,13 +18,7 @@ # Usage: ampere_uartmux_ctrl.sh <CPU UART port number> <UARTx_MODE> # <UARTx_MODE> of 1 sets CPU To BSP # <UARTx_MODE> of 2 sets SCP1 to SI2 -function set_gpio_ctrl() { - echo $1 > /sys/class/gpio/export - echo $2 > /sys/class//gpio/gpio$1/direction - echo $3 > /sys/class/gpio/gpio$1/value - echo $1 > /sys/class/gpio/unexport -} - +source /usr/sbin/kudo-lib.sh if [ $# -lt 1 ]; then exit 1 diff --git a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/server.ttyS1.conf b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/server.ttyS1.conf index 1751a0575..e93f0781d 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/server.ttyS1.conf +++ b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/server.ttyS1.conf @@ -1,2 +1,3 @@ baud = 115200 logfile = /var/log/obmc-console-cpu.log +logsize = 1M diff --git a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/server.ttyS3.conf b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/server.ttyS3.conf index c8a9d973e..152c70533 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/server.ttyS3.conf +++ b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/server.ttyS3.conf @@ -1,3 +1,4 @@ baud = 115200 socket-id = ttyS3 logfile = /var/log/obmc-console-scp.log +logsize = 1M diff --git a/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend index 5ec39cde8..87dc22827 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend @@ -7,7 +7,6 @@ OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-host" OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-host-postd" OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-logging" OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-sel-logger" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " usb-network" OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " entity-manager" OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " dbus-sensors" OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-virtual-sensor" |