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: 533710 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 AE2201409A0 for ; Wed, 21 Oct 2015 20:54:34 +1100 (AEDT) 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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IbvYYPpjiuZFspQyDmpBVq63AOTYNqloJcB8NmESpQ4=; b=bKpPcx54auQo4qz3z5xeoLM4/6tFWXjfwlpGoYwDuFuJ3FrKmv0l1/HobooZUBDUwQ 5F3DmqSHZKgETT+03ol70IoGlcZklMtIJNNQ7Y24vDn/qEJOZVXqBEe3MNxdMC8F+gDX VxXDEg2CloQyCPsnfMSb+PiV1vNcMtxmjiEVjAqylziSDchzpGE7Yh8wyO5n/f4Q7un5 mr6tKQxjYs5P1pgIAq1Zyrdpgh/da9plVZKGXcANbsN3lgEzyKruZ5T5M0TH6r/eTM8t Tomriu7EypPrkMJ6rlKT5k3dlkpb8slQ+PIAgvCSBNvXxwdtvOcAv87YXO1dt27gAV3a Gkrg== X-Gm-Message-State: ALoCoQnYvhPMSUebFfB/VGNK9mxdbLzeB1zORrxr6xf0jufuVrugjEdfkLRy3Dz/CPm14Gvv7AEq 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: 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" 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 */