From patchwork Mon Mar 7 17:37:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Moffett X-Patchwork-Id: 85773 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 61477B70F0 for ; Tue, 8 Mar 2011 04:39:56 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8D0F62813D; Mon, 7 Mar 2011 18:39:08 +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 MXJsO6BSBoix; Mon, 7 Mar 2011 18:39:08 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8B47C28088; Mon, 7 Mar 2011 18:38:32 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B4FB2280AA for ; Mon, 7 Mar 2011 18:38:23 +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 MKqs73craUMM for ; Mon, 7 Mar 2011 18:38:23 +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 border.exmeritus.com (wsip-70-167-241-26.dc.dc.cox.net [70.167.241.26]) by theia.denx.de (Postfix) with ESMTP id 46FB5280A0 for ; Mon, 7 Mar 2011 18:38:21 +0100 (CET) Received: from ysera.exmeritus.com (firewall2.exmeritus.com [10.13.38.2]) by border.exmeritus.com (Postfix) with ESMTP id 89271AC080; Mon, 7 Mar 2011 12:38:20 -0500 (EST) From: Kyle Moffett To: u-boot@lists.denx.de Date: Mon, 7 Mar 2011 12:37:27 -0500 Message-Id: <1299519462-25320-7-git-send-email-Kyle.D.Moffett@boeing.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1299519462-25320-1-git-send-email-Kyle.D.Moffett@boeing.com> References: <1299519462-25320-1-git-send-email-Kyle.D.Moffett@boeing.com> Cc: Kyle Moffett , Kyle Moffett Subject: [U-Boot] [PATCH 06/21] arm: Rename nonstandard board_reset() as at91_board_reset() 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 The ARM AT91 port calls a customized board_reset() function after disabling interrupts and stopping the serial console. Since this function is not architecture-generic and not compatible with the new platform-independent meaning for __board_restart(), we rename it here to be at91_board_reset(). Signed-off-by: Kyle Moffett Cc: Albert Aribaud Cc: Reinhard Meyer --- arch/arm/cpu/arm920t/at91/reset.c | 4 ++-- arch/arm/cpu/arm920t/at91rm9200/reset.c | 6 +++--- board/atmel/at91rm9200dk/at91rm9200dk.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/cpu/arm920t/at91/reset.c b/arch/arm/cpu/arm920t/at91/reset.c index 51043ec..c82a431 100644 --- a/arch/arm/cpu/arm920t/at91/reset.c +++ b/arch/arm/cpu/arm920t/at91/reset.c @@ -35,7 +35,7 @@ #include #include -void __attribute__((weak)) board_reset(void) +void __attribute__((weak)) at91_board_reset(void) { /* true empty function for defining weak symbol */ } @@ -48,7 +48,7 @@ void reset_cpu(ulong ignored) serial_exit(); #endif - board_reset(); + at91_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), diff --git a/arch/arm/cpu/arm920t/at91rm9200/reset.c b/arch/arm/cpu/arm920t/at91rm9200/reset.c index 945ea2c..523f835 100644 --- a/arch/arm/cpu/arm920t/at91rm9200/reset.c +++ b/arch/arm/cpu/arm920t/at91rm9200/reset.c @@ -33,7 +33,7 @@ #include #include -void board_reset(void) __attribute__((__weak__)); +void at91_board_reset(void) __attribute__((__weak__)); /* * Reset the cpu by setting up the watchdog timer and let him time out @@ -47,8 +47,8 @@ void reset_cpu (ulong ignored) serial_exit(); #endif - if (board_reset) - board_reset(); + if (at91_board_reset) + at91_board_reset(); /* this is the way Linux does it */ diff --git a/board/atmel/at91rm9200dk/at91rm9200dk.c b/board/atmel/at91rm9200dk/at91rm9200dk.c index 49b5fe3..0fbf2a9 100644 --- a/board/atmel/at91rm9200dk/at91rm9200dk.c +++ b/board/atmel/at91rm9200dk/at91rm9200dk.c @@ -60,7 +60,7 @@ int board_init (void) return 0; } -void board_reset (void) +void at91_board_reset (void) { AT91PS_PIO pio = AT91C_BASE_PIOA;