diff options
Diffstat (limited to 'arch/arm/lib')
-rw-r--r-- | arch/arm/lib/Makefile | 10 | ||||
-rw-r--r-- | arch/arm/lib/board.c | 2 | ||||
-rw-r--r-- | arch/arm/lib/cache.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 0293348..454440c 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -23,8 +23,8 @@ include $(TOPDIR)/config.mk -LIB = $(obj)lib$(ARCH).a -LIBGCC = $(obj)libgcc.a +LIB = $(obj)lib$(ARCH).o +LIBGCC = $(obj)libgcc.o GLSOBJS += _ashldi3.o GLSOBJS += _ashrdi3.o @@ -51,7 +51,7 @@ OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) LGOBJS := $(addprefix $(obj),$(GLSOBJS)) \ $(addprefix $(obj),$(GLCOBJS)) -# Always build libarm.a +# Always build libarm.o TARGETS := $(LIB) # Build private libgcc only when asked for @@ -67,10 +67,10 @@ endif all: $(TARGETS) $(LIB): $(obj).depend $(OBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) + $(call cmd_link_o_target, $(OBJS)) $(LIBGCC): $(obj).depend $(LGOBJS) - $(AR) $(ARFLAGS) $@ $(LGOBJS) + $(call cmd_link_o_target, $(LGOBJS)) ######################################################################### diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 1fd5f83..96c0e30 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -276,7 +276,7 @@ void board_init_f (ulong bootflag) ulong addr, addr_sp; /* Pointer is writable since we allocated a register for it */ - gd = (gd_t *) (CONFIG_SYS_INIT_SP_ADDR); + gd = (gd_t *) ((CONFIG_SYS_INIT_SP_ADDR) & ~0x07); /* compiler optimization barrier needed for GCC >= 3.4 */ __asm__ __volatile__("": : :"memory"); diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c index 5715168..30686fe 100644 --- a/arch/arm/lib/cache.c +++ b/arch/arm/lib/cache.c @@ -38,7 +38,7 @@ void flush_cache (unsigned long dummy1, unsigned long dummy2) /* disable write buffer as well (page 2-22) */ asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (0)); #endif -#ifdef CONFIG_ARMV7 +#ifdef CONFIG_OMAP34XX void v7_flush_cache_all(void); v7_flush_cache_all(); |