diff options
| author | Alexander Dahl <ada@thorsis.com> | 2022-07-21 15:31:21 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@amd.com> | 2022-07-26 08:39:43 +0200 |
| commit | e8ffc1dfcb1b4a7465ae7ec2b45569f0f27ff501 (patch) | |
| tree | e693a327d38c0b6642c9770e06b4ace70c6be612 | |
| parent | 5f53e534ac15ad63ee530a43536b8da6c30cd36d (diff) | |
fpga: Convert SYS_FPGA_CHECK_CTRLC to Kconfig
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>
Link: https://lore.kernel.org/r/20220721133122.32428-2-ada@thorsis.com
Signed-off-by: Michal Simek <michal.simek@amd.com>
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | drivers/fpga/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/fpga/virtex2.c | 7 |
3 files changed, 6 insertions, 10 deletions
@@ -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 @@ -46,13 +46,6 @@ #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 */ #ifndef CONFIG_SYS_FPGA_CHECK_ERROR |