Merge pull request #405 from pcengines/ipxe_landing_zone

Ipxe landing zone
pcengines · Jun 1, 2020 · d73c727 · d73c727
2 parents b7d8210 + 706166c
commit d73c727
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 0 deletions.
diff --git a/configs/config.pcengines_apu2_tb_ipxe b/configs/config.pcengines_apu2_tb_ipxe
@@ -0,0 +1,23 @@
+CONFIG_LOCALVERSION="v4.11.0.1"
+CONFIG_VENDOR_PCENGINES=y
+CONFIG_PAYLOAD_CONFIGFILE="$(top)/src/mainboard/$(MAINBOARDDIR)/seabios_config"
+CONFIG_BOARD_PCENGINES_APU2=y
+CONFIG_PXE_ROM_ID="8086,157b"
+CONFIG_NO_GFX_INIT=y
+CONFIG_USER_TPM2=y
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1=y
+CONFIG_SEABIOS_REVISION=y
+CONFIG_SEABIOS_REVISION_ID="rel-1.12.1.3"
+CONFIG_SEABIOS_BOOTORDER_FILE="$(top)/src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/bootorder"
+CONFIG_SEABIOS_DEBUG_LEVEL=0
+CONFIG_PXE=y
+CONFIG_BUILD_IPXE=y
+CONFIG_IPXE_LZ=y
+# CONFIG_PXE_SERIAL_CONSOLE is not set
+CONFIG_PXE_CUSTOM_BUILD_ID="12345678"
+CONFIG_PXE_ADD_SCRIPT=y
+CONFIG_PXE_SCRIPT="payloads/external/iPXE/menu.ipxe"
+CONFIG_MEMTEST_SECONDARY_PAYLOAD=y
+CONFIG_SORTBOOTORDER_SECONDARY_PAYLOAD=y
+CONFIG_MEMTEST_REVISION=y
+CONFIG_MEMTEST_REVISION_ID="0bd34c22604660e4283316331f3e7bf8a3863753"
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
@@ -353,6 +353,7 @@ payloads/external/iPXE/ipxe/ipxe.rom ipxe: $(DOTCONFIG) $(PXE_CONFIG_SCRIPT)
 	PXE_ROM_PCI_ID=$(PXE_ROM_PCI_ID) \
 	CONFIG_IPXE_MASTER=$(CONFIG_IPXE_MASTER) \
 	CONFIG_IPXE_STABLE=$(CONFIG_IPXE_STABLE) \
+	CONFIG_IPXE_LZ=$(CONFIG_IPXE_LZ) \
 	CONSOLE_SERIAL=$(IPXE_SERIAL_CONSOLE) \
 	IPXE_UART=$(IPXE_UART) \
 	CONFIG_TTYS0_BAUD=$(CONFIG_TTYS0_BAUD) \

diff --git a/payloads/external/iPXE/Kconfig b/payloads/external/iPXE/Kconfig
@@ -54,6 +54,11 @@ config IPXE_MASTER
 	help
 	  Newest iPXE version.
 
+config IPXE_LZ
+	bool "landing_zone"
+	help
+	  iPXE with support for TrenchBoot's Landing Zone.
+
 endchoice
 
 config PXE_ROM_FILE

diff --git a/payloads/external/iPXE/Makefile b/payloads/external/iPXE/Makefile
@@ -19,10 +19,15 @@ STABLE_COMMIT_ID=ebf2eaf515e46abd43bc798e7e4ba77bfe529218
 
 TAG-$(CONFIG_IPXE_MASTER)=origin/master
 TAG-$(CONFIG_IPXE_STABLE)=$(STABLE_COMMIT_ID)
+TAG-$(CONFIG_IPXE_LZ)=origin/landing_zone
 
 project_name=iPXE
 project_dir=ipxe
+ifeq ($(CONFIG_IPXE_LZ),y)
+project_git_repo=https://github.com/3mdeb/ipxe.git
+else
 project_git_repo=https://git.ipxe.org/ipxe.git
+endif
 
 unexport KCONFIG_AUTOHEADER
 unexport KCONFIG_AUTOCONFIG