diff options
3 files changed, 3 insertions, 7 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/start_host.sh b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/start_host.sh index a34c03b8c..43b433fc8 100755 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/start_host.sh +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/start_host.sh @@ -2,12 +2,10 @@ # Starts POWER9 IPL (boot) PDBG=${PDBG:-pdbg} -# Argument [device]: if provided, pass to pdbg as "-d [device]" -DEVICE_OPT=${1:+-d $1} putcfam() { - $PDBG $1 -b fsi $DEVICE_OPT putcfam $2 $3 $4 + $PDBG $1 putcfam $2 $3 $4 } #Clock mux select override diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround.sh b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround.sh index 96408a7a0..9ebf60136 100755 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround.sh +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround.sh @@ -2,12 +2,10 @@ # Apply fixes over FSI to POWER9 hosts. Required before VCS rail on. PDBG=${PDBG:-pdbg} -# Argument [device]: if provided, pass to pdbg as "-d [device]" -DEVICE_OPT=${1:+-d $1} putcfam() { - $PDBG -b fsi $DEVICE_OPT $1 putcfam $2 $3 $4 + $PDBG $1 putcfam $2 $3 $4 } # P9 dd1 required workaround needed before powering VCS rails diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb index c1530cddc..d5614c128 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-4.7" LINUX_VERSION ?= "4.7" -SRCREV="cd72aa35e473996f548d8a1612d2e8cf7006f44e" +SRCREV="39eb5a44bfd49fe530f6b68c4d99ab2d8d391be0" require linux-obmc.inc |