X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=6b2aac6713c4ac35820c96b8d1307f6479af00d9;hb=refs%2Fheads%2Fnext;hp=4981a2ed6f4ab16200fe347161c3f0774393f40e;hpb=1d12a7c8cd4e58d5c3989bc239d5fa9577079dfd;p=u-boot diff --git a/Makefile b/Makefile index 4981a2ed6f..6b2aac6713 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # VERSION = 2018 -PATCHLEVEL = 01 +PATCHLEVEL = 03 SUBLEVEL = EXTRAVERSION = NAME = @@ -820,7 +820,7 @@ LDFLAGS_u-boot += $(LDFLAGS_FINAL) # Avoid 'Not enough room for program headers' error on binutils 2.28 onwards. LDFLAGS_u-boot += $(call ld-option, --no-dynamic-linker) -ifneq ($(CONFIG_SYS_TEXT_BASE),) +ifeq ($(CONFIG_ARC)$(CONFIG_NIOS2)$(CONFIG_X86)$(CONFIG_XTENSA),) LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE) endif @@ -926,6 +926,16 @@ OBJCOPYFLAGS_u-boot.srec := -O srec u-boot.hex u-boot.srec: u-boot FORCE $(call if_changed,objcopy) +OBJCOPYFLAGS_u-boot-elf.srec := $(OBJCOPYFLAGS_u-boot.srec) + +u-boot-elf.srec: u-boot.elf FORCE + $(call if_changed,objcopy) + +OBJCOPYFLAGS_u-boot-spl.srec = $(OBJCOPYFLAGS_u-boot.srec) + +spl/u-boot-spl.srec: spl/u-boot-spl FORCE + $(call if_changed,objcopy) + OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \ $(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec) @@ -1053,6 +1063,7 @@ u-boot-dtb.img u-boot.img u-boot.kwb u-boot.pbl u-boot-ivt.img: \ u-boot.itb: u-boot-nodtb.bin dts/dt.dtb $(U_BOOT_ITS) FORCE $(call if_changed,mkfitimage) + $(BOARD_SIZE_CHECK) u-boot-spl.kwb: u-boot.img spl/u-boot-spl.bin FORCE $(call if_changed,mkimage)