From patchwork Fri Jun 5 20:39:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 481560 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 6CEC2140129 for ; Sat, 6 Jun 2015 06:56:06 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=eprKevJN; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 77A4D4B6BE; Fri, 5 Jun 2015 22:56:03 +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 ObiESE55APa4; Fri, 5 Jun 2015 22:56:03 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BF6114B6A2; Fri, 5 Jun 2015 22:55:57 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C99D04B681 for ; Fri, 5 Jun 2015 22:55:53 +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 sGlPAezigsqy for ; Fri, 5 Jun 2015 22:55:53 +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-ig0-f170.google.com (mail-ig0-f170.google.com [209.85.213.170]) by theia.denx.de (Postfix) with ESMTPS id 1F05A4B688 for ; Fri, 5 Jun 2015 22:55:49 +0200 (CEST) Received: by igbpi8 with SMTP id pi8so24188325igb.0 for ; Fri, 05 Jun 2015 13:55:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=l9DM6udC96Ej76l2nxEDABVkeEz6BZ9qG5pSkQmnSg4=; b=eprKevJNd6V2BpgvPc/BCGbHrluKZx4odAyE9l7R0URl72wKeoyVznz2UwPVZL0uX1 +PPwvp+TrNucJy2dvJKxXJs3oGCXJkhrTGMmVpc9nE3qNfS8E7GLdxKweNarKSJPdui0 Sf6SgGApD/cAD0ny1HCOs4ooYSzyC2EetZYa8zkKbyHkc6amnwI50RNTdveqBNxp2qoO NJRvEPvk+S4hIvI+UEMaEqt7hswgHy+uaR8VNwSrgHhKq34bJR+827iKENbUl0KMPwBt zRAOSxlA77oFdKnhtLuAEbhx/LOJ6EVZW0EmhYIRokBPfWHMXjwe2S5c2nHfIMLgtgBD fOsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=l9DM6udC96Ej76l2nxEDABVkeEz6BZ9qG5pSkQmnSg4=; b=LCm3joLY1r0kKeTRplNPq7q27gCc7zSCZ4sGmVTgMweYAjiL+5X4+v5j/dCQdxa8BE Z4kR8xbbula67sQBPySGzDj1LJYEiuE+3pqek9/ECxVhPLGdIT2doDcSjrpWYB4F4t/s 7eZ50qF2mVKnL1m9vSYMgflS3ihtYiLvKuWk7STW8x7g31sQ385NeTTpdQT8hDjxT5X1 9O0v3wIWfhWCFHUidsYAe6OaX8YBcDr7q+BL+7DFe+Fn2rOFTeHhqnwhSG0mU3oT4yYA e1YQOKT4DaEQlYLoN3T1Y1CT2BA4X1Re7OS3U5KXhthoWwIxhsfd2bkDYWs7znB8/Xvv uRAA== X-Gm-Message-State: ALoCoQk+W6aetgV/TKA/dSHQpTViDhob7JQLgaffuQOUlXM86Bl/QVGz5FSPnzVh7T6uwvCYVoCh X-Received: by 10.107.138.31 with SMTP id m31mr6993159iod.75.1433537748821; Fri, 05 Jun 2015 13:55:48 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by mx.google.com with ESMTPSA id d4sm2105289igl.1.2015.06.05.13.55.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jun 2015 13:55:47 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 53D5F2216F6; Fri, 5 Jun 2015 14:39:52 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Fri, 5 Jun 2015 14:39:44 -0600 Message-Id: <1433536786-11857-14-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1433536786-11857-2-git-send-email-sjg@chromium.org> References: <1433536786-11857-2-git-send-email-sjg@chromium.org> Cc: Stephen Warren , Tom Warren Subject: [U-Boot] [PATCH v3 13/15] tegra: config: Allow Chrome OS environment settings to be included 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" Bring these in if they are provided by the board. Signed-off-by: Simon Glass --- Changes in v3: None Changes in v2: None include/configs/tegra-common-post.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 48c1a7a..483222f 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -58,13 +58,18 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#ifndef CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS +#define CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ TEGRA_DEVICE_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ "fdt_high=ffffffff\0" \ "initrd_high=ffffffff\0" \ BOOTENV \ - BOARD_EXTRA_ENV_SETTINGS + BOARD_EXTRA_ENV_SETTINGS \ + CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS #if defined(CONFIG_TEGRA20_SFLASH) || defined(CONFIG_TEGRA20_SLINK) || defined(CONFIG_TEGRA114_SPI) #define CONFIG_TEGRA_SPI