summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2024-07-06 22:52:31 +0200
committerFelix Singer <felixsinger@posteo.net>2024-07-09 01:59:08 +0000
commit055ec248a059c857a3477c9f83a265f7ff052ce4 (patch)
tree436f9d224b8f1cecc614fa12cd80159c58fdf698
parent6841670e4d7cdd0b9a2d74c2133b5a742d114564 (diff)
payloads/ipxe/kconfig: Fix option name prefix
With commit 238ff1e9c7 ("payloads/ipxe: Prefix iPXE options with "IPXE" instead "PXE""), the prefix for iPXE related Kconfig identifiers was unified to "IPXE". So rename the identifier for the TRUST_CMD option as well, which was introduced later. Change-Id: I918358b859003503526ba7849494bb23f8c893fd Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/83361 Reviewed-by: Nicholas Chin <nic.c3.14@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--payloads/external/Makefile.mk2
-rw-r--r--payloads/external/iPXE/Kconfig2
-rw-r--r--payloads/external/iPXE/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/payloads/external/Makefile.mk b/payloads/external/Makefile.mk
index 73b600b2bb..53693f5917 100644
--- a/payloads/external/Makefile.mk
+++ b/payloads/external/Makefile.mk
@@ -381,7 +381,7 @@ payloads/external/iPXE/ipxe/ipxe.rom ipxe: $(DOTCONFIG) $(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) \
- CONFIG_PXE_TRUST_CMD=$(CONFIG_PXE_TRUST_CMD)
+ CONFIG_IPXE_TRUST_CMD=$(CONFIG_IPXE_TRUST_CMD)
# LinuxBoot
LINUXBOOT_CROSS_COMPILE_ARCH-$(CONFIG_LINUXBOOT_X86) = x86_32
diff --git a/payloads/external/iPXE/Kconfig b/payloads/external/iPXE/Kconfig
index 02dce27848..ff25d81957 100644
--- a/payloads/external/iPXE/Kconfig
+++ b/payloads/external/iPXE/Kconfig
@@ -108,7 +108,7 @@ config IPXE_HAS_HTTPS
Enable HTTPS protocol, which allows you to encrypt all communication
with a web server and to verify the server's identity
-config PXE_TRUST_CMD
+config IPXE_TRUST_CMD
bool "Enable TRUST commands"
default y
help
diff --git a/payloads/external/iPXE/Makefile b/payloads/external/iPXE/Makefile
index 91074fea99..7ec8126c97 100644
--- a/payloads/external/iPXE/Makefile
+++ b/payloads/external/iPXE/Makefile
@@ -52,7 +52,7 @@ endif
ifeq ($(CONFIG_IPXE_HAS_HTTPS),y)
sed -i'' 's|.*DOWNLOAD_PROTO_HTTPS|#define DOWNLOAD_PROTO_HTTPS|g' "$(project_dir)/src/config/general.h"
endif
-ifeq ($(CONFIG_PXE_TRUST_CMD),y)
+ifeq ($(CONFIG_IPXE_TRUST_CMD),y)
sed -i'' 's|.*IMAGE_TRUST_CMD|#define IMAGE_TRUST_CMD|g' "$(project_dir)/src/config/general.h"
endif