diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
commit | bb6a14e2f317abf60677c6ad8de9c33d5760bf36 (patch) | |
tree | 00457d3677e86437cec25fd7dab6c4513a53b1a4 /meta-fii/meta-kudo/recipes-phosphor | |
parent | defdca82c107f46e980c84bffb1b2c1263522fa0 (diff) | |
parent | cf6fd27dbd8e2d1b507f8c3752b85801b2c6ef57 (diff) | |
download | openbmc-bb6a14e2f317abf60677c6ad8de9c33d5760bf36.tar.xz |
Merge tag '0.63' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-fii/meta-kudo/recipes-phosphor')
5 files changed, 6 insertions, 11 deletions
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" |