From patchwork Thu Jul 16 13:10:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Kocialkowski X-Patchwork-Id: 496687 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 F17B41402B1 for ; Thu, 16 Jul 2015 23:10:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 336B54B65D; Thu, 16 Jul 2015 15:10:44 +0200 (CEST) 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 AszGyYvhx8mn; Thu, 16 Jul 2015 15:10:44 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A6FB54B632; Thu, 16 Jul 2015 15:10:43 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 866C14B657 for ; Thu, 16 Jul 2015 15:10:39 +0200 (CEST) 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 blJFT8DTXTzI for ; Thu, 16 Jul 2015 15:10:39 +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 gagarine.paulk.fr (gagarine.paulk.fr [109.190.93.129]) by theia.denx.de (Postfix) with ESMTPS id 48ED64B632 for ; Thu, 16 Jul 2015 15:10:36 +0200 (CEST) Received: by gagarine.paulk.fr (Postfix, from userid 65534) id 99DBA1FE4D; Thu, 16 Jul 2015 15:10:35 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on gagarine.paulk.fr X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from armstrong.paulk.fr (armstrong.paulk.fr [82.233.88.171]) by gagarine.paulk.fr (Postfix) with ESMTPS id 96A981FE63; Thu, 16 Jul 2015 15:10:28 +0200 (CEST) Received: from localhost.localdomain (aldrin [192.168.0.128]) by armstrong.paulk.fr (Postfix) with ESMTP id 830F83768F; Thu, 16 Jul 2015 15:10:27 +0200 (CEST) From: Paul Kocialkowski To: u-boot@lists.denx.de Date: Thu, 16 Jul 2015 15:10:21 +0200 Message-Id: <1437052221-11040-2-git-send-email-contact@paulk.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1437052221-11040-1-git-send-email-contact@paulk.fr> References: <1437052221-11040-1-git-send-email-contact@paulk.fr> Cc: Marek Vasut , Tom Rini Subject: [U-Boot] [PATCH 2/2] am33xx: CONFIG_REVISION_TAG ifdef check for get_board_rev X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Despite being defined with __weak, this declaration of get_board_rev will conflict with the fallback one when ONFIG_REVISION_TAG is not defined. Signed-off-by: Paul Kocialkowski --- arch/arm/cpu/armv7/am33xx/sys_info.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/cpu/armv7/am33xx/sys_info.c b/arch/arm/cpu/armv7/am33xx/sys_info.c index 781d83f..9d5a5d3 100644 --- a/arch/arm/cpu/armv7/am33xx/sys_info.c +++ b/arch/arm/cpu/armv7/am33xx/sys_info.c @@ -54,10 +54,12 @@ u32 get_cpu_type(void) * get_board_rev() - setup to pass kernel board revision information * returns: 0 for the ATAG REVISION tag value. */ +#ifdef CONFIG_REVISION_TAG u32 __weak get_board_rev(void) { return 0; } +#endif /** * get_device_type(): tell if GP/HS/EMU/TST