From 6dce55ea7d64234908ff05fab68c0ecf00779811 Mon Sep 17 00:00:00 2001 From: Maximilian Brune Date: Mon, 24 Jul 2023 18:08:07 +0200 Subject: payloads/external/Linuxboot/Makefile: Guard u-root Makefile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The u-root.mk makefile needs to be guarded, because it introduces a dependency on the go tooling. Signed-off-by: Maximilian Brune Change-Id: Ia89e4e7b9a1f73a7b622eeaa8d6148d99f9b327a Reviewed-on: https://review.coreboot.org/c/coreboot/+/76714 Tested-by: build bot (Jenkins) Reviewed-by: Marvin Drees Reviewed-by: Felix Held Reviewed-by: Fred Reitberger Reviewed-by: Kyösti Mälkki --- payloads/external/LinuxBoot/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'payloads/external') diff --git a/payloads/external/LinuxBoot/Makefile b/payloads/external/LinuxBoot/Makefile index d12d323f5e..9a9409eaa3 100644 --- a/payloads/external/LinuxBoot/Makefile +++ b/payloads/external/LinuxBoot/Makefile @@ -13,7 +13,11 @@ LINUX_ARCH-$(CONFIG_LINUXBOOT_RISCV_RV64) = riscv build/Image: $(CONFIG_LINUXBOOT_KERNEL_PATH) ln -s -r $< $@ -include targets/linux.mk targets/u-root.mk + +include targets/linux.mk +ifeq ($(CONFIG_LINUXBOOT_UROOT),y) +include targets/u-root.mk +endif build/initramfs: $(CONFIG_LINUXBOOT_INITRAMFS_PATH) ifeq ($(CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ),y) -- cgit v1.2.3