Skip to content

Commit 8b479b0

Browse files
authored
Merge pull request #1317 from tlaurion/fix-sh_argument_expected
Add DEBUG statements in code and fix "sh: argument expected"
2 parents 9676c79 + 8259d3c commit 8b479b0

43 files changed

Lines changed: 151 additions & 2 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ export CONFIG_COREBOOT=y
88
export CONFIG_COREBOOT_VERSION=4.13
99
export CONFIG_LINUX_VERSION=5.10.5
1010

11+
#Enable DEBUG output
12+
export CONFIG_DEBUG_OUTPUT=y
13+
export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
14+
1115
CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-tpm1.config
1216
CONFIG_LINUX_CONFIG=config/linux-qemu.config
1317

boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ export CONFIG_COREBOOT=y
66
export CONFIG_COREBOOT_VERSION=4.13
77
export CONFIG_LINUX_VERSION=5.10.5
88

9+
#Enable DEBUG output
10+
export CONFIG_DEBUG_OUTPUT=y
11+
export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
12+
913
CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-tpm1.config
1014
CONFIG_LINUX_CONFIG=config/linux-qemu.config
1115

boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ export CONFIG_COREBOOT=y
88
export CONFIG_COREBOOT_VERSION=4.13
99
export CONFIG_LINUX_VERSION=5.10.5
1010

11+
#Enable DEBUG output
12+
export CONFIG_DEBUG_OUTPUT=y
13+
export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
14+
1115
CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-tpm1.config
1216
CONFIG_LINUX_CONFIG=config/linux-qemu.config
1317

boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ export CONFIG_COREBOOT=y
66
export CONFIG_COREBOOT_VERSION=4.13
77
export CONFIG_LINUX_VERSION=5.10.5
88

9+
#Enable DEBUG output
10+
export CONFIG_DEBUG_OUTPUT=y
11+
export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
12+
913
CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-tpm1.config
1014
CONFIG_LINUX_CONFIG=config/linux-qemu.config
1115

initrd/bin/cbfs-init

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
set -e -o pipefail
33
. /etc/functions
44

5+
TRACE "Under /bin/cbfs-init"
6+
57
# Update initrd with CBFS files
68
if [ -z "$CONFIG_PCR" ]; then
79
CONFIG_PCR=7

initrd/bin/cbfs.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ set -e -o pipefail
33
. /etc/functions
44
. /tmp/config
55

6+
TRACE "Under /bin/cbfs.sh"
7+
68
if pnor "$2" -r HBI > /tmp/pnor.part 2>/dev/null; then
79
cbfs "$@" -o /tmp/pnor.part && pnor "$2" -w HBI < /tmp/pnor.part
810
else

initrd/bin/config-gui.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ set -e -o pipefail
55
. /etc/gui_functions
66
. /tmp/config
77

8+
TRACE "Under /bin/config-gui.sh"
9+
810
param=$1
911

1012
while true; do

initrd/bin/flash-gui.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ set -e -o pipefail
55
. /etc/gui_functions
66
. /tmp/config
77

8+
TRACE "Under /bin/flash-gui.sh"
9+
810
while true; do
911
unset menu_choice
1012
whiptail $BG_COLOR_MAIN_MENU --title "Firmware Management Menu" \

initrd/bin/flash.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ set -e -o pipefail
66
. /etc/functions
77
. /tmp/config
88

9+
TRACE "Under /bin/flash.sh"
10+
911
case "$CONFIG_FLASHROM_OPTIONS" in
1012
-* )
1113
echo "Board $CONFIG_BOARD detected, continuing..."

initrd/bin/flashrom-kgpe-d16-openbmc.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/sh
22
. /etc/functions
33

4+
TRACE "Under /bin/flashrom-kgpe-d16-openbmc.sh"
5+
46
ROM="$1"
57
if [ -z "$1" ]; then
68
die "Usage: $0 /media/kgpe-d16-openbmc.rom"

0 commit comments

Comments
 (0)