From mboxrd@z Thu Jan 1 00:00:00 1970 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 F0866C4321E for ; Sun, 4 Dec 2022 15:06:42 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 561E7852FD; Sun, 4 Dec 2022 16:06:10 +0100 (CET) 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="PEBkMuEU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DC9D385300; Sun, 4 Dec 2022 16:06:04 +0100 (CET) Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) (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 D6D67852F4 for ; Sun, 4 Dec 2022 16:06:01 +0100 (CET) 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-ed1-x52c.google.com with SMTP id v8so12606914edi.3 for ; Sun, 04 Dec 2022 07:06:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7qvprbqB2jZ3aJMjKaxFlohLEUg+t0xxoWkrVRRa71w=; b=PEBkMuEUXzdV5YL4O3SlxOLGtVrs6LYrzGQBzM65TQvc6/HKoQNo7RAAf+d+hohSVK rV8sbSOO0TJlYq8n1p/6O1SGML36fSgmhyvBkcTQkcxFTQK+EsO0FOz+IxMPqEhdoZnA wlUixZaf3jkDfZH/cT0Gs4f0DkyLbdL8VDXkE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7qvprbqB2jZ3aJMjKaxFlohLEUg+t0xxoWkrVRRa71w=; b=u+Dr+q1xH8pSJZO725/8SgcrAk1DPtJR7SHlO6bMDp2LiTVHvA6o6Q0zkAMkAn1wLq kyLTYA+572Q2aDM0yLjaczpmP9luZDuVVB0QjJpQuP+zG3eyq4q7ZEIJSjfzJLZTlc0N JcR42UtdqjsDIg9qqrzebhwb7EnHmnSm30+LrTeYlF57YSK1cg4Vp5rcb0ciVbad7Iv8 He7XjnlpGUtATU9gaSoCNy8HHyJtp1kS82DCVirEpIqUdEAkFEEJhgEldfZ6DAc3ulxe 3WRSox7XuJLKCQDayDJPG8/Mvo2MI+DbH4vXf+D/SI8VE2KfgupX9SxnomNrGtkkdwNU lIJQ== X-Gm-Message-State: ANoB5pn98dIfRSTDLta6pfIvd9NMy3BCAFuo0s1d/PrLGQYkDxlxXF9v B6cOSXbu1zUjnICcPgpXSldnEdER9Csvb1BZ X-Google-Smtp-Source: AA0mqf7q6gWd+hsSoocUIXRS08OagXdOwmK/hqDtk0AsCJUhCtitS6an8Vfx4neDK63Klya9syqIRA== X-Received: by 2002:aa7:d551:0:b0:468:fb2c:6c8c with SMTP id u17-20020aa7d551000000b00468fb2c6c8cmr69281620edr.340.1670166361054; Sun, 04 Dec 2022 07:06:01 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-61c7-2644-b62d-0af3.res6.spectrum.com. [2603:6081:7b00:6400:61c7:2644:b62d:af3]) by smtp.gmail.com with ESMTPSA id g1-20020a17090604c100b0073dc5bb7c32sm5240058eja.64.2022.12.04.07.06.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:06:00 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 004/149] Convert CONFIG_SYS_FPGA_CHECK_BUSY to Kconfig Date: Sun, 4 Dec 2022 10:03:29 -0500 Message-Id: <20221204150554.4165941-4-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221204150554.4165941-1-trini@konsulko.com> References: <20221202214251.3027264-41-trini@konsulko.com> <20221204150554.4165941-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.6 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_SYS_FPGA_CHECK_BUSY Signed-off-by: Tom Rini --- drivers/fpga/Kconfig | 4 ++++ drivers/fpga/spartan2.c | 2 -- drivers/fpga/spartan3.c | 2 -- drivers/fpga/virtex2.c | 7 ++----- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index 813d6a836d97..11b742eeebfe 100644 --- a/drivers/fpga/Kconfig +++ b/drivers/fpga/Kconfig @@ -96,6 +96,10 @@ config FPGA_VIRTEX2 Enable Virtex-II FPGA driver for loading in BIT format. This driver also supports many newer Xilinx FPGA families. +config SYS_FPGA_CHECK_BUSY + bool "Perform busy check during load from FPGA" + depends on FPGA_SPARTAN2 || FPGA_SPARTAN3 || FPGA_VIRTEX2 + config FPGA_ZYNQPL bool "Enable Xilinx FPGA for Zynq" depends on ARCH_ZYNQ diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c index 57a4532f736e..68971d934702 100644 --- a/drivers/fpga/spartan2.c +++ b/drivers/fpga/spartan2.c @@ -10,8 +10,6 @@ #include #include /* Spartan-II device family */ -#undef CONFIG_SYS_FPGA_CHECK_BUSY - /* Note: The assumption is that we cannot possibly run fast enough to * overrun the device (the Slave Parallel mode can free run at 50MHz). * If there is a need to operate slower, define CONFIG_FPGA_DELAY in diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c index fdec89bb815f..1d5073cb59d4 100644 --- a/drivers/fpga/spartan3.c +++ b/drivers/fpga/spartan3.c @@ -15,8 +15,6 @@ #include #include /* Spartan-II device family */ -#undef CONFIG_SYS_FPGA_CHECK_BUSY - /* Note: The assumption is that we cannot possibly run fast enough to * overrun the device (the Slave Parallel mode can free run at 50MHz). * If there is a need to operate slower, define CONFIG_FPGA_DELAY in diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c index 8871deaea6f6..ed2a4163f6eb 100644 --- a/drivers/fpga/virtex2.c +++ b/drivers/fpga/virtex2.c @@ -21,14 +21,11 @@ #include /* - * If the SelectMap interface can be overrun by the processor, define - * CONFIG_SYS_FPGA_CHECK_BUSY and/or CONFIG_FPGA_DELAY in the board + * If the SelectMap interface can be overrun by the processor, enable + * CONFIG_SYS_FPGA_CHECK_BUSY and/or define CONFIG_FPGA_DELAY in the board * configuration file and add board-specific support for checking BUSY status. * By default, assume that the SelectMap interface cannot be overrun. */ -#ifndef CONFIG_SYS_FPGA_CHECK_BUSY -#undef CONFIG_SYS_FPGA_CHECK_BUSY -#endif #ifndef CONFIG_FPGA_DELAY #define CONFIG_FPGA_DELAY() -- 2.25.1