[coreboot-gerrit] Change in coreboot[master]: LinuxBoot: fix custom defconfig override

[Philipp Deppenwiese (Code Review)]

Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/29424 )

Change subject: LinuxBoot: fix custom defconfig override
......................................................................

LinuxBoot: fix custom defconfig override

The default ARCH defconfig should not override a custom defconfig.

Change-Id: I9de24497ef6296029c66a94124bc11a0bb4d0107
Signed-off-by: Marcello Sylvester Bauer <info at marcellobauer.com>
Reviewed-on: https://review.coreboot.org/29424
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
Reviewed-by: Paul Menzel <paulepanter at users.sourceforge.net>
Reviewed-by: Patrick Rudolph <siro at das-labor.org>
---
M payloads/external/LinuxBoot/Makefile
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Patrick Rudolph: Looks good to me, approved



diff --git a/payloads/external/LinuxBoot/Makefile b/payloads/external/LinuxBoot/Makefile
index c051389..b8e2c51 100644
--- a/payloads/external/LinuxBoot/Makefile
+++ b/payloads/external/LinuxBoot/Makefile
@@ -52,8 +52,7 @@
 	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

-- 
To view, visit https://review.coreboot.org/29424
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I9de24497ef6296029c66a94124bc11a0bb4d0107
Gerrit-Change-Number: 29424
Gerrit-PatchSet: 2
Gerrit-Owner: Marcello Sylvester Bauer <info at marcellobauer.com>
Gerrit-Reviewer: Marcello Sylvester Bauer <info at marcellobauer.com>
Gerrit-Reviewer: Patrick Rudolph <siro at das-labor.org>
Gerrit-Reviewer: Paul Menzel <paulepanter at users.sourceforge.net>
Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki at gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181102/d58f2a59/attachment.html>