On 7/13/22 14:32, Alexander Dahl wrote:
From: Alexander Dahl <a...@thorsis.com>
After commit 8cca60a2cbf2 ("Kconfig: Remove some symbols from the
whitelist") downstream builds failed for boards setting this in
include/configs/…
Two FPGA drivers consider this definition.
2?
board/astro/mcf5373l/fpga.c
drivers/fpga/ACEX1K.c
drivers/fpga/virtex2.c
Signed-off-by: Alexander Dahl <a...@thorsis.com>
---
README | 3 ---
drivers/fpga/Kconfig | 4 ++++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/README b/README
index ff0df3797d..8c31e5c0e3 100644
--- a/README
+++ b/README
@@ -1346,9 +1346,6 @@ The following options need to be configured:
If defined, a function that provides delays in the FPGA
configuration driver.
- CONFIG_SYS_FPGA_CHECK_CTRLC
- Allow Control-C to interrupt FPGA configuration
-
CONFIG_SYS_FPGA_CHECK_ERROR
Check for configuration errors during FPGA bitfile
diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
index 76719517f5..53d91676e0 100644
--- a/drivers/fpga/Kconfig
+++ b/drivers/fpga/Kconfig
@@ -91,4 +91,8 @@ config FPGA_ZYNQPL
Enable FPGA driver for loading bitstream in BIT and BIN format
on Xilinx Zynq devices.
+config SYS_FPGA_CHECK_CTRLC
+ bool "Allow Control-C to interrupt FPGA configuration"
+ depends on FPGA
Please write help message.
+
endmenu
And can you please remove this code from drivers/fpga/virtex2.c
48 /*
49 * Don't allow config cycle to be interrupted
50 */
51 #ifndef CONFIG_SYS_FPGA_CHECK_CTRLC
52 #undef CONFIG_SYS_FPGA_CHECK_CTRLC
53 #endif
it doesn't make any sense.
And with 2/2 please also remove
drivers/fpga/spartan2.c:18:#undef CONFIG_SYS_FPGA_PROG_FEEDBACK
drivers/fpga/virtex2.c:44:#ifndef CONFIG_SYS_FPGA_PROG_FEEDBACK
drivers/fpga/virtex2.c:45:#define CONFIG_SYS_FPGA_PROG_FEEDBACK
Thanks,
Michal
