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 'master' of git://www.denx.de/git/u-boot-mips
[oweals/u-boot.git]
/
cpu
/
mips
/
config.mk
diff --git
a/cpu/mips/config.mk
b/cpu/mips/config.mk
index b29986e26b7bac08bb20653a0ac7fc8a2a58577f..a173c5480c0131e2c89808fee7f6398737061b52 100644
(file)
--- a/
cpu/mips/config.mk
+++ b/
cpu/mips/config.mk
@@
-20,9
+20,8
@@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
#
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
#
-v=$(shell \
-$(CROSS_COMPILE)as --version|grep "GNU assembler"|awk '{print $$3}'|awk -F . '{print $$2}')
-MIPSFLAGS=$(shell \
+v=$(shell $(AS) --version | grep 'GNU assembler' | egrep -o '2\.[0-9\.]+' | cut -d. -f2)
+MIPSFLAGS:=$(shell \
if [ "$v" -lt "14" ]; then \
echo "-mcpu=4kc"; \
else \
if [ "$v" -lt "14" ]; then \
echo "-mcpu=4kc"; \
else \
@@
-35,6
+34,6
@@
else
ENDIANNESS = -EB
endif
ENDIANNESS = -EB
endif
-MIPSFLAGS += $(ENDIANNESS)
-mabicalls
+MIPSFLAGS += $(ENDIANNESS)
PLATFORM_CPPFLAGS += $(MIPSFLAGS)
PLATFORM_CPPFLAGS += $(MIPSFLAGS)