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@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