[U-Boot] [PATCH 1/2] AT91: fix TOP9000 built issues

[Reinhard Meyer]

Since I originally made and checked the TOP9000 support patch some changes
to mainline broke the built. This small patch fixes this.

Signed-off-by: Reinhard Meyer <u-boot at emk-elektronik.de>
---
 board/emk/top9000/Makefile  |    6 +++---
 board/emk/top9000/top9000.c |    2 +-
 include/configs/top9000.h   |    8 ++++++--
 3 files changed, 10 insertions(+), 6 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
diff --git a/include/configs/top9000.h b/include/configs/top9000.h
index ff3933b..814fb6c 100644
--- a/include/configs/top9000.h
+++ b/include/configs/top9000.h
@@ -40,9 +40,13 @@
 
 /*
  * Warning: changing CONFIG_SYS_TEXT_BASE requires
- * adapting the initial boot program
+ * adapting the initial boot program.
+ * Guard it since the definition finds its way to the command-line and
+ * causes warnings when this file is included
  */
-#define CONFIG_SYS_TEXT_BASE		0x21f00000	/* 31 MB into RAM */
+#ifndef CONFIG_SYS_TEXT_BASE
+# define CONFIG_SYS_TEXT_BASE		0x21f00000	/* 31 MB into RAM */
+#endif
 
 /* Command line configuration */
 #include <config_cmd_default.h>
-- 
1.7.3.3.398.g0b0cd