Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 37FF1C433EF for ; Mon, 13 Jun 2022 00:03:20 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5D0EC84443; Mon, 13 Jun 2022 02:02:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="cp9hE2kw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 073F08442E; Mon, 13 Jun 2022 02:02:19 +0200 (CEST) Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0F010842A3 for ; Mon, 13 Jun 2022 02:02:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qk1-x736.google.com with SMTP id x75so2994148qkb.12 for ; Sun, 12 Jun 2022 17:02:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=rWqKCDtOChvI5gbdZCeNclLe5UuDuI0k+vdpwsFblAc=; b=cp9hE2kw//Y6SW8unGlYsI17zFKa7rdFeF6eSlc2FdO1bhukl64hbOPo1foLui4wLC kB8ZOzzTlodgYrMo91soSSOlEwOTmDZYEoe+6J2Ppx44X/Q1rD0HosW7RSYWQhI42OEf rHkVeNhJLNzrStzmikRhq/mSuY2xLXutjPQpA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rWqKCDtOChvI5gbdZCeNclLe5UuDuI0k+vdpwsFblAc=; b=7vY+wuAQSpAdXf4oiim/FiNTJA7rJcKpTvcV6BWGcBWJ2mpoG7T52X7TU+gPubgMjU Ly9FGduUV0+NH1PRb0LviT7Z/EnQ/RRTyYMF6N8nK3zRgVK8/5kH9fDarPI3z5xt7HGa TQ+VmiMYKpbe2Ok2lad+BmkC8OqrHfr10WzkewbvKt2KYqzVeKc71wh4M0yZXvoJVox+ TLH1JlpuP+c6QIJqSI5/g9WyB4dvexX5ZWbD8tvM6TCgCLTmfoCMw4Fe07jT8G8BwfLL /wY3mIRcPGAVSZ4Ef6ZNpIBhgwyIWAH/rDcfUPUHmrNx8sJRT/lNJMqs1heXkiTcSKmv zJjA== X-Gm-Message-State: AOAM532kl3pGyIS0kpAecg+EUhHGz5Yns6G03AZgdlXcjSudTtHK4Evz cGYVNLSlVWqM79S16r+MCR+qjH6hzBiR9Q== X-Google-Smtp-Source: ABdhPJyo+gOh8zDmQLYBo7+Q8PoxKho6gtr+5G8LCGGwMQ/gkf+9Jm4CvywBfou2V9p0fGnOOg+2dQ== X-Received: by 2002:a05:620a:4514:b0:6a6:d3fa:42ea with SMTP id t20-20020a05620a451400b006a6d3fa42eamr21734007qkp.258.1655078528350; Sun, 12 Jun 2022 17:02:08 -0700 (PDT) Received: from bill-the-cat.lan (cpe-65-184-195-139.ec.res.rr.com. [65.184.195.139]) by smtp.gmail.com with ESMTPSA id h5-20020a05620a400500b006a6d4261f40sm2625551qko.111.2022.06.12.17.02.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jun 2022 17:02:07 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 2/8] fpga: Remove CONFIG_FPGA_COUNT Date: Sun, 12 Jun 2022 20:01:59 -0400 Message-Id: <20220613000205.891039-2-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220613000205.891039-1-trini@konsulko.com> References: <20220613000205.891039-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean This define is only currently used in a single board, and always set to one. Define this within the board code and remove other references. Signed-off-by: Tom Rini --- README | 4 ---- board/astro/mcf5373l/fpga.c | 9 +++++---- include/configs/astro_mcf5373l.h | 1 - include/configs/mx53cx9020.h | 2 -- include/configs/socfpga_common.h | 7 ------- 5 files changed, 5 insertions(+), 18 deletions(-) diff --git a/README b/README index 7649dae36338..6a4db9dc5617 100644 --- a/README +++ b/README @@ -1350,10 +1350,6 @@ The following options need to be configured: Enables support for FPGA family. (SPARTAN2, SPARTAN3, VIRTEX2, CYCLONE2, ACEX1K, ACEX) - CONFIG_FPGA_COUNT - - Specify the number of FPGA devices to support. - CONFIG_SYS_FPGA_PROG_FEEDBACK Enable printing of hash marks during FPGA configuration. diff --git a/board/astro/mcf5373l/fpga.c b/board/astro/mcf5373l/fpga.c index ef82f0660703..50a3830b8573 100644 --- a/board/astro/mcf5373l/fpga.c +++ b/board/astro/mcf5373l/fpga.c @@ -168,7 +168,8 @@ Altera_CYC2_Passive_Serial_fns altera_fns = { altera_post_fn }; -Altera_desc altera_fpga[CONFIG_FPGA_COUNT] = { +#define FPGA_COUNT 1 +Altera_desc altera_fpga[FPGA_COUNT] = { {Altera_CYC2, passive_serial, 85903, @@ -182,7 +183,7 @@ int astro5373l_altera_load(void) { int i; - for (i = 0; i < CONFIG_FPGA_COUNT; i++) { + for (i = 0; i < FPGA_COUNT; i++) { /* * I did not yet manage to get relocation work properly, * so set stuff here instead of static initialisation: @@ -372,7 +373,7 @@ xilinx_spartan3_slave_serial_fns xilinx_fns = { xilinx_fastwr_config_fn }; -xilinx_desc xilinx_fpga[CONFIG_FPGA_COUNT] = { +xilinx_desc xilinx_fpga[FPGA_COUNT] = { {xilinx_spartan3, slave_serial, XILINX_XC3S4000_SIZE, @@ -388,7 +389,7 @@ int astro5373l_xilinx_load(void) fpga_init(); - for (i = 0; i < CONFIG_FPGA_COUNT; i++) { + for (i = 0; i < FPGA_COUNT; i++) { /* * I did not yet manage to get relocation work properly, * so set stuff here instead of static initialisation: diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 9bf6968e8ad9..18e06076a4ab 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -133,7 +133,6 @@ * it needs non-blocking CFI routines. */ -#define CONFIG_FPGA_COUNT 1 #define CONFIG_SYS_FPGA_PROG_FEEDBACK #define CONFIG_SYS_FPGA_WAIT 1000 diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 1e5df3f7d7ad..f1d751f15a24 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -16,8 +16,6 @@ #define CONFIG_MXC_UART_BASE UART2_BASE -#define CONFIG_FPGA_COUNT 1 - /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 2 diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 6453ab79527d..10ba2d22ffa7 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -58,13 +58,6 @@ #define CONFIG_DW_ALTDESCRIPTOR #endif -/* - * FPGA Driver - */ -#ifdef CONFIG_CMD_FPGA -#define CONFIG_FPGA_COUNT 1 -#endif - /* * L4 OSC1 Timer 0 */ -- 2.25.1