From patchwork Tue Nov 22 08:48:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 697590 X-Patchwork-Delegate: monstr@monstr.eu 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 3tNK0r6kVHz9t1P for ; Tue, 22 Nov 2016 19:50:04 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KxsoEKW6"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 354E2A7559; Tue, 22 Nov 2016 09:49:49 +0100 (CET) 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 EDsc_3n2yEeu; Tue, 22 Nov 2016 09:49:49 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5AA13A7576; Tue, 22 Nov 2016 09:49:44 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F16E7A75A8 for ; Tue, 22 Nov 2016 09:49:37 +0100 (CET) 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 DK8WgAWqaW6C for ; Tue, 22 Nov 2016 09:49:37 +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 mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by theia.denx.de (Postfix) with ESMTPS id 62781A7597 for ; Tue, 22 Nov 2016 09:49:32 +0100 (CET) Received: by mail-pf0-f195.google.com with SMTP id 144so997839pfv.0 for ; Tue, 22 Nov 2016 00:49:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r0ng+R8pgyBBrVAHzEtJbbsAykTTgJMSqOb1FMgVlf0=; b=KxsoEKW65Rc0+1IlgtwCt+MShtZFU5HMPy17YzZv6plrwlkPpwn5KH/i6VANgJPQNU f5UfcFLFmzxff11mAxolKrNDfuLQDEEB+7/K24KaR5uckpNAqn9RFVCVAzq0JrfgI9Kh QQ3oXEsv2bA90Y6hsb2zIx3HyyBkNZAlZF8g6hrevA7oQUx/bVM8Xab3rCbRS1qYLl9A 9uMq+RxI2dI4TUkWf4zEXKcyEZlQRf6CHO60Rzukb7Fk04Eqlr+vYY5uHW7UQObW/uk6 SXtfCYwiuXPWjAES6uDvWgk3Z7pJQeu3V9f3DhMTUCUrUEerA/1M6ZcqvIpt/OBCPLSe P0dw== 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=r0ng+R8pgyBBrVAHzEtJbbsAykTTgJMSqOb1FMgVlf0=; b=iv08jqBD3xgVIwVI0Kl19FzEO2qmVmEZ/3ufidbmG3NOrJdnlfrA/6horRM6tAPA/1 UfkxaS4Mv5rEPkk9mk0mFARaFWrNg6gEf09bT8Rf23rfvvFYcUw5g8L1o7q7Crv6lQ6X k+T7KLDG2BbVB/C6YKMwB2sqWH98rTKWKTWmHV7BgMN9BZ7Loq2mLAfB9q+EKy+QG6Wa 8K0oA49qc857aNiJQEwqNuUjsETXPH7FtkDxZUP6xDYzBihogh+mZjhjI47SmCL0ehsA xxLhmBlO5+PI0AoBlyXSodwr9kke57KnXK/j3lhCZ8I/WVTkxFFfVefhk60YAEO+2i0w tRXg== X-Gm-Message-State: AKaTC03msMZ02tzWRtuRLrEpaVv6GinRqSCFVgehCcZlXj232xbgR93GgNya3t8Ol3iOxw== X-Received: by 10.98.65.156 with SMTP id g28mr24073620pfd.110.1479804571426; Tue, 22 Nov 2016 00:49:31 -0800 (PST) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:788b:fe63:5ad7:3cb3]) by smtp.gmail.com with ESMTPSA id q2sm25196547pga.8.2016.11.22.00.49.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Nov 2016 00:49:30 -0800 (PST) From: Chris Packham To: u-boot@lists.denx.de Date: Tue, 22 Nov 2016 21:48:58 +1300 Message-Id: <20161122084902.20890-4-judge.packham@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161122084902.20890-1-judge.packham@gmail.com> References: <20161122084902.20890-1-judge.packham@gmail.com> Cc: Eric Jarrige , Matthias Fuchs , Wolfgang Wegner , Stefan Roese , Chris Packham Subject: [U-Boot] [RFC PATCH 3/7] Move CONFIG_FPGA_SPARTAN options to defconfig 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" Signed-off-by: Chris Packham --- configs/PMC440_defconfig | 3 +++ configs/apf27_defconfig | 2 ++ configs/astro_mcf5373l_defconfig | 2 ++ configs/mt_ventoux_defconfig | 2 ++ configs/x600_defconfig | 2 ++ include/configs/PMC440.h | 4 ---- include/configs/apf27.h | 5 ----- include/configs/astro_mcf5373l.h | 3 --- include/configs/mt_ventoux.h | 3 --- include/configs/x600.h | 3 --- 10 files changed, 11 insertions(+), 18 deletions(-) diff --git a/configs/PMC440_defconfig b/configs/PMC440_defconfig index cd2f0d2a5b4b..8a2e9c964e14 100644 --- a/configs/PMC440_defconfig +++ b/configs/PMC440_defconfig @@ -16,6 +16,9 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y +CONFIG_FPGA_XILINX=y +CONFIG_FPGA_SPARTAN3=y +CONFIG_FPGA_SPARTAN2=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig index a02e180d2f2c..f8f177ad56ce 100644 --- a/configs/apf27_defconfig +++ b/configs/apf27_defconfig @@ -21,4 +21,6 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_UBI=y +CONFIG_FPGA_XILINX=y +CONFIG_FPGA_SPARTAN3=y CONFIG_OF_LIBFDT=y diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig index 94e931eabadc..5ea1b66e5b2a 100644 --- a/configs/astro_mcf5373l_defconfig +++ b/configs/astro_mcf5373l_defconfig @@ -9,3 +9,5 @@ CONFIG_CMD_I2C=y # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y +CONFIG_FPGA_XILINX=y +CONFIG_FPGA_SPARTAN3=y diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index 9e330a7f44ca..d4e58395cf22 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -24,6 +24,8 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_UBI=y +CONFIG_FPGA_XILINX=y +CONFIG_FPGA_SPARTAN3=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_ULPI_VIEWPORT_OMAP=y diff --git a/configs/x600_defconfig b/configs/x600_defconfig index 65b7d9565aac..0db6b5c6ba20 100644 --- a/configs/x600_defconfig +++ b/configs/x600_defconfig @@ -26,6 +26,8 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y +CONFIG_FPGA_XILINX=y +CONFIG_FPGA_SPARTAN3=y CONFIG_SYS_I2C_DW=y CONFIG_NETDEVICES=y CONFIG_ETH_DESIGNWARE=y diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 2e7f6e480323..750f8447220c 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -343,10 +343,6 @@ /*----------------------------------------------------------------------- * FPGA stuff *----------------------------------------------------------------------*/ -#define CONFIG_FPGA -#define CONFIG_FPGA_XILINX -#define CONFIG_FPGA_SPARTAN2 -#define CONFIG_FPGA_SPARTAN3 #define CONFIG_FPGA_COUNT 2 /*----------------------------------------------------------------------- diff --git a/include/configs/apf27.h b/include/configs/apf27.h index a97ba9f39c50..00798fa1027f 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -260,12 +260,7 @@ /* * FPGA */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_FPGA -#endif #define CONFIG_FPGA_COUNT 1 -#define CONFIG_FPGA_XILINX -#define CONFIG_FPGA_SPARTAN3 #define CONFIG_SYS_FPGA_WAIT 250 /* 250 ms */ #define CONFIG_FPGA_PROG_FEEDBACK #define CONFIG_SYS_FPGA_CHECK_CTRLC diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 0af356bcb49d..d5d6540ec9b9 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -204,9 +204,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_FPGA_COUNT 1 -#define CONFIG_FPGA -#define CONFIG_FPGA_XILINX -#define CONFIG_FPGA_SPARTAN3 #define CONFIG_FPGA_ALTERA #define CONFIG_FPGA_CYCLON2 #define CONFIG_FPGA_PROG_FEEDBACK diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h index 1353b11b1250..b6198dbdf6d3 100644 --- a/include/configs/mt_ventoux.h +++ b/include/configs/mt_ventoux.h @@ -42,9 +42,6 @@ * FPGA */ #define CONFIG_CMD_FPGA_LOADMK -#define CONFIG_FPGA -#define CONFIG_FPGA_XILINX -#define CONFIG_FPGA_SPARTAN3 #define CONFIG_FPGA_PROG_FEEDBACK #define CONFIG_SYS_FPGA_WAIT 10000 #define CONFIG_MAX_FPGA_DEVICES 1 diff --git a/include/configs/x600.h b/include/configs/x600.h index 5e51f6535624..a879c4c7c113 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -96,9 +96,6 @@ #define CONFIG_SYS_I2C_RTC_ADDR 0x68 /* FPGA config options */ -#define CONFIG_FPGA -#define CONFIG_FPGA_XILINX -#define CONFIG_FPGA_SPARTAN3 #define CONFIG_FPGA_COUNT 1 /* USB EHCI options */