diff options
| author | Marcello Sylvester Bauer <info@marcellobauer.com> | 2018-11-01 13:07:23 +0100 |
|---|---|---|
| committer | Philipp Deppenwiese <zaolin.daisuki@gmail.com> | 2018-11-02 14:57:50 +0000 |
| commit | 159656b66145821f2f60c89c54cd7584cf23e70d (patch) | |
| tree | 7281b51db15e01be2ce6ba5f5c326549fea15a02 | |
| parent | d385624ee67cfa732eddf7ceadf9404452c0136e (diff) | |
| download | coreboot-159656b66145821f2f60c89c54cd7584cf23e70d.tar.xz | |
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@marcellobauer.com>
Reviewed-on: https://review.coreboot.org/29424
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
| -rw-r--r-- | payloads/external/LinuxBoot/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
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 |