From f805548b28f90aa76374b16f86206dd3a5743d23 Mon Sep 17 00:00:00 2001 From: Reinhard Meyer Date: Thu, 9 Dec 2010 10:07:31 +0100 Subject: AT91: fix TOP9000 build problem and change CONFIG_SYS_TEXT_BASE Signed-off-by: Reinhard Meyer --- board/emk/top9000/Makefile | 6 +++--- board/emk/top9000/top9000.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'board/emk') diff --git a/board/emk/top9000/Makefile b/board/emk/top9000/Makefile index 9b280482a9..3ac6f14f84 100644 --- a/board/emk/top9000/Makefile +++ b/board/emk/top9000/Makefile @@ -26,9 +26,9 @@ include $(TOPDIR)/config.mk -LIB = $(obj)lib$(BOARD).a +LIB = $(obj)lib$(BOARD).o -COBJS-y += top9000.o +COBJS-y += $(BOARD).o COBJS-$(CONFIG_ATMEL_SPI) += spi.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) @@ -36,7 +36,7 @@ OBJS := $(addprefix $(obj),$(COBJS-y)) SOBJS := $(addprefix $(obj),$(SOBJS)) $(LIB): $(obj).depend $(OBJS) $(SOBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS) $(SOBJS)) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/emk/top9000/top9000.c b/board/emk/top9000/top9000.c index b0fe2d68a8..73dd706207 100644 --- a/board/emk/top9000/top9000.c +++ b/board/emk/top9000/top9000.c @@ -120,7 +120,7 @@ int board_mmc_getcd(u8 *cd, struct mmc *mmc) int board_early_init_f(void) { - at91_shdwn_t *shdwn = (at91_shdwn_t *)AT91_SHDWN_BASE; + struct at91_shdwn *shdwn = (struct at91_shdwn *)AT91_SHDWN_BASE; /* * make sure the board can be powered on by -- cgit v1.2.1