projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: tegra: clear $usb_need_init each boot
[platform/kernel/u-boot.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
e6f6edb
..
1687e2e
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-8,7
+8,7
@@
VERSION = 2014
PATCHLEVEL = 01
SUBLEVEL =
VERSION = 2014
PATCHLEVEL = 01
SUBLEVEL =
-EXTRAVERSION =
-rc2
+EXTRAVERSION =
ifneq "$(SUBLEVEL)" ""
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
else
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
-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
-d $< $@
$(obj)u-boot.sha1: $(obj)u-boot.bin