sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

payloads/ipxe: Prefix iPXE options with "IPXE" instead "PXE"

Browse Source 
Change-Id: Ieef433e9d6745c6243b4823c9a7f250d3c53ebcb
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78926
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Felix Singer
2023-11-05 02:09:34 +00:00
committed by Felix Singer
parent 596c6f3a2e
commit 238ff1e9c7
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
payloads/external/Makefile.inc vendored
View File

@@ -346,14 +346,14 @@ endif
ifeq ($(CONFIG_BUILD_IPXE),y) ifeq ($(CONFIG_BUILD_IPXE),y)
PXE_ROM_FILE:=payloads/external/iPXE/ipxe/ipxe.rom PXE_ROM_FILE:=payloads/external/iPXE/ipxe/ipxe.rom
endif endif
ifeq ($(CONFIG_PXE_ADD_SCRIPT),y) ifeq ($(CONFIG_IPXE_ADD_SCRIPT),y)
PXE_CONFIG_SCRIPT:=$(abspath $(patsubst "%",%,$(CONFIG_PXE_SCRIPT))) IPXE_CONFIG_SCRIPT:=$(abspath $(patsubst "%",%,$(CONFIG_IPXE_SCRIPT)))
endif endif
ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy) ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy)
IPXE_UART=COM$(call int-add,$(CONFIG_UART_FOR_CONSOLE) 1) IPXE_UART=COM$(call int-add,$(CONFIG_UART_FOR_CONSOLE) 1)
endif endif
ifeq ($(CONFIG_PXE_SERIAL_CONSOLE),y) ifeq ($(CONFIG_IPXE_SERIAL_CONSOLE),y)
IPXE_SERIAL_CONSOLE = $(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO) IPXE_SERIAL_CONSOLE = $(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO)
else else
IPXE_SERIAL_CONSOLE = n IPXE_SERIAL_CONSOLE = n
@@ -363,7 +363,7 @@ cbfs-files-$(CONFIG_PXE_ROM)$(CONFIG_BUILD_IPXE) += pci$(CONFIG_PXE_ROM_ID).rom
pci$(CONFIG_PXE_ROM_ID).rom-file := $(PXE_ROM_FILE) pci$(CONFIG_PXE_ROM_ID).rom-file := $(PXE_ROM_FILE)
pci$(CONFIG_PXE_ROM_ID).rom-type := raw pci$(CONFIG_PXE_ROM_ID).rom-type := raw
payloads/external/iPXE/ipxe/ipxe.rom ipxe: $(DOTCONFIG) $(PXE_CONFIG_SCRIPT) payloads/external/iPXE/ipxe/ipxe.rom ipxe: $(DOTCONFIG) $(IPXE_CONFIG_SCRIPT)
$(MAKE) -C payloads/external/iPXE all \ $(MAKE) -C payloads/external/iPXE all \
CROSS_COMPILE="$(CROSS_COMPILE_$(ARCH-ramstage-y))" \ CROSS_COMPILE="$(CROSS_COMPILE_$(ARCH-ramstage-y))" \
PXE_ROM_PCI_ID=$(PXE_ROM_PCI_ID) \ PXE_ROM_PCI_ID=$(PXE_ROM_PCI_ID) \
@@ -372,10 +372,10 @@ payloads/external/iPXE/ipxe/ipxe.rom ipxe: $(DOTCONFIG) $(PXE_CONFIG_SCRIPT)
CONSOLE_SERIAL=$(IPXE_SERIAL_CONSOLE) \ CONSOLE_SERIAL=$(IPXE_SERIAL_CONSOLE) \
IPXE_UART=$(IPXE_UART) \ IPXE_UART=$(IPXE_UART) \
CONFIG_TTYS0_BAUD=$(CONFIG_TTYS0_BAUD) \ CONFIG_TTYS0_BAUD=$(CONFIG_TTYS0_BAUD) \
CONFIG_SCRIPT=$(PXE_CONFIG_SCRIPT) \ CONFIG_SCRIPT=$(IPXE_CONFIG_SCRIPT) \
CONFIG_HAS_SCRIPT=$(CONFIG_PXE_ADD_SCRIPT) \ CONFIG_HAS_SCRIPT=$(CONFIG_IPXE_ADD_SCRIPT) \
CONFIG_PXE_NO_PROMPT=$(CONFIG_PXE_NO_PROMPT) \ CONFIG_IPXE_NO_PROMPT=$(CONFIG_IPXE_NO_PROMPT) \
CONFIG_PXE_HAS_HTTPS=$(CONFIG_PXE_HAS_HTTPS) \ CONFIG_IPXE_HAS_HTTPS=$(CONFIG_IPXE_HAS_HTTPS) \
MFLAGS= MAKEFLAGS= MFLAGS= MAKEFLAGS=
# LinuxBoot # LinuxBoot

12
payloads/external/iPXE/Kconfig vendored
View File

@@ -68,7 +68,7 @@ config IPXE_MASTER
endchoice endchoice
config PXE_SERIAL_CONSOLE config IPXE_SERIAL_CONSOLE
bool "Enable iPXE serial console" bool "Enable iPXE serial console"
def_bool y def_bool y
help help
@@ -77,22 +77,22 @@ config PXE_SERIAL_CONSOLE
Unselect to let only SeaBIOS handle printing output. Unselect to let only SeaBIOS handle printing output.
config PXE_NO_PROMPT config IPXE_NO_PROMPT
bool "Do not show prompt to boot from PXE" bool "Do not show prompt to boot from PXE"
default n default n
help help
Don't wait for the user to press Ctrl-B. Don't wait for the user to press Ctrl-B.
The PXE still can be run as it shows up in SeaBIOS's payload list. The PXE still can be run as it shows up in SeaBIOS's payload list.
config PXE_ADD_SCRIPT config IPXE_ADD_SCRIPT
bool "Embed an iPXE script for automated provisioning" bool "Embed an iPXE script for automated provisioning"
default n default n
help help
Enable to embed a script that is run instead of an iPXE shell. Enable to embed a script that is run instead of an iPXE shell.
config PXE_SCRIPT config IPXE_SCRIPT
string "Embedded iPXE script path and filename" string "Embedded iPXE script path and filename"
depends on PXE_ADD_SCRIPT depends on IPXE_ADD_SCRIPT
default "" default ""
help help
Path to a script that is embedded into the iPXE binary. Path to a script that is embedded into the iPXE binary.
@@ -101,7 +101,7 @@ config PXE_SCRIPT
Uses the ipxe script instead showing the prompt: Uses the ipxe script instead showing the prompt:
"Press Ctrl-B to start iPXE..." "Press Ctrl-B to start iPXE..."
config PXE_HAS_HTTPS config IPXE_HAS_HTTPS
bool "Enable HTTPS protocol" bool "Enable HTTPS protocol"
default y default y
help help

8
payloads/external/iPXE/Makefile vendored
View File

@@ -40,16 +40,16 @@ ifeq ($(CONSOLE_SERIAL),yy)
sed -i'' 's|#define\s*COMCONSOLE.*|#define COMCONSOLE $(IPXE_UART)|' "$(project_dir)/src/config/serial.h" sed -i'' 's|#define\s*COMCONSOLE.*|#define COMCONSOLE $(IPXE_UART)|' "$(project_dir)/src/config/serial.h"
sed -i'' 's|#define\s*COMSPEED.*|#define COMSPEED $(CONFIG_TTYS0_BAUD)|' "$(project_dir)/src/config/serial.h" sed -i'' 's|#define\s*COMSPEED.*|#define COMSPEED $(CONFIG_TTYS0_BAUD)|' "$(project_dir)/src/config/serial.h"
endif endif
ifneq ($(filter y,$(CONFIG_HAS_SCRIPT) $(CONFIG_PXE_NO_PROMPT)),) ifneq ($(filter y,$(CONFIG_HAS_SCRIPT) $(CONFIG_IPXE_NO_PROMPT)),)
cp "$(project_dir)/src/config/general.h" "$(project_dir)/src/config/general.h.cb" cp "$(project_dir)/src/config/general.h" "$(project_dir)/src/config/general.h.cb"
endif endif
ifeq ($(CONFIG_HAS_SCRIPT),y) ifeq ($(CONFIG_HAS_SCRIPT),y)
sed -i'' 's|//#define\s*IMAGE_SCRIPT.*|#define IMAGE_SCRIPT|' "$(project_dir)/src/config/general.h" sed -i'' 's|//#define\s*IMAGE_SCRIPT.*|#define IMAGE_SCRIPT|' "$(project_dir)/src/config/general.h"
endif endif
ifeq ($(CONFIG_PXE_NO_PROMPT),y) ifeq ($(CONFIG_IPXE_NO_PROMPT),y)
sed -i'' 's|#define\s*BANNER_TIMEOUT.*|#define BANNER_TIMEOUT 0|' "$(project_dir)/src/config/general.h" sed -i'' 's|#define\s*BANNER_TIMEOUT.*|#define BANNER_TIMEOUT 0|' "$(project_dir)/src/config/general.h"
endif endif
ifeq ($(CONFIG_PXE_HAS_HTTPS),y) ifeq ($(CONFIG_IPXE_HAS_HTTPS),y)
sed -i'' 's|.*DOWNLOAD_PROTO_HTTPS|#define DOWNLOAD_PROTO_HTTPS|g' "$(project_dir)/src/config/general.h" sed -i'' 's|.*DOWNLOAD_PROTO_HTTPS|#define DOWNLOAD_PROTO_HTTPS|g' "$(project_dir)/src/config/general.h"
endif endif
@@ -66,7 +66,7 @@ ifeq ($(CONSOLE_SERIAL),yy)
cp "$(project_dir)/src/config/console.h.cb" "$(project_dir)/src/config/console.h" 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" cp "$(project_dir)/src/config/serial.h.cb" "$(project_dir)/src/config/serial.h"
endif endif
ifneq ($(filter y,$(CONFIG_HAS_SCRIPT) $(CONFIG_PXE_NO_PROMPT)),) ifneq ($(filter y,$(CONFIG_HAS_SCRIPT) $(CONFIG_IPXE_NO_PROMPT)),)
cp "$(project_dir)/src/config/general.h.cb" "$(project_dir)/src/config/general.h" cp "$(project_dir)/src/config/general.h.cb" "$(project_dir)/src/config/general.h"
endif endif