From patchwork Fri Apr 13 22:20:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 152408 X-Patchwork-Delegate: trini@ti.com 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 84073B7011 for ; Sat, 14 Apr 2012 08:21:05 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 319442809C; Sat, 14 Apr 2012 00:20:56 +0200 (CEST) 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 7ATX3fxho2JQ; Sat, 14 Apr 2012 00:20:55 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D7375280AF; Sat, 14 Apr 2012 00:20:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D725228087 for ; Sat, 14 Apr 2012 00:20:13 +0200 (CEST) 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 3qtAwlcW8nC0 for ; Sat, 14 Apr 2012 00:20:13 +0200 (CEST) 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-ob0-f172.google.com (mail-ob0-f172.google.com [209.85.214.172]) by theia.denx.de (Postfix) with ESMTPS id 9F9AF2807C for ; Sat, 14 Apr 2012 00:20:12 +0200 (CEST) Received: by mail-ob0-f172.google.com with SMTP id tb4so4761740obb.3 for ; Fri, 13 Apr 2012 15:20:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=VQnvKAQNO/ro1rGurfQ9+Syxv1yuKmGxDZc962hpVqM=; b=wG/N82bnW5q5FuwhfJqLWCkidw8+HE5eyhZT9iP9LRMn2tW3xf2kco1K4zk5N7zCHL Rq0n2gpGqqlvC0TO9Ml/Lt3gqCF1oK24XJMG6mpGPca6p+he8v3o043yG8kFru2NtwBk Y7V0bMrxN9z/1qA0FkwI/qw32Ol40ybP77CV/MTygO0bdk5nobOR0KLJveuEV6KUosSP dfs+rd01aEM+lgzQMUTPjvaRrZwjSKMEjJgPFb+PqW3BSX7EZsNQe18GkPjmCh0opVx1 bvg4r548xCvidKIh3K/GKUc+5NnC6aFtcqUkcq1fiWMEZn1ByK6DWHxfhxk/9CQhBNo0 c9Hg== Received: by 10.182.113.42 with SMTP id iv10mr4594141obb.18.1334355612365; Fri, 13 Apr 2012 15:20:12 -0700 (PDT) Received: from localhost.localdomain (ip68-230-54-74.ph.ph.cox.net. [68.230.54.74]) by mx.google.com with ESMTPS id r8sm9514125oer.6.2012.04.13.15.20.10 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Apr 2012 15:20:11 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Fri, 13 Apr 2012 15:20:03 -0700 Message-Id: <1334355606-16491-6-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1334355606-16491-1-git-send-email-trini@ti.com> References: <1334355606-16491-1-git-send-email-trini@ti.com> Cc: Ilya Yanok Subject: [U-Boot] [PATCH 05/08] omap3: Introduce weak misc_init_r X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 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 Introduce a __weak misc_init_r function that just runs dieid_num_r(). Remove misc_init_r from cm_t35, mcx, omap3_logic and mt_ventoux as this was all they did for misc_init_r. Cc: Igor Grinberg Cc: Ilya Yanok Cc: Peter Barada Cc: Stefano Babic Signed-off-by: Tom Rini Acked-by: Igor Grinberg --- arch/arm/cpu/armv7/omap3/board.c | 12 ++++++++++++ board/cm_t35/cm_t35.c | 11 ----------- board/htkw/mcx/mcx.c | 11 ----------- board/logicpd/omap3som/omap3logic.c | 11 ----------- board/teejet/mt_ventoux/mt_ventoux.c | 7 ------- 5 files changed, 12 insertions(+), 40 deletions(-) diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c index 1fee574..f2e52e9 100644 --- a/arch/arm/cpu/armv7/omap3/board.c +++ b/arch/arm/cpu/armv7/omap3/board.c @@ -41,6 +41,7 @@ #include #include #include +#include /* Declarations */ extern omap3_sysinfo sysinfo; @@ -244,6 +245,17 @@ void s_init(void) mem_init(); } +/* + * Routine: misc_init_r + * Description: A basic misc_init_r that just displays the die ID + */ +int __weak misc_init_r(void) +{ + dieid_num_r(); + + return 0; +} + /****************************************************************************** * Routine: wait_for_command_complete * Description: Wait for posting to finish on watchdog diff --git a/board/cm_t35/cm_t35.c b/board/cm_t35/cm_t35.c index 7a2fed7..b5d2800 100644 --- a/board/cm_t35/cm_t35.c +++ b/board/cm_t35/cm_t35.c @@ -100,17 +100,6 @@ int board_init(void) } /* - * Routine: misc_init_r - * Description: display die ID - */ -int misc_init_r(void) -{ - dieid_num_r(); - - return 0; -} - -/* * Routine: set_muxconf_regs * Description: Setting up the configuration Mux registers specific to the * hardware. Many pins need to be moved from protect to primary diff --git a/board/htkw/mcx/mcx.c b/board/htkw/mcx/mcx.c index 8f0b527..8f75af1 100644 --- a/board/htkw/mcx/mcx.c +++ b/board/htkw/mcx/mcx.c @@ -69,17 +69,6 @@ int board_init(void) } /* - * Routine: misc_init_r - * Description: late init. - */ -int misc_init_r(void) -{ - dieid_num_r(); - - return 0; -} - -/* * Routine: set_muxconf_regs * Description: Setting up the configuration Mux registers specific to the * hardware. Many pins need to be moved from protect to primary diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 89b114b..12bcfcb 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -144,17 +144,6 @@ int board_mmc_init(bd_t *bis) } #endif -/* - * Routine: misc_init_r - * Description: display die ID register - */ -int misc_init_r(void) -{ - dieid_num_r(); - - return 0; -} - #ifdef CONFIG_SMC911X /* GPMC CS1 settings for Logic SOM LV/Torpedo LAN92xx Ethernet chip */ static const u32 gpmc_lan92xx_config[] = { diff --git a/board/teejet/mt_ventoux/mt_ventoux.c b/board/teejet/mt_ventoux/mt_ventoux.c index c7aedc9..9fbaedd 100644 --- a/board/teejet/mt_ventoux/mt_ventoux.c +++ b/board/teejet/mt_ventoux/mt_ventoux.c @@ -196,13 +196,6 @@ int board_init(void) return 0; } -int misc_init_r(void) -{ - dieid_num_r(); - - return 0; -} - /* * Routine: set_muxconf_regs * Description: Setting up the configuration Mux registers specific to the