From patchwork Tue Nov 30 19:45:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_Bie=C3=9Fmann?= X-Patchwork-Id: 73647 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 6B6A51007D1 for ; Wed, 1 Dec 2010 06:46:31 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 42F3028192; Tue, 30 Nov 2010 20:46:01 +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 AzpYKVWMOlq6; Tue, 30 Nov 2010 20:46:01 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CE1CB281CA; Tue, 30 Nov 2010 20:45:48 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0A0AB28191 for ; Tue, 30 Nov 2010 20:45:30 +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 CItK03nDPpcL for ; Tue, 30 Nov 2010 20:45:28 +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 mail-yw0-f44.google.com (mail-yw0-f44.google.com [209.85.213.44]) by theia.denx.de (Postfix) with ESMTP id 073F528181 for ; Tue, 30 Nov 2010 20:45:25 +0100 (CET) Received: by ywh2 with SMTP id 2so2874134ywh.3 for ; Tue, 30 Nov 2010 11:45:24 -0800 (PST) Received: by 10.204.73.75 with SMTP id p11mr7417108bkj.46.1291146322505; Tue, 30 Nov 2010 11:45:22 -0800 (PST) Received: from andreas-mbp.erlangen.biessmann.tld (dslb-092-075-127-153.pools.arcor-ip.net [92.75.127.153]) by mx.google.com with ESMTPS id v1sm2926755bkt.5.2010.11.30.11.45.20 (version=SSLv3 cipher=RC4-MD5); Tue, 30 Nov 2010 11:45:21 -0800 (PST) From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= To: u-boot@lists.denx.de Date: Tue, 30 Nov 2010 20:45:05 +0100 Message-Id: <1291146306-15103-4-git-send-email-andreas.devel@googlemail.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1291146306-15103-1-git-send-email-andreas.devel@googlemail.com> References: <1291146306-15103-1-git-send-email-andreas.devel@googlemail.com> MIME-Version: 1.0 Cc: Albert ARIBAUD , =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= Subject: [U-Boot] [PATCH v2 3/4] arm920t/at91/reset: board_reset: define weak symbol 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: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Andreas Bießmann Signed-off-by: Andreas Bießmann --- remove 'arm920t: fix linker skript for -pie linking' in favor of this patch arch/arm/cpu/arm920t/at91/reset.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/arm920t/at91/reset.c b/arch/arm/cpu/arm920t/at91/reset.c index ce9c156..7ba0814 100644 --- a/arch/arm/cpu/arm920t/at91/reset.c +++ b/arch/arm/cpu/arm920t/at91/reset.c @@ -35,7 +35,10 @@ #include #include -void board_reset(void) __attribute__((__weak__)); +void __attribute__((weak)) board_reset(void) +{ + /* true empty function for defining weak symbol */ +} void reset_cpu(ulong ignored) { @@ -45,8 +48,7 @@ void reset_cpu(ulong ignored) serial_exit(); #endif - if (board_reset) - board_reset(); + board_reset(); /* Reset the cpu by setting up the watchdog timer */ writel(AT91_ST_WDMR_RSTEN | AT91_ST_WDMR_EXTEN | AT91_ST_WDMR_WDV(2),