From 60d45642fe0673514aced37e6cc95d4f0fe02a19 Mon Sep 17 00:00:00 2001
From: Tom Rini
Date: Sun, 12 Jun 2022 20:01:59 -0400
Subject: fpga: Remove CONFIG_FPGA_COUNT

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 <trini@konsulko.com>
---
 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 dbb0d969549..c1d516beda8 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 ef82f066070..50a3830b857 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 9bf6968e8ad..18e06076a4a 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 1e5df3f7d7a..f1d751f15a2 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 6453ab79527..10ba2d22ffa 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
  */
-- 
cgit v1.2.3