diff options
| author | Tom Rini <trini@ti.com> | 2015-02-10 10:42:56 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-10 10:42:56 -0500 |
| commit | db7a7dee6878fe7539d5967de1caff83246254e0 (patch) | |
| tree | 27a94cac552d2015cc53cd29658f15f834475a5c /Makefile | |
| parent | c956662cc3e2475b451afa9a8b639c0ccc49d432 (diff) | |
| parent | ba877efb802edb7080703e4dd99e51a437e44f26 (diff) | |
| download | u-boot-imx-db7a7dee6878fe7539d5967de1caff83246254e0.zip u-boot-imx-db7a7dee6878fe7539d5967de1caff83246254e0.tar.gz u-boot-imx-db7a7dee6878fe7539d5967de1caff83246254e0.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -729,8 +729,9 @@ ALL-$(CONFIG_SPL) += $(CONFIG_SPL_TARGET:"%"=%) endif ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf -# We can't do this yet due to the need for binary blobs -# ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom +ifneq ($(BUILD_ROM),) +ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom +endif # enable combined SPL/u-boot/dtb rules for tegra ifneq ($(CONFIG_TEGRA),) |