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 'agust@denx.de' of git://git.denx.de/u-boot-staging
[oweals/u-boot.git]
/
arch
/
sh
/
lib
/
Makefile
diff --git
a/arch/sh/lib/Makefile
b/arch/sh/lib/Makefile
index 7f6039699dafadbb675e04a0e402d5ba473305aa..256811afd4b7fa2ff329b7866068cd84202ce5a8 100644
(file)
--- a/
arch/sh/lib/Makefile
+++ b/
arch/sh/lib/Makefile
@@
-21,8
+21,16
@@
include $(TOPDIR)/config.mk
LIB = $(obj)lib$(ARCH).o
include $(TOPDIR)/config.mk
LIB = $(obj)lib$(ARCH).o
+LIBGCC = $(obj)libgcc.o
SOBJS-y +=
SOBJS-y +=
+GLSOBJS += ashiftrt.o
+GLSOBJS += ashiftlt.o
+GLSOBJS += lshiftrt.o
+GLSOBJS += ashldi3.o
+GLSOBJS += ashrsi3.o
+GLSOBJS += lshrdi3.o
+GLSOBJS += movmem.o
COBJS-y += board.o
COBJS-y += bootm.o
COBJS-y += board.o
COBJS-y += bootm.o
@@
-31,13
+39,31
@@
COBJS-y += time_sh2.o
else
COBJS-y += time.o
endif
else
COBJS-y += time.o
endif
+ifeq ($(CONFIG_CMD_SH_ZIMAGEBOOT),y)
+COBJS-y += zimageboot.o
+endif
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
+LGOBJS := $(addprefix $(obj),$(GLSOBJS)) \
+ $(addprefix $(obj),$(GLCOBJS))
+
+# Always build libsh.o
+TARGETS := $(LIB)
+
+# Build private libgcc only when asked for
+ifdef USE_PRIVATE_LIBGCC
+TARGETS += $(LIBGCC)
+endif
+
+all: $(TARGETS)
$(LIB): $(obj).depend $(OBJS)
$(call cmd_link_o_target, $(OBJS))
$(LIB): $(obj).depend $(OBJS)
$(call cmd_link_o_target, $(OBJS))
+$(LIBGCC): $(obj).depend $(LGOBJS)
+ $(call cmd_link_o_target, $(LGOBJS))
+
#########################################################################
# defines $(obj).depend target
#########################################################################
# defines $(obj).depend target