projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://www.denx.de/git/u-boot-ppc4xx into next
[oweals/u-boot.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index b4aae898abd4234574a3c281c26b773bb9ba2945..0685ef9955c2115babdee36cd9c879f5ff7cbbc2 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-24,7
+24,7
@@
VERSION = 2010
PATCHLEVEL = 12
SUBLEVEL =
VERSION = 2010
PATCHLEVEL = 12
SUBLEVEL =
-EXTRAVERSION = -rc
1
+EXTRAVERSION = -rc
2
ifneq "$(SUBLEVEL)" ""
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
else
ifneq "$(SUBLEVEL)" ""
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
else
@@
-260,7
+260,7
@@
ifeq ($(SOC),s5pc2xx)
LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
endif
LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
endif
-LIBS := $(addprefix $(obj),$(
LIBS
))
+LIBS := $(addprefix $(obj),$(
sort $(LIBS)
))
.PHONY : $(LIBS) $(TIMESTAMP_FILE) $(VERSION_FILE)
LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o
.PHONY : $(LIBS) $(TIMESTAMP_FILE) $(VERSION_FILE)
LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o