summaryrefslogtreecommitdiff
path: root/config.mk
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2006-11-10 07:48:47 +0100
committerStefan Roese <sr@denx.de>2006-11-10 07:48:47 +0100
commitdfc8a9ee0040e53ada125a3c52f241e37f09cf28 (patch)
tree60fd3973150a4e6b3d9d129d117ecab71b5edabe /config.mk
parent5c912cb1c31266c66ca59b36f9b6f87296421d75 (diff)
parent91650b3e4de688038d4f71279c44858e3e2c6870 (diff)
downloadu-boot-imx-dfc8a9ee0040e53ada125a3c52f241e37f09cf28.zip
u-boot-imx-dfc8a9ee0040e53ada125a3c52f241e37f09cf28.tar.gz
u-boot-imx-dfc8a9ee0040e53ada125a3c52f241e37f09cf28.tar.bz2
Merge with /home/stefan/git/u-boot/denx
Diffstat (limited to 'config.mk')
-rw-r--r--config.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/config.mk b/config.mk
index 0f5d0f4..6e280bc 100644
--- a/config.mk
+++ b/config.mk
@@ -25,7 +25,7 @@
ifneq ($(OBJTREE),$(SRCTREE))
ifeq ($(CURDIR),$(SRCTREE))
-dir :=
+dir :=
else
dir := $(subst $(SRCTREE)/,,$(CURDIR))
endif
@@ -127,6 +127,11 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump
RANLIB = $(CROSS_COMPILE)RANLIB
+ifneq (,$(findstring s,$(MAKEFLAGS)))
+ARFLAGS = cr
+else
+ARFLAGS = crv
+endif
RELFLAGS= $(PLATFORM_RELFLAGS)
DBGFLAGS= -g # -DDEBUG
OPTFLAGS= -Os #-fomit-frame-pointer
@@ -168,7 +173,9 @@ CFLAGS := $(CPPFLAGS) -Wall -Wno-trigraphs
endif
endif
-AFLAGS_DEBUG := -Wa,-gstabs
+# $(CPPFLAGS) sets -g, which causes gcc to pass a suitable -g<format>
+# option to the assembler.
+AFLAGS_DEBUG :=
# turn jbsr into jsr for m68k
ifeq ($(ARCH),m68k)