Merge git://git.denx.de/u-boot-x86

[u-boot] / Makefile

diff --git a/Makefile b/Makefile
index d074358e2478f8420815c3e490dfbfb54a84efe2..79150bb0178617b22fd98443c0698501cd5bc1b3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -796,7 +796,7 @@ ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf
 ALL-$(CONFIG_EFI_APP) += u-boot-app.efi
 ALL-$(CONFIG_EFI_STUB) += u-boot-payload.efi
 
-ifneq ($(BUILD_ROM),)
+ifneq ($(BUILD_ROM)$(CONFIG_BUILD_ROM),)
 ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom
 endif