diff options
| -rw-r--r-- | payloads/external/Makefile.inc | 16 | ||||
| -rw-r--r-- | payloads/external/iPXE/Kconfig | 12 | ||||
| -rw-r--r-- | payloads/external/iPXE/Makefile | 8 |
3 files changed, 18 insertions, 18 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 diff --git a/payloads/external/iPXE/Kconfig b/payloads/external/iPXE/Kconfig index acb5796d09..2ad39a1a6b 100644 --- a/payloads/external/iPXE/Kconfig +++ b/payloads/external/iPXE/Kconfig @@ -68,7 +68,7 @@ config IPXE_MASTER endchoice -config PXE_SERIAL_CONSOLE +config IPXE_SERIAL_CONSOLE bool "Enable iPXE serial console" def_bool y help @@ -77,22 +77,22 @@ config PXE_SERIAL_CONSOLE 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" default n help 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. -config PXE_ADD_SCRIPT +config IPXE_ADD_SCRIPT bool "Embed an iPXE script for automated provisioning" default n help 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" - depends on PXE_ADD_SCRIPT + depends on IPXE_ADD_SCRIPT default "" help 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: "Press Ctrl-B to start iPXE..." -config PXE_HAS_HTTPS +config IPXE_HAS_HTTPS bool "Enable HTTPS protocol" default y help diff --git a/payloads/external/iPXE/Makefile b/payloads/external/iPXE/Makefile index 773a1a2005..6f5525bcd6 100644 --- a/payloads/external/iPXE/Makefile +++ b/payloads/external/iPXE/Makefile @@ -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*COMSPEED.*|#define COMSPEED $(CONFIG_TTYS0_BAUD)|' "$(project_dir)/src/config/serial.h" 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" endif ifeq ($(CONFIG_HAS_SCRIPT),y) sed -i'' 's|//#define\s*IMAGE_SCRIPT.*|#define IMAGE_SCRIPT|' "$(project_dir)/src/config/general.h" 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" 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" 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/serial.h.cb" "$(project_dir)/src/config/serial.h" 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" endif |