From patchwork Thu Dec 9 09:46:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reinhard Meyer X-Patchwork-Id: 74859 X-Patchwork-Delegate: info@emk-elektronik.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id C5A70B70A3 for ; Thu, 9 Dec 2010 20:30:56 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 39E4A2809C; Thu, 9 Dec 2010 10:30:55 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dH9qpzOqXgBf; Thu, 9 Dec 2010 10:30:55 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F331F280AC; Thu, 9 Dec 2010 10:30:52 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E18C6280AC for ; Thu, 9 Dec 2010 10:30:50 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WXV6Wfc7qAZc for ; Thu, 9 Dec 2010 10:30:50 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.171]) by theia.denx.de (Postfix) with ESMTP id 327352809C for ; Thu, 9 Dec 2010 10:30:50 +0100 (CET) Received: from sieb.alb.sub.de (p5B20298A.dip0.t-ipconnect.de [91.32.41.138]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0LcC9p-1Q9pQT3QM1-00k53k; Thu, 09 Dec 2010 10:30:49 +0100 From: Reinhard Meyer To: u-boot@lists.denx.de Date: Thu, 9 Dec 2010 10:46:04 +0100 Message-Id: <1291887964-2537-1-git-send-email-u-boot@emk-elektronik.de> X-Mailer: git-send-email 1.7.3.3.398.g0b0cd X-Provags-ID: V02:K0:7yaKgVaDBGg2ZEPgErYFLjb97qtou/k1yBmOKFFyQVu m+LSzWyZzA8s0Kx7L5IxLZrcd6DI9fTKV1zKTTZ+njKGUgb2eo 7Zv3F6sgchkUXYKpXlOAHLfD8bWKDUNgpfM6+YJXS/H//tdRc6 WoCh412BUnam7/3pCkqg18jYUNyFKY5uI9bOEwlKjXitpnpBAH LKd2u0kxeOEDqXuo0re3PgGYWpS+DITJljnlz5j6bU= Subject: [U-Boot] [PATCH 1/2] AT91: fix TOP9000 built issues X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 --- 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