summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-12-17 20:02:05 +0100
committerWolfgang Denk <wd@denx.de>2010-12-17 20:02:05 +0100
commit2a9a2339a4ea04636ed0968e76eeaf784e987f52 (patch)
treee4891391ce68c96ee779c195d0d92aea89fccc01 /board
parent3ac45988ab1605baaf83bd3acb80a197c9a208c2 (diff)
parent85579906cb241ab0f544a2d5ba6d9e33714ec897 (diff)
downloadu-boot-imx-2a9a2339a4ea04636ed0968e76eeaf784e987f52.zip
u-boot-imx-2a9a2339a4ea04636ed0968e76eeaf784e987f52.tar.gz
u-boot-imx-2a9a2339a4ea04636ed0968e76eeaf784e987f52.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board')
-rw-r--r--board/emk/top9000/Makefile6
-rw-r--r--board/emk/top9000/top9000.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/board/emk/top9000/Makefile b/board/emk/top9000/Makefile
index 9b28048..3ac6f14 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 b0fe2d6..73dd706 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