X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=Makefile;h=1687e2e90abe4353e47a76f496ee7949df58e487;hb=0d74665059943dc207df995e21a4767ca3e51a05;hp=e6f6edbb3a6d459a121d6c8d284f5343bf05a0a2;hpb=7f673c99c2d8d1aa21996c5b914f06d784b080ca;p=karo-tx-uboot.git diff --git a/Makefile b/Makefile index e6f6edbb3a..1687e2e90a 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ VERSION = 2014 PATCHLEVEL = 01 SUBLEVEL = -EXTRAVERSION = -rc2 +EXTRAVERSION = ifneq "$(SUBLEVEL)" "" U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) else @@ -419,8 +419,8 @@ $(obj)u-boot.kwb: $(obj)u-boot.bin -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@ $(obj)u-boot.pbl: $(obj)u-boot.bin - $(obj)tools/mkimage -n $(CONFIG_PBLRCW_CONFIG) \ - -R $(CONFIG_PBLPBI_CONFIG) -T pblimage \ + $(obj)tools/mkimage -n $(CONFIG_SYS_FSL_PBL_RCW) \ + -R $(CONFIG_SYS_FSL_PBL_PBI) -T pblimage \ -d $< $@ $(obj)u-boot.sha1: $(obj)u-boot.bin