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 5E1D3C433EF for ; Tue, 4 Jan 2022 13:24:55 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 41B6782A59; Tue, 4 Jan 2022 14:24:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=foss.st.com header.i=@foss.st.com header.b="49RzUaUG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 04AEA81429; Tue, 4 Jan 2022 14:24:52 +0100 (CET) Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [185.132.182.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2ABD383092 for ; Tue, 4 Jan 2022 14:24:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=7003d21681=patrick.delaunay@foss.st.com Received: from pps.filterd (m0241204.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 204BGtct030769; Tue, 4 Jan 2022 14:24:13 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=selector1; bh=Fe4SnH5SFoeF3htfRB1JN2ra7V0dWS7iPdAso91UDn8=; b=49RzUaUGRMCQODhYBU9OWQJcj53Y2J5fq6ndkQfevYemnGH/rUv+Yd+eVP1MnbbK77sn hmomFZr7wxNvSNhIaqv65f5kxyiVTDBg/a8eyq0KyAvkcX+erg/zen/xyFfn0YXk3Fkp By83RDfazWbnqmxa5hPw2+dVc7XLiBayBGHQZUYOi1QVg6GwUUbKzphdn1SaLhpPvD9r NUPYvkF9RLyJ0MYKRv1blZwLG5qPovLKOOoqljL/PMKrDyS7xP3jIVK0qlC88DvWJOIG n5+euNuylM3GYLUr4Z1erAAekRdanBGgypF3Noan7KTeGDQvqX+w2CAMAqt1xH7Cywa1 Rw== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3dcewm2650-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 04 Jan 2022 14:24:13 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id C5ACF100038; Tue, 4 Jan 2022 14:24:09 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag2node2.st.com [10.75.127.5]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id BDA4726029F; Tue, 4 Jan 2022 14:24:09 +0100 (CET) Received: from localhost (10.75.127.51) by SFHDAG2NODE2.st.com (10.75.127.5) with Microsoft SMTP Server (TLS) id 15.0.1497.26; Tue, 4 Jan 2022 14:24:09 +0100 From: Patrick Delaunay To: CC: Marek Vasut , Simon Glass , Patrick Delaunay , Andes , Lukasz Majewski , Marek Vasut , Nobuhiro Iwamatsu , Paul Burton , Rick Chen , Stefan Roese , Thomas Chou , Tuomas Tynkkynen , U-Boot STM32 Subject: [PATCH v1 3/5] mtd: cfi: change CONFIG_SYS_MAX_FLASH_BANKS_DETECT as boolean Date: Tue, 4 Jan 2022 14:23:59 +0100 Message-ID: <20220104142328.v1.3.Ie095df1d92aa81e8fc78fd288df631790d5666cb@changeid> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220104132401.3573475-1-patrick.delaunay@foss.st.com> References: <20220104132401.3573475-1-patrick.delaunay@foss.st.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.75.127.51] X-ClientProxiedBy: SFHDAG2NODE1.st.com (10.75.127.4) To SFHDAG2NODE2.st.com (10.75.127.5) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-04_05,2022-01-04_01,2021-12-02_01 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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.2 at phobos.denx.de X-Virus-Status: Clean Prepare migration to Kconfig. CONFIG_SYS_MAX_FLASH_BANKS_DETECT becomes boolean and CONFIG_SYS_MAX_FLASH_BANKS define the MAX size, also used for detection when CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y (CFI_MAX_FLASH_BANKS = CONFIG_SYS_MAX_FLASH_BANKS). CONFIG_SYS_MAX_FLASH_BANKS become mandatory when CONFIG_SYS_MAX_FLASH_BANKS_DETECT is activated. Signed-off-by: Patrick Delaunay --- Changes in v1: - solve issue in cfi_flash.h, with CFI_FLASH_BANKS=CONFIG_SYS_MAX_FLASH_BANKS_DETECT drivers/mtd/cfi_flash.c | 2 +- include/configs/3c120_devboard.h | 3 ++- include/configs/adp-ae3xx.h | 4 +--- include/configs/adp-ag101p.h | 2 -- include/configs/ax25-ae350.h | 4 +--- include/configs/bmips_bcm6338.h | 3 ++- include/configs/bmips_bcm6348.h | 3 ++- include/configs/bmips_bcm6358.h | 3 ++- include/configs/bmips_bcm6368.h | 3 ++- include/configs/boston.h | 4 +++- include/configs/draak.h | 3 ++- include/configs/ebisu.h | 3 ++- include/configs/j721e_evm.h | 3 ++- include/configs/mccmon6.h | 3 ++- include/configs/qemu-arm.h | 3 ++- include/configs/salvator-x.h | 3 ++- include/configs/ulcb.h | 3 ++- include/mtd/cfi_flash.h | 10 +++++----- 18 files changed, 35 insertions(+), 27 deletions(-) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 71cefc125f..aae3ea0d1b 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -96,7 +96,7 @@ static u16 cfi_flash_config_reg(int i) } #if defined(CONFIG_SYS_MAX_FLASH_BANKS_DETECT) -int cfi_flash_num_flash_banks = CONFIG_SYS_MAX_FLASH_BANKS_DETECT; +int cfi_flash_num_flash_banks = CFI_MAX_FLASH_BANKS; #else int cfi_flash_num_flash_banks; #endif diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index f7ad7efb0d..e52fedcf39 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -20,7 +20,8 @@ * CFI Flash */ #define CONFIG_SYS_CFI_FLASH_STATUS_POLL /* fix amd flash issue */ -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_SECT 512 /* diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index 58e8526048..11eff3852d 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -156,7 +156,7 @@ /* support JEDEC */ #ifdef CONFIG_CFI_FLASH -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #endif /* Do not use CONFIG_FLASH_CFI_LEGACY to detect on board flash */ @@ -173,9 +173,7 @@ * There are 4 banks supported for this Controller, * but we have only 1 bank connected to flash on board */ -#ifndef CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_BANKS 1 -#endif #define CONFIG_SYS_FLASH_BANKS_SIZES {0x4000000} /* max number of sectors on one chip */ diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 1022764985..31ef30adc6 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -286,9 +286,7 @@ * There are 4 banks supported for this Controller, * but we have only 1 bank connected to flash on board */ -#ifndef CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_BANKS 1 -#endif #define CONFIG_SYS_FLASH_BANKS_SIZES {0x4000000} /* max number of sectors on one chip */ diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h index 1c3f957d32..2ad0d1589c 100644 --- a/include/configs/ax25-ae350.h +++ b/include/configs/ax25-ae350.h @@ -80,7 +80,7 @@ /* support JEDEC */ #ifdef CONFIG_CFI_FLASH -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #endif/* Do not use CONFIG_FLASH_CFI_LEGACY to detect on board flash */ #define PHYS_FLASH_1 0x88000000 /* BANK 0 */ #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 @@ -95,9 +95,7 @@ * There are 4 banks supported for this Controller, * but we have only 1 bank connected to flash on board */ -#ifndef CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_BANKS 1 -#endif #define CONFIG_SYS_FLASH_BANKS_SIZES {0x4000000} /* max number of sectors on one chip */ diff --git a/include/configs/bmips_bcm6338.h b/include/configs/bmips_bcm6338.h index 6eaca1c31b..b7de3f4058 100644 --- a/include/configs/bmips_bcm6338.h +++ b/include/configs/bmips_bcm6338.h @@ -22,6 +22,7 @@ #define CONFIG_SYS_FLASH_BASE 0xbfc00000 #define CONFIG_SYS_FLASH_EMPTY_INFO -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #endif /* __CONFIG_BMIPS_BCM6338_H */ diff --git a/include/configs/bmips_bcm6348.h b/include/configs/bmips_bcm6348.h index 5bfbcb779b..5ed0eebce4 100644 --- a/include/configs/bmips_bcm6348.h +++ b/include/configs/bmips_bcm6348.h @@ -29,6 +29,7 @@ #define CONFIG_SYS_FLASH_BASE 0xbfc00000 #define CONFIG_SYS_FLASH_EMPTY_INFO -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #endif /* __CONFIG_BMIPS_BCM6348_H */ diff --git a/include/configs/bmips_bcm6358.h b/include/configs/bmips_bcm6358.h index f8c81f698d..829e9f6b17 100644 --- a/include/configs/bmips_bcm6358.h +++ b/include/configs/bmips_bcm6358.h @@ -31,6 +31,7 @@ #define CONFIG_SYS_FLASH_BASE 0xbe000000 #define CONFIG_SYS_FLASH_EMPTY_INFO -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #endif /* __CONFIG_BMIPS_BCM6358_H */ diff --git a/include/configs/bmips_bcm6368.h b/include/configs/bmips_bcm6368.h index 7d321e14ff..0952b98473 100644 --- a/include/configs/bmips_bcm6368.h +++ b/include/configs/bmips_bcm6368.h @@ -31,6 +31,7 @@ #define CONFIG_SYS_FLASH_BASE 0xb8000000 #define CONFIG_SYS_FLASH_EMPTY_INFO -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #endif /* __CONFIG_BMIPS_BCM6368_H */ diff --git a/include/configs/boston.h b/include/configs/boston.h index cd70e7bd32..7ac044e929 100644 --- a/include/configs/boston.h +++ b/include/configs/boston.h @@ -40,7 +40,9 @@ /* * Flash */ -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 + +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* diff --git a/include/configs/draak.h b/include/configs/draak.h index d28cc9d336..412c57f150 100644 --- a/include/configs/draak.h +++ b/include/configs/draak.h @@ -23,7 +23,8 @@ #define CONFIG_FLASH_SHOW_PROGRESS 45 #define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_WRITE_SWAPPED_DATA diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h index 081d5e9aaa..87053760e2 100644 --- a/include/configs/ebisu.h +++ b/include/configs/ebisu.h @@ -26,7 +26,8 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_WRITE_SWAPPED_DATA diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index 10555d1a6c..acac81ad68 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -60,7 +60,8 @@ #define CONFIG_CQSPI_REF_CLK 133333333 /* HyperFlash related configuration */ -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT /* U-Boot general configuration */ #define EXTRA_ENV_J721E_BOARD_SETTINGS \ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 11b9ceb547..aa95864516 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -37,7 +37,8 @@ #define CONFIG_FLASH_VERIFY /* NOR Flash MTD */ -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_FLASH_BANKS_LIST { (CONFIG_SYS_FLASH_BASE) } #define CONFIG_SYS_FLASH_BANKS_SIZES { (32 * SZ_1M) } diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 1287fd1671..fe958ef3c5 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -42,7 +42,8 @@ #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 2 +#define CONFIG_SYS_MAX_FLASH_BANKS 2 +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_SECT 256 /* Sector: 256K, Bank: 64M */ #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index c29b34e231..da3e2c8856 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -24,7 +24,8 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_WRITE_SWAPPED_DATA diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h index bdd6b4b0d9..c22c30c86f 100644 --- a/include/configs/ulcb.h +++ b/include/configs/ulcb.h @@ -24,7 +24,8 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_WRITE_SWAPPED_DATA diff --git a/include/mtd/cfi_flash.h b/include/mtd/cfi_flash.h index d62c8f18fc..d4aeea7e46 100644 --- a/include/mtd/cfi_flash.h +++ b/include/mtd/cfi_flash.h @@ -158,19 +158,19 @@ struct cfi_pri_hdr { * cfi_flash_num_flash_banks when CONFIG_SYS_MAX_FLASH_BANKS_DETECT is defined * or CONFIG_SYS_MAX_FLASH_BANKS */ +#define CFI_MAX_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS + #if defined(CONFIG_SYS_MAX_FLASH_BANKS_DETECT) -#define CFI_MAX_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS_DETECT /* map to cfi_flash_num_flash_banks only when supported */ #if IS_ENABLED(CONFIG_FLASH_CFI_DRIVER) && \ (!IS_ENABLED(CONFIG_SPL_BUILD) || IS_ENABLED(CONFIG_SPL_MTD_SUPPORT)) #define CFI_FLASH_BANKS (cfi_flash_num_flash_banks) /* board code can update this variable before CFI detection */ extern int cfi_flash_num_flash_banks; -#else -#define CFI_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS_DETECT #endif -#else -#define CFI_MAX_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS +#endif +/* default when bank detection is not supported */ +#ifndef CFI_FLASH_BANKS #define CFI_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS #endif -- 2.25.1