From 159656b66145821f2f60c89c54cd7584cf23e70d Mon Sep 17 00:00:00 2001 From: Marcello Sylvester Bauer Date: Thu, 1 Nov 2018 13:07:23 +0100 Subject: LinuxBoot: fix custom defconfig override The default ARCH defconfig should not override a custom defconfig. Change-Id: I9de24497ef6296029c66a94124bc11a0bb4d0107 Signed-off-by: Marcello Sylvester Bauer Reviewed-on: https://review.coreboot.org/29424 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Patrick Rudolph --- payloads/external/LinuxBoot/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'payloads/external') diff --git a/payloads/external/LinuxBoot/Makefile b/payloads/external/LinuxBoot/Makefile index c0513897aa..b8e2c51b83 100644 --- a/payloads/external/LinuxBoot/Makefile +++ b/payloads/external/LinuxBoot/Makefile @@ -52,8 +52,7 @@ config: $(kernel_dir)/.config echo " CONFIG Linux $(CONFIG_LINUXBOOT_KERNEL_VERSION)" ifneq ($(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE),) cp $(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE) $(kernel_dir)/.config -endif -ifeq ($(CONFIG_LINUXBOOT_ARCH),386) +else ifeq ($(CONFIG_LINUXBOOT_ARCH),386) cp x86/defconfig $(kernel_dir)/.config else ifeq ($(CONFIG_LINUXBOOT_ARCH),amd64) cp x86_64/defconfig $(kernel_dir)/.config -- cgit v1.2.3