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

Marcello Sylvester Bauer (Code Review) gerrit at coreboot.org
Thu Nov 1 13:14:05 CET 2018


Marcello Sylvester Bauer has uploaded this change for review. ( 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>
---
M payloads/external/LinuxBoot/Makefile
1 file changed, 1 insertion(+), 2 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/29424/1

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: newchange
Gerrit-Change-Id: I9de24497ef6296029c66a94124bc11a0bb4d0107
Gerrit-Change-Number: 29424
Gerrit-PatchSet: 1
Gerrit-Owner: Marcello Sylvester Bauer <info at marcellobauer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181101/c5fe4a35/attachment.html>


More information about the coreboot-gerrit mailing list