diff options
| author | Felix Singer <felixsinger@posteo.net> | 2023-11-05 02:09:34 +0000 |
|---|---|---|
| committer | Felix Singer <service+coreboot-gerrit@felixsinger.de> | 2023-11-11 01:26:09 +0000 |
| commit | 238ff1e9c71d58f1f691afaec4b64032d92f2ea8 (patch) | |
| tree | ca2bc6e04e3a3f29440ff26786d7a1cfd3a3e585 /payloads/external/Makefile.inc | |
| parent | 596c6f3a2e4431cbb0468b6e3524e01953461079 (diff) | |
payloads/ipxe: Prefix iPXE options with "IPXE" instead "PXE"
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>
Diffstat (limited to 'payloads/external/Makefile.inc')
| -rw-r--r-- | payloads/external/Makefile.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 22b1bd38f6..c87f140da4 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -346,14 +346,14 @@ endif ifeq ($(CONFIG_BUILD_IPXE),y) PXE_ROM_FILE:=payloads/external/iPXE/ipxe/ipxe.rom endif -ifeq ($(CONFIG_PXE_ADD_SCRIPT),y) -PXE_CONFIG_SCRIPT:=$(abspath $(patsubst "%",%,$(CONFIG_PXE_SCRIPT))) +ifeq ($(CONFIG_IPXE_ADD_SCRIPT),y) +IPXE_CONFIG_SCRIPT:=$(abspath $(patsubst "%",%,$(CONFIG_IPXE_SCRIPT))) endif ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy) IPXE_UART=COM$(call int-add,$(CONFIG_UART_FOR_CONSOLE) 1) endif -ifeq ($(CONFIG_PXE_SERIAL_CONSOLE),y) +ifeq ($(CONFIG_IPXE_SERIAL_CONSOLE),y) IPXE_SERIAL_CONSOLE = $(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO) else 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-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 \ CROSS_COMPILE="$(CROSS_COMPILE_$(ARCH-ramstage-y))" \ 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) \ IPXE_UART=$(IPXE_UART) \ CONFIG_TTYS0_BAUD=$(CONFIG_TTYS0_BAUD) \ - CONFIG_SCRIPT=$(PXE_CONFIG_SCRIPT) \ - CONFIG_HAS_SCRIPT=$(CONFIG_PXE_ADD_SCRIPT) \ - CONFIG_PXE_NO_PROMPT=$(CONFIG_PXE_NO_PROMPT) \ - CONFIG_PXE_HAS_HTTPS=$(CONFIG_PXE_HAS_HTTPS) \ + CONFIG_SCRIPT=$(IPXE_CONFIG_SCRIPT) \ + CONFIG_HAS_SCRIPT=$(CONFIG_IPXE_ADD_SCRIPT) \ + CONFIG_IPXE_NO_PROMPT=$(CONFIG_IPXE_NO_PROMPT) \ + CONFIG_IPXE_HAS_HTTPS=$(CONFIG_IPXE_HAS_HTTPS) \ MFLAGS= MAKEFLAGS= # LinuxBoot |