X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=b6f83a553052940a8e91d441350556d9d10ce1f1;hb=dc9cdf859e11de775e75cc233b09d6b6d257a818;hp=0dc6c53fcfc8fe3d70b9a5a55a5aea04e4873abc;hpb=2650dbcf8a9ddfee4c5bf2d1c961c303988c9f97;p=u-boot diff --git a/Makefile b/Makefile index 0dc6c53fcf..b6f83a5530 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2015 PATCHLEVEL = 07 SUBLEVEL = -EXTRAVERSION = -rc3 +EXTRAVERSION = NAME = # *DOCUMENTATION* @@ -1035,8 +1035,8 @@ ifneq ($(CONFIG_HAVE_CMC),) IFDTOOL_FLAGS += -w $(CONFIG_CMC_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_CMC_FILE) endif -ifneq ($(CONFIG_X86_OPTION_ROM_ADDR),) -IFDTOOL_FLAGS += -w $(CONFIG_X86_OPTION_ROM_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_X86_OPTION_ROM_FILE) +ifneq ($(CONFIG_HAVE_VGA_BIOS),) +IFDTOOL_FLAGS += -w $(CONFIG_VGA_BIOS_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_VGA_BIOS_FILE) endif quiet_cmd_ifdtool = IFDTOOL $@