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
Merge branch 'master' of git://git.denx.de/u-boot-spi
[platform/kernel/u-boot.git]
/
arch
/
arm
/
lib
/
Makefile
diff --git
a/arch/arm/lib/Makefile
b/arch/arm/lib/Makefile
index
39a9550
..
9ecafb2
100644
(file)
--- a/
arch/arm/lib/Makefile
+++ b/
arch/arm/lib/Makefile
@@
-26,7
+26,6
@@
include $(TOPDIR)/config.mk
LIB = $(obj)lib$(ARCH).o
LIBGCC = $(obj)libgcc.o
LIB = $(obj)lib$(ARCH).o
LIBGCC = $(obj)libgcc.o
-ifndef CONFIG_SPL_BUILD
GLSOBJS += _ashldi3.o
GLSOBJS += _ashrdi3.o
GLSOBJS += _divsi3.o
GLSOBJS += _ashldi3.o
GLSOBJS += _ashrdi3.o
GLSOBJS += _divsi3.o
@@
-37,15
+36,27
@@
GLSOBJS += _umodsi3.o
GLCOBJS += div0.o
GLCOBJS += div0.o
+SOBJS-y += crt0.o
+
+ifndef CONFIG_SPL_BUILD
+SOBJS-y += relocate.o
+ifndef CONFIG_SYS_GENERIC_BOARD
COBJS-y += board.o
COBJS-y += board.o
+endif
+COBJS-y += sections.o
+
COBJS-y += bootm.o
COBJS-y += bootm.o
+COBJS-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
COBJS-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
COBJS-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
-COBJS-y += interrupts.o
-COBJS-y += reset.o
SOBJS-$(CONFIG_USE_ARCH_MEMSET) += memset.o
SOBJS-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o
SOBJS-$(CONFIG_USE_ARCH_MEMSET) += memset.o
SOBJS-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o
+else
+COBJS-$(CONFIG_SPL_FRAMEWORK) += spl.o
endif
endif
+COBJS-y += interrupts.o
+COBJS-y += reset.o
+
COBJS-y += cache.o
COBJS-y += cache-cp15.o
COBJS-y += cache.o
COBJS-y += cache-cp15.o