From patchwork Wed Nov 28 17:50:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 202514 X-Patchwork-Delegate: twarren@nvidia.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 7C2E82C008C for ; Thu, 29 Nov 2012 04:50:56 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BD7CF4A15D; Wed, 28 Nov 2012 18:50:43 +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 ycmCgzs3OUdG; Wed, 28 Nov 2012 18:50:43 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9B2824A137; Wed, 28 Nov 2012 18:50:32 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E86214A113 for ; Wed, 28 Nov 2012 18:50:29 +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 xfpSd9gp3EGm for ; Wed, 28 Nov 2012 18:50: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 avon.wwwdotorg.org (avon.wwwdotorg.org [70.85.31.133]) by theia.denx.de (Postfix) with ESMTPS id D19E34A127 for ; Wed, 28 Nov 2012 18:50:25 +0100 (CET) Received: from severn.wwwdotorg.org (unknown [192.168.65.5]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPS id EB033625B; Wed, 28 Nov 2012 10:52:18 -0700 (MST) Received: from swarren-lx1.nvidia.com (localhost [127.0.0.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by severn.wwwdotorg.org (Postfix) with ESMTPSA id BABB4E462A; Wed, 28 Nov 2012 10:50:20 -0700 (MST) From: Stephen Warren To: u-boot@lists.denx.de, Simon Glass , Tom Warren , Stephen Warren Date: Wed, 28 Nov 2012 10:50:10 -0700 Message-Id: <1354125012-8877-1-git-send-email-swarren@wwwdotorg.org> X-Mailer: git-send-email 1.7.10.4 X-NVConfidentiality: public X-Virus-Scanned: clamav-milter 0.96.5 at avon.wwwdotorg.org X-Virus-Status: Clean Subject: [U-Boot] [PATCH 1/3] tegra: only define TEGRA_DEVICE_SETTINGS if not already defined 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 From: Stephen Warren seaboard.h attempts to undefine TEGRA_DEVICE_SETTINGS and provide a custom value. This worked when the "pre" included tegra20-common.h provided the default. However, changes in the main U-Boot repo removed this default from the "pre" included tegra20-common.h to the "post" included tegra-common-post.h, which uncondtionally provides the value. This causes the following compile warnings: In file included from /home/swarren/shared/git_wa/u-boot/include/configs/seaboard.h:129:0, from /home/swarren/shared/git_wa/u-boot/include/config.h:10, from /home/swarren/shared/git_wa/u-boot/include/common.h:37, from lib/asm-offsets.c:18: /home/swarren/shared/git_wa/u-boot/include/configs/tegra-common-post.h:163:0: warning: "TEGRA_DEVICE_SETTINGS" redefined /home/swarren/shared/git_wa/u-boot/include/configs/seaboard.h:110:0: note: this is the location of the previous definition Solve this by modifying tegra-common-post.h to only provide a value for TEGRA_DEVICE_SETTINGS if the board-specific header has not already provided a custom value. Signed-off-by: Stephen Warren Tested-by: Simon Glass --- My personal opinion is that when u-boot-tegra/master is rebuilt, this series should be the first patches in the branch, and the current patches that are in u-boot-tegra/next which add LCD support for boards other than Seaboard should be re-written to assume that tegra-common-post.h will provide the appropriate value for TEGRA_DEVICE_SETTINGS, and hence the board config .h files don't need to define any custom value for TEGRA_DEVICE_SETTINGS. Otherwise, if you "git bisect" the next version of u-boot-tegra/master, you'll get the same compile warnings I mention above on all the other boards until the point when patch 1 in this series is applied. include/configs/tegra-common-post.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index ab62e71..1662844 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -146,6 +146,7 @@ "fdt_addr_r=0x02000000\0" \ "ramdisk_addr_r=0x02100000\0" \ +#ifndef TEGRA_DEVICE_SETTINGS #ifdef CONFIG_TEGRA_KEYBOARD #define STDIN_KBD_KBC ",tegra-kbc" #else @@ -165,6 +166,8 @@ "stdout=serial\0" \ "stderr=serial\0" \ +#endif /* TEGRA_DEVICE_SETTINGS */ + #define CONFIG_EXTRA_ENV_SETTINGS \ TEGRA_DEVICE_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \