From patchwork Wed Oct 21 09:54:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 55353 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lf0-f71.google.com (mail-lf0-f71.google.com [209.85.215.71]) by patches.linaro.org (Postfix) with ESMTPS id 1A65F2303B for ; Wed, 21 Oct 2015 09:54:37 +0000 (UTC) Received: by lffv3 with SMTP id v3sf15324151lff.1 for ; Wed, 21 Oct 2015 02:54:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list; bh=oP5X9/Tf3y4HZT2xqT+bEBprZCFvRcz7WgSa5ZrmI4g=; b=ipZ4YrCG+upjpE7iXG7rLPvEAKckGddLd+yhj3qbuJGpq4KqGlCptiU5KKRROr3sYB VEJZMQ50jd1dadIDu/JfkuhnvonHAd8mtdu3JiDLIEaXVhSYh+UdDF59089mqq0I5F65 oKI/V5mceeNu/j0wyCHHRaw/AlWayhISK75JkUOswPIb9cLSA537l4W9Tzz1NAssUvlF ChPUDdiBpMFr9e4AMvTLO55IJwfrkfy8IZTmWX5Ck18vnIAXMKsibAATazR8auCQqTnh AeemEGoRbPg0wVxXyj4TUPRedL3lx0qzL++58h8R9pPmd8EJim5NU24EDhagEem8+hGf C0yA== X-Gm-Message-State: ALoCoQkycSfHusd9vVV09yTmKn/jJxoof2nxwsXNalczm5KCWm1FzSLuQ6tXN25moZ6e8Ny++3UM X-Received: by 10.180.35.132 with SMTP id h4mr6605789wij.5.1445421276013; Wed, 21 Oct 2015 02:54:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.26.140 with SMTP id a134ls191265lfa.30.gmail; Wed, 21 Oct 2015 02:54:35 -0700 (PDT) X-Received: by 10.112.204.67 with SMTP id kw3mr4601015lbc.60.1445421275868; Wed, 21 Oct 2015 02:54:35 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id xm10si5717085lbb.147.2015.10.21.02.54.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2015 02:54:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by lbbes7 with SMTP id es7so34374982lbb.2 for ; Wed, 21 Oct 2015 02:54:35 -0700 (PDT) X-Received: by 10.112.139.201 with SMTP id ra9mr4684885lbb.29.1445421275719; Wed, 21 Oct 2015 02:54:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp2585496lbq; Wed, 21 Oct 2015 02:54:35 -0700 (PDT) X-Received: by 10.195.11.232 with SMTP id el8mr9606566wjd.138.1445421273572; Wed, 21 Oct 2015 02:54:33 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id p8si35633244wiz.29.2015.10.21.02.54.33; Wed, 21 Oct 2015 02:54:33 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1B72B4B6ED; Wed, 21 Oct 2015 11:54:31 +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 KaPtCNvBP2yy; Wed, 21 Oct 2015 11:54:30 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 60F5F4B6CE; Wed, 21 Oct 2015 11:54:27 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 875A84B6A8 for ; Wed, 21 Oct 2015 11:54:20 +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 PQY1RA7UnXir for ; Wed, 21 Oct 2015 11:54:20 +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-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by theia.denx.de (Postfix) with ESMTPS id 463024B69D for ; Wed, 21 Oct 2015 11:54:18 +0200 (CEST) Received: by wikq8 with SMTP id q8so85161503wik.1 for ; Wed, 21 Oct 2015 02:54:18 -0700 (PDT) X-Received: by 10.180.12.241 with SMTP id b17mr10670334wic.55.1445421258680; Wed, 21 Oct 2015 02:54:18 -0700 (PDT) Received: from localhost.localdomain (82-69-54-187.dsl.in-addr.zen.co.uk. [82.69.54.187]) by smtp.gmail.com with ESMTPSA id lr6sm5069125wic.3.2015.10.21.02.54.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Oct 2015 02:54:18 -0700 (PDT) From: Ryan Harkin To: Stefan Roese , u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Wed, 21 Oct 2015 10:54:06 +0100 Message-Id: <1445421247-15013-3-git-send-email-ryan.harkin@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445421247-15013-1-git-send-email-ryan.harkin@linaro.org> References: <1445421247-15013-1-git-send-email-ryan.harkin@linaro.org> Cc: Steve Rae , Liviu Dudau Subject: [U-Boot] [PATCH 2/3] vexpress64: remove #error X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: 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" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ryan.harkin@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 This patch allows vexpress64 targets to be compiled when CONFIG_SYS_FLASH_CFI is enabled. I considered using #warning instead of #error, but this just clutters up the build output and hides real warnings. Without this patch, you see errors during compilation like this: include/configs/vexpress_aemv8a.h:42:2: error: #error "Unknown board variant" #error "Unknown board variant" include/configs/vexpress_aemv8a.h:115:2: error: #error "Unknown board variant" #error "Unknown board variant" include/configs/vexpress_aemv8a.h:280:2: error: #error "Unknown board variant" #error "Unknown board variant" make[1]: *** [tools/envcrc.o] Error 1 make: *** [tools] Error 2 In file included from include/config.h:5:0, from tools/envcrc.c:19: Signed-off-by: Ryan Harkin Acked-by: Linus Walleij --- include/configs/vexpress_aemv8a.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 0f2f1a3..c014c14 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -38,8 +38,6 @@ #elif CONFIG_TARGET_VEXPRESS64_JUNO #define CONFIG_SYS_TEXT_BASE 0xe0000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) -#else -#error "Unknown board variant" #endif #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ @@ -111,8 +109,6 @@ #elif CONFIG_TARGET_VEXPRESS64_JUNO #define GICD_BASE (0x2C010000) #define GICC_BASE (0x2C02f000) -#else -#error "Unknown board variant" #endif #endif /* !CONFIG_GICV3 */ @@ -276,8 +272,6 @@ #define CONFIG_BOOTDELAY 1 -#else -#error "Unknown board variant" #endif /* Do not preserve environment */