Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41831 )
Change subject: payloads/external: s/PROMT/PROMPT/g ......................................................................
payloads/external: s/PROMT/PROMPT/g
Change-Id: Id305d9edecac9e9cd305301e9dc5af6678ef7528 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M payloads/external/Makefile.inc M payloads/external/iPXE/Kconfig M payloads/external/iPXE/Makefile 3 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/41831/1
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 46d70c4..be4b139 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -253,7 +253,7 @@ CONFIG_TTYS0_BAUD=$(CONFIG_TTYS0_BAUD) \ CONFIG_SCRIPT=$(PXE_CONFIG_SCRIPT) \ CONFIG_HAS_SCRIPT=$(CONFIG_PXE_ADD_SCRIPT) \ - CONFIG_PXE_NO_PROMT=$(CONFIG_PXE_NO_PROMT) \ + CONFIG_PXE_NO_PROMPT=$(CONFIG_PXE_NO_PROMPT) \ CONFIG_PXE_HAS_HTTPS=$(CONFIG_PXE_HAS_HTTPS) \ MFLAGS= MAKEFLAGS=
diff --git a/payloads/external/iPXE/Kconfig b/payloads/external/iPXE/Kconfig index 2aa9dbe..0b81d18 100644 --- a/payloads/external/iPXE/Kconfig +++ b/payloads/external/iPXE/Kconfig @@ -78,7 +78,7 @@
Unselect to let only SeaBIOS handle printing output.
-config PXE_NO_PROMT +config PXE_NO_PROMPT bool "Do not show prompt to boot from PXE" default n depends on BUILD_IPXE diff --git a/payloads/external/iPXE/Makefile b/payloads/external/iPXE/Makefile index c426bd3..2a9e8c9 100644 --- a/payloads/external/iPXE/Makefile +++ b/payloads/external/iPXE/Makefile @@ -45,14 +45,14 @@ sed 's|#define\s*COMCONSOLE.*|#define COMCONSOLE $(IPXE_UART)|' "$(project_dir)/src/config/serial.h" > "$(project_dir)/src/config/serial.h.tmp" sed 's|#define\s*COMSPEED.*|#define COMSPEED $(CONFIG_TTYS0_BAUD)|' "$(project_dir)/src/config/serial.h.tmp" > "$(project_dir)/src/config/serial.h" endif -ifneq ($(filter y,$(CONFIG_HAS_SCRIPT) $(CONFIG_PXE_NO_PROMT)),) +ifneq ($(filter y,$(CONFIG_HAS_SCRIPT) $(CONFIG_PXE_NO_PROMPT)),) cp "$(project_dir)/src/config/general.h" "$(project_dir)/src/config/general.h.cb" endif ifeq ($(CONFIG_HAS_SCRIPT),y) sed 's|//#define\s*IMAGE_SCRIPT.*|#define IMAGE_SCRIPT|' "$(project_dir)/src/config/general.h" > "$(project_dir)/src/config/general.h.tmp" mv "$(project_dir)/src/config/general.h.tmp" "$(project_dir)/src/config/general.h" endif -ifeq ($(CONFIG_PXE_NO_PROMT),y) +ifeq ($(CONFIG_PXE_NO_PROMPT),y) sed 's|#define\s*BANNER_TIMEOUT.*|#define BANNER_TIMEOUT 0|' "$(project_dir)/src/config/general.h" > "$(project_dir)/src/config/general.h.tmp" mv "$(project_dir)/src/config/general.h.tmp" "$(project_dir)/src/config/general.h" endif @@ -74,7 +74,7 @@ cp "$(project_dir)/src/config/console.h.cb" "$(project_dir)/src/config/console.h" cp "$(project_dir)/src/config/serial.h.cb" "$(project_dir)/src/config/serial.h" endif -ifneq ($(filter y,$(CONFIG_HAS_SCRIPT) $(CONFIG_PXE_NO_PROMT)),) +ifneq ($(filter y,$(CONFIG_HAS_SCRIPT) $(CONFIG_PXE_NO_PROMPT)),) cp "$(project_dir)/src/config/general.h.cb" "$(project_dir)/src/config/general.h" endif
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41831 )
Change subject: payloads/external: s/PROMT/PROMPT/g ......................................................................
Patch Set 1: Code-Review+1
Angel Pons has removed a vote from this change. ( https://review.coreboot.org/c/coreboot/+/41831 )
Change subject: payloads/external: s/PROMT/PROMPT/g ......................................................................
Removed Verified+1 by build bot (Jenkins) no-reply@coreboot.org
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41831 )
Change subject: payloads/external: s/PROMT/PROMPT/g ......................................................................
Patch Set 2: Code-Review+2
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41831 )
Change subject: payloads/external: s/PROMT/PROMPT/g ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/41831/2//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/41831/2//COMMIT_MSG@7 PS2, Line 7: g unnecessary
Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/41831 )
Change subject: payloads/external: s/PROMT/PROMPT/g ......................................................................
payloads/external: s/PROMT/PROMPT/g
Change-Id: Id305d9edecac9e9cd305301e9dc5af6678ef7528 Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/41831 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Nico Huber nico.h@gmx.de Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net --- M payloads/external/Makefile.inc M payloads/external/iPXE/Kconfig M payloads/external/iPXE/Makefile 3 files changed, 5 insertions(+), 5 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Paul Menzel: Looks good to me, but someone else must approve
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 46d70c4..be4b139 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -253,7 +253,7 @@ CONFIG_TTYS0_BAUD=$(CONFIG_TTYS0_BAUD) \ CONFIG_SCRIPT=$(PXE_CONFIG_SCRIPT) \ CONFIG_HAS_SCRIPT=$(CONFIG_PXE_ADD_SCRIPT) \ - CONFIG_PXE_NO_PROMT=$(CONFIG_PXE_NO_PROMT) \ + CONFIG_PXE_NO_PROMPT=$(CONFIG_PXE_NO_PROMPT) \ CONFIG_PXE_HAS_HTTPS=$(CONFIG_PXE_HAS_HTTPS) \ MFLAGS= MAKEFLAGS=
diff --git a/payloads/external/iPXE/Kconfig b/payloads/external/iPXE/Kconfig index 2aa9dbe..0b81d18 100644 --- a/payloads/external/iPXE/Kconfig +++ b/payloads/external/iPXE/Kconfig @@ -78,7 +78,7 @@
Unselect to let only SeaBIOS handle printing output.
-config PXE_NO_PROMT +config PXE_NO_PROMPT bool "Do not show prompt to boot from PXE" default n depends on BUILD_IPXE diff --git a/payloads/external/iPXE/Makefile b/payloads/external/iPXE/Makefile index c426bd3..2a9e8c9 100644 --- a/payloads/external/iPXE/Makefile +++ b/payloads/external/iPXE/Makefile @@ -45,14 +45,14 @@ sed 's|#define\s*COMCONSOLE.*|#define COMCONSOLE $(IPXE_UART)|' "$(project_dir)/src/config/serial.h" > "$(project_dir)/src/config/serial.h.tmp" sed 's|#define\s*COMSPEED.*|#define COMSPEED $(CONFIG_TTYS0_BAUD)|' "$(project_dir)/src/config/serial.h.tmp" > "$(project_dir)/src/config/serial.h" endif -ifneq ($(filter y,$(CONFIG_HAS_SCRIPT) $(CONFIG_PXE_NO_PROMT)),) +ifneq ($(filter y,$(CONFIG_HAS_SCRIPT) $(CONFIG_PXE_NO_PROMPT)),) cp "$(project_dir)/src/config/general.h" "$(project_dir)/src/config/general.h.cb" endif ifeq ($(CONFIG_HAS_SCRIPT),y) sed 's|//#define\s*IMAGE_SCRIPT.*|#define IMAGE_SCRIPT|' "$(project_dir)/src/config/general.h" > "$(project_dir)/src/config/general.h.tmp" mv "$(project_dir)/src/config/general.h.tmp" "$(project_dir)/src/config/general.h" endif -ifeq ($(CONFIG_PXE_NO_PROMT),y) +ifeq ($(CONFIG_PXE_NO_PROMPT),y) sed 's|#define\s*BANNER_TIMEOUT.*|#define BANNER_TIMEOUT 0|' "$(project_dir)/src/config/general.h" > "$(project_dir)/src/config/general.h.tmp" mv "$(project_dir)/src/config/general.h.tmp" "$(project_dir)/src/config/general.h" endif @@ -74,7 +74,7 @@ cp "$(project_dir)/src/config/console.h.cb" "$(project_dir)/src/config/console.h" cp "$(project_dir)/src/config/serial.h.cb" "$(project_dir)/src/config/serial.h" endif -ifneq ($(filter y,$(CONFIG_HAS_SCRIPT) $(CONFIG_PXE_NO_PROMT)),) +ifneq ($(filter y,$(CONFIG_HAS_SCRIPT) $(CONFIG_PXE_NO_PROMPT)),) cp "$(project_dir)/src/config/general.h.cb" "$(project_dir)/src/config/general.h" endif
9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41831 )
Change subject: payloads/external: s/PROMT/PROMPT/g ......................................................................
Patch Set 3:
Automatic boot test returned (PASS/FAIL/TOTAL): 4/0/4 Emulation targets: "QEMU x86 q35/ich9" using payload TianoCore : SUCCESS : https://lava.9esec.io/r/5186 "QEMU x86 q35/ich9" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/5185 "QEMU x86 i440fx/piix4" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/5184 "QEMU AArch64" using payload LinuxBoot_u-root_kexec : SUCCESS : https://lava.9esec.io/r/5183
Please note: This test is under development and might not be accurate at all!