diff mbox series

[v3,1/2] fpga: Convert SYS_FPGA_CHECK_CTRLC to Kconfig

Message ID 20220721133122.32428-2-ada@thorsis.com
State Accepted
Commit e8ffc1dfcb1b4a7465ae7ec2b45569f0f27ff501
Delegated to: Michal Simek
Headers show
Series fpga: Convert some options to Kconfig | expand

Commit Message

Alexander Dahl July 21, 2022, 1:31 p.m. UTC 
After commit 8cca60a2cbf2 ("Kconfig: Remove some symbols from the
whitelist") downstream builds failed for boards setting this in
include/configs/…

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 README                 | 3 ---
 drivers/fpga/Kconfig   | 6 ++++++
 drivers/fpga/virtex2.c | 7 -------
 3 files changed, 6 insertions(+), 10 deletions(-)
diff mbox series

Patch

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..78d9588e4b 100644
--- a/drivers/fpga/Kconfig
+++ b/drivers/fpga/Kconfig
@@ -91,4 +91,10 @@  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
+	help
+	  User can interrupt FPGA configuration by pressing CTRL+C.
+
 endmenu
diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c
index b3e0537bab..0fd2290e3d 100644
--- a/drivers/fpga/virtex2.c
+++ b/drivers/fpga/virtex2.c
@@ -45,13 +45,6 @@ 
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 #endif
 
-/*
- * Don't allow config cycle to be interrupted
- */
-#ifndef CONFIG_SYS_FPGA_CHECK_CTRLC
-#undef CONFIG_SYS_FPGA_CHECK_CTRLC
-#endif
-
 /*
  * Check for errors during configuration by default
  */