Convert CONFIG_SYS_FLASH_CFI_WIDTH to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_FLASH_CFI_WIDTH

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig
index 757792f9b0f4918764d3499cf352d0ed5cf46599..4ab888f59ed52fb01e6185a297da8fa8678aea31 100644 (file)
--- a/configs/M5208EVBE_defconfig
+++ b/configs/M5208EVBE_defconfig
@@ -34,6 +34,7 @@ CONFIG_SYS_I2C_SLAVE=0x7F
 CONFIG_SYS_I2C_SPEED=80000
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_ETH=y

diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig
index 1ed127ca3c27a0cf55a2e0db05fcf4300debd276..2a7996278418e0295c1cb40e708d7e1e874da085 100644 (file)
--- a/configs/M5235EVB_Flash32_defconfig
+++ b/configs/M5235EVB_Flash32_defconfig
@@ -41,6 +41,7 @@ CONFIG_SYS_I2C_SLAVE=0x7F
 CONFIG_SYS_I2C_SPEED=80000
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_32BIT=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_ETH=y

diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig
index fed386c164ad15681b9d1358f1bc1d2356094aa6..5eeed2d2f3131b666901ab701636ba0328c6f238 100644 (file)
--- a/configs/M5235EVB_defconfig
+++ b/configs/M5235EVB_defconfig
@@ -41,6 +41,7 @@ CONFIG_SYS_I2C_SLAVE=0x7F
 CONFIG_SYS_I2C_SPEED=80000
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_ETH=y

diff --git a/configs/M5249EVB_defconfig b/configs/M5249EVB_defconfig
index 171df12564ff0f174646c31e8861fdf90b74861e..f99375b535ed460994beb815d880361a919242a2 100644 (file)
--- a/configs/M5249EVB_defconfig
+++ b/configs/M5249EVB_defconfig
@@ -25,6 +25,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 # CONFIG_NET is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_MCFUART=y

diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig
index 376fb4253060366d4745f28c9b98c8bb245f000a..e3f736bf6308b71fc6a9a81d60fa960392c7e6f0 100644 (file)
--- a/configs/M5272C3_defconfig
+++ b/configs/M5272C3_defconfig
@@ -54,6 +54,7 @@ CONFIG_SYS_BR7_PRELIM=0x701
 CONFIG_SYS_OR7_PRELIM=0xFFC0007C
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_ETH=y

diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig
index 8f38710b0742820618a10c2365232d6b0771fb13..42940e1000a4c05954dbae2882aa6a6293787d99 100644 (file)
--- a/configs/M5282EVB_defconfig
+++ b/configs/M5282EVB_defconfig
@@ -30,6 +30,7 @@ CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
 CONFIG_SYS_RX_ETH_BUFFER=8
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_ETH=y

diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig
index 246bc8a3bed70cff3c95e2d5612c526189812de3..901a15d5061a946891a3933c045777faa7ee13d5 100644 (file)
--- a/configs/M53017EVB_defconfig
+++ b/configs/M53017EVB_defconfig
@@ -36,6 +36,7 @@ CONFIG_SYS_I2C_SLAVE=0x7F
 CONFIG_SYS_I2C_SPEED=80000
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y

diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig
index 3536b4432de4ec636f62d1c130f3fbc472bde52b..0bce9d8f42292baa49ce59e46e3cfaf64dff868b 100644 (file)
--- a/configs/M5329AFEE_defconfig
+++ b/configs/M5329AFEE_defconfig
@@ -36,6 +36,7 @@ CONFIG_SYS_I2C_SPEED=80000
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_ETH=y

diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig
index a020775c87d08adb112f1a2bd09c0dde4f7882ff..efc7733b44c214048e09d4afeb69428b2a949302 100644 (file)
--- a/configs/M5329BFEE_defconfig
+++ b/configs/M5329BFEE_defconfig
@@ -37,6 +37,7 @@ CONFIG_SYS_I2C_SPEED=80000
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_MTD_RAW_NAND=y

diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig
index b008b91fdd5461748d0d152d6f3dfbf7e482fe4a..920a86fa9aa7ddaf35f6b5c6687d8b8faf2ca6f5 100644 (file)
--- a/configs/M5373EVB_defconfig
+++ b/configs/M5373EVB_defconfig
@@ -37,6 +37,7 @@ CONFIG_SYS_I2C_SPEED=80000
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_MTD_RAW_NAND=y

diff --git a/configs/ae350_rv32_defconfig b/configs/ae350_rv32_defconfig
index 9c1fe5689644005505d05bf8124b2e955f18404e..340ec49c461e19e50283960c370bbce7a63d7fed 100644 (file)
--- a/configs/ae350_rv32_defconfig
+++ b/configs/ae350_rv32_defconfig
@@ -29,6 +29,7 @@ CONFIG_FTSDC010=y
 CONFIG_FTSDC010_SDIO=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y

diff --git a/configs/ae350_rv32_spl_defconfig b/configs/ae350_rv32_spl_defconfig
index 502701f35c8f4372f509f3963028926872f3bec7..fffae6f5af0ffc97d5a618b3c90d3ec42f05406d 100644 (file)
--- a/configs/ae350_rv32_spl_defconfig
+++ b/configs/ae350_rv32_spl_defconfig
@@ -33,6 +33,7 @@ CONFIG_FTSDC010=y
 CONFIG_FTSDC010_SDIO=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH_MACRONIX=y

diff --git a/configs/ae350_rv32_spl_xip_defconfig b/configs/ae350_rv32_spl_xip_defconfig
index 8291a69821809d49a6471fbc4fdf569ab96ee1cf..20acfadefed22cde47d1752c36ba9efdd5e65c8f 100644 (file)
--- a/configs/ae350_rv32_spl_xip_defconfig
+++ b/configs/ae350_rv32_spl_xip_defconfig
@@ -35,6 +35,7 @@ CONFIG_FTSDC010=y
 CONFIG_FTSDC010_SDIO=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH_MACRONIX=y

diff --git a/configs/ae350_rv32_xip_defconfig b/configs/ae350_rv32_xip_defconfig
index 62fb51baad4c5d2757f6fcf11f783cb0a79893cb..16ff634d15a9bc02f3ca77913a3f6799e4dba69e 100644 (file)
--- a/configs/ae350_rv32_xip_defconfig
+++ b/configs/ae350_rv32_xip_defconfig
@@ -30,6 +30,7 @@ CONFIG_FTSDC010=y
 CONFIG_FTSDC010_SDIO=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y

diff --git a/configs/ae350_rv64_defconfig b/configs/ae350_rv64_defconfig
index 681c40fd770e18f863ad96bbcfcea1226b408437..ba525c98c2ae6fb6ce03a64aa6643d207516372a 100644 (file)
--- a/configs/ae350_rv64_defconfig
+++ b/configs/ae350_rv64_defconfig
@@ -30,6 +30,7 @@ CONFIG_FTSDC010=y
 CONFIG_FTSDC010_SDIO=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y

diff --git a/configs/ae350_rv64_spl_defconfig b/configs/ae350_rv64_spl_defconfig
index 8da4786d7a5e6bd70163c940aada7b0a1153fd2b..2580bda17f45c9128f91613987c0675bd82c3859 100644 (file)
--- a/configs/ae350_rv64_spl_defconfig
+++ b/configs/ae350_rv64_spl_defconfig
@@ -34,6 +34,7 @@ CONFIG_FTSDC010=y
 CONFIG_FTSDC010_SDIO=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH_MACRONIX=y

diff --git a/configs/ae350_rv64_spl_xip_defconfig b/configs/ae350_rv64_spl_xip_defconfig
index e2022e7ec25be9eedfb301166ba6a6f516b89172..d8fe93f1f8c0aa972630be7690e1e74825552ecb 100644 (file)
--- a/configs/ae350_rv64_spl_xip_defconfig
+++ b/configs/ae350_rv64_spl_xip_defconfig
@@ -36,6 +36,7 @@ CONFIG_FTSDC010=y
 CONFIG_FTSDC010_SDIO=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH_MACRONIX=y

diff --git a/configs/ae350_rv64_xip_defconfig b/configs/ae350_rv64_xip_defconfig
index b5bdf94dafb7310b8770c2444ba0331c1b733b43..49511ab154931d43696adda3cc7f9f88cffb3a5f 100644 (file)
--- a/configs/ae350_rv64_xip_defconfig
+++ b/configs/ae350_rv64_xip_defconfig
@@ -31,6 +31,7 @@ CONFIG_FTSDC010=y
 CONFIG_FTSDC010_SDIO=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y

diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig
index 01e9ea37222521c260a1a6c6771caaf1b1b31e28..f4bb406be3cc211706e9af9f5dc3605e4b8dda37 100644 (file)
--- a/configs/blanche_defconfig
+++ b/configs/blanche_defconfig
@@ -55,6 +55,7 @@ CONFIG_RENESAS_SDHI=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_SPI_FLASH=y

diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig
index d634280de5d3bffe3cbd11720995c2db5bdba101..4cf03abc61e4a85822a9c836b4d2c69d22b789d7 100644 (file)
--- a/configs/eb_cpu5282_defconfig
+++ b/configs/eb_cpu5282_defconfig
@@ -45,6 +45,7 @@ CONFIG_LED_STATUS_BOOT=0
 CONFIG_LED_STATUS_CMD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_ETH=y

diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig
index a726fdb56e3766a75c24479489829d4c80fd0b9a..1178515846933c351084f7d0ccb7651a8ff2c0c5 100644 (file)
--- a/configs/eb_cpu5282_internal_defconfig
+++ b/configs/eb_cpu5282_internal_defconfig
@@ -43,6 +43,7 @@ CONFIG_LED_STATUS_BOOT=0
 CONFIG_LED_STATUS_CMD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_ETH=y

diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig
index 779f0d9ed89bee832b6e39be0399d460252cde83..9a944cad39c26b6f6d36a4a201830fca861ff96b 100644 (file)
--- a/configs/kzm9g_defconfig
+++ b/configs/kzm9g_defconfig
@@ -36,6 +36,7 @@ CONFIG_SYS_I2C_SH=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0x10000000

diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig
index e837b391ebc1f6ed1744ff380d477c34264780e5..3718d08b6700e1da68d88d2c26eb97e207e0a630 100644 (file)
--- a/configs/mccmon6_nor_defconfig
+++ b/configs/mccmon6_nor_defconfig
@@ -60,6 +60,7 @@ CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y

diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig
index 0f17ccdc85debe8352894a3baa7e16292789ac19..3228050dd206735c7250f1c984fe957190340bdb 100644 (file)
--- a/configs/mccmon6_sd_defconfig
+++ b/configs/mccmon6_sd_defconfig
@@ -58,6 +58,7 @@ CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y

diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig
index 5db671d694eaeea12fbed418181da4da715f24ec..ffb0e28569aeb9e5372e24b28376dbf672b96008 100644 (file)
--- a/configs/omap35_logic_somlv_defconfig
+++ b/configs/omap35_logic_somlv_defconfig
@@ -62,6 +62,7 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y

diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig
index 2c5d60d164aed97d60e4f5be3bfd22e2233206f6..b49734666d770123ca896ff57637d0a6e152865c 100644 (file)
--- a/configs/omap3_logic_somlv_defconfig
+++ b/configs/omap3_logic_somlv_defconfig
@@ -63,6 +63,7 @@ CONFIG_MMC_OMAP36XX_PINS=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y

diff --git a/configs/r8a77990_ebisu_defconfig b/configs/r8a77990_ebisu_defconfig
index 7ba55737d841e59e40d5bd9c720fb689337efd97..3fd65e97c44bbc616335c8bd500ca07ed175d69d 100644 (file)
--- a/configs/r8a77990_ebisu_defconfig
+++ b/configs/r8a77990_ebisu_defconfig
@@ -72,6 +72,7 @@ CONFIG_RENESAS_SDHI=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_CFI_FLASH=y
 CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS=y
 CONFIG_FLASH_CFI_MTD=y

diff --git a/configs/r8a77995_draak_defconfig b/configs/r8a77995_draak_defconfig
index e2a7e5f636dd40838c1b603f570f05d7a7414c13..ee0f61513175ff2a07f9ab7da2cb6681bbf143a8 100644 (file)
--- a/configs/r8a77995_draak_defconfig
+++ b/configs/r8a77995_draak_defconfig
@@ -66,6 +66,7 @@ CONFIG_RENESAS_SDHI=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_CFI_FLASH=y
 CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS=y
 CONFIG_FLASH_CFI_MTD=y

diff --git a/configs/rcar3_salvator-x_defconfig b/configs/rcar3_salvator-x_defconfig
index 7bcbb3a13394cc150f06d87a08ed7596355a6210..7263b32101d0a32079445871e60efcf222390973 100644 (file)
--- a/configs/rcar3_salvator-x_defconfig
+++ b/configs/rcar3_salvator-x_defconfig
@@ -75,6 +75,7 @@ CONFIG_RENESAS_SDHI=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_CFI_FLASH=y
 CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS=y
 CONFIG_FLASH_CFI_MTD=y

diff --git a/configs/rcar3_ulcb_defconfig b/configs/rcar3_ulcb_defconfig
index c953299c0d0ff58b14c4e7674a94215545c7e05a..052465c8d7a9947fc6e0cd71e94af792d8be88f5 100644 (file)
--- a/configs/rcar3_ulcb_defconfig
+++ b/configs/rcar3_ulcb_defconfig
@@ -74,6 +74,7 @@ CONFIG_RENESAS_SDHI=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_CFI_FLASH=y
 CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS=y
 CONFIG_FLASH_CFI_MTD=y

diff --git a/configs/total_compute_defconfig b/configs/total_compute_defconfig
index 1a674de8157caa6bf8103ab1ea5f0039de7f8a95..e0f76b711b3ca6d72337ae0153b4e3162a07c575 100644 (file)
--- a/configs/total_compute_defconfig
+++ b/configs/total_compute_defconfig
@@ -49,6 +49,7 @@ CONFIG_ARM_PL180_MMCI=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_32BIT=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y

diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig
index 688cecb7632c532b8b6fe2a342c6605f163f1284..fdfcf3b49606200cd9c071484dd03d28da0c4515 100644 (file)
--- a/configs/vexpress_aemv8a_juno_defconfig
+++ b/configs/vexpress_aemv8a_juno_defconfig
@@ -26,6 +26,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_UBI=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
+CONFIG_SYS_FLASH_CFI_WIDTH_32BIT=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y

diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
index 95412d24eea3d2d902ac2e23a5bfe9d66e733705..0ae8ae10a3106eca9fbfe9b467f5851d488e8ca4 100644 (file)
--- a/configs/vexpress_aemv8a_semi_defconfig
+++ b/configs/vexpress_aemv8a_semi_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_UBI=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
+CONFIG_SYS_FLASH_CFI_WIDTH_32BIT=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y

diff --git a/configs/xtfpga_defconfig b/configs/xtfpga_defconfig
index e98af5ec7e633ffb6b60733d642b4b8edba476fd..eab40fc0d133e9b93529041cd1e6886a5f144346 100644 (file)
--- a/configs/xtfpga_defconfig
+++ b/configs/xtfpga_defconfig
@@ -38,6 +38,7 @@ CONFIG_DM=y
 # CONFIG_DM_SEQ_ALIAS is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_PHYLIB=y

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 4088267dd111d5bf453746984131c0529673a5f9..c3f5455347ed2a68f6aa9bb3eeb3bcefda17d6f9 100644 (file)
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -48,6 +48,35 @@ config FLASH_CFI_DRIVER
          option. Visit <http://www.amd.com/products/nvd/overview/cfi.html>
          for more information on CFI.
 
+choice
+       prompt "Data-width of the flash device"
+       depends on FLASH_CFI_DRIVER
+       default SYS_FLASH_CFI_WIDTH_8BIT
+
+config SYS_FLASH_CFI_WIDTH_8BIT
+       bool "Data-width of the device is 8-bit"
+
+config SYS_FLASH_CFI_WIDTH_16BIT
+       bool "Data-width of the device is 16-bit"
+
+config SYS_FLASH_CFI_WIDTH_32BIT
+       bool "Data-width of the device is 32-bit"
+
+config SYS_FLASH_CFI_WIDTH_64BIT
+       bool "Data-width of the device is 64-bit"
+
+endchoice
+
+config SYS_FLASH_CFI_WIDTH
+       hex
+       depends on FLASH_CFI_DRIVER
+       default 0x1 if SYS_FLASH_CFI_WIDTH_8BIT
+       default 0x2 if SYS_FLASH_CFI_WIDTH_16BIT
+       default 0x4 if SYS_FLASH_CFI_WIDTH_32BIT
+       default 0x8 if SYS_FLASH_CFI_WIDTH_64BIT
+       help
+         This must be kept in sync with the table in include/flash.h
+
 config CFI_FLASH
        bool "Enable Driver Model for CFI Flash driver"
        depends on DM_MTD

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index aae3ea0d1b45451f5249e083f3a9b30ed9e2b4a6..495041070650f70a5f0cbc5f5356698e87a55b93 100644 (file)
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -68,13 +68,6 @@ static uint flash_verbose = 1;
 
 flash_info_t flash_info[CFI_MAX_FLASH_BANKS];  /* FLASH chips info */
 
-/*
- * Check if chip width is defined. If not, start detecting with 8bit.
- */
-#ifndef CONFIG_SYS_FLASH_CFI_WIDTH
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_8BIT
-#endif
-
 #ifdef CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
 #define __maybe_weak __weak
 #else

diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 135dec0ebb4dc11f6e2cb40e83685685d3290574..4ca71ad41ba2be7a05b0950bfe40f1a057258dbd 100644 (file)
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -94,7 +94,6 @@
 /* FLASH organization */
 #ifdef CONFIG_SYS_FLASH_CFI
 #      define CONFIG_SYS_FLASH_SIZE            0x800000        /* Max size that the board might have */
-#      define CONFIG_SYS_FLASH_CFI_WIDTH       FLASH_CFI_16BIT
 #      define CONFIG_SYS_MAX_FLASH_SECT        254     /* max number of sectors on one chip */
 #endif
 

diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 88f5f155633c7a20ca5e70f9bf7eb4a8125961ab..68b695c6fbbd1f73c2179040a51d6b0bdc43866f 100644 (file)
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -102,11 +102,6 @@
  */
 #ifdef CONFIG_SYS_FLASH_CFI
 #      define CONFIG_SYS_FLASH_SIZE            0x800000        /* Max size that the board might have */
-#ifdef CONFIG_NORFLASH_PS32BIT
-#      define CONFIG_SYS_FLASH_CFI_WIDTH       FLASH_CFI_32BIT
-#else
-#      define CONFIG_SYS_FLASH_CFI_WIDTH       FLASH_CFI_16BIT
-#endif
 #      define CONFIG_SYS_MAX_FLASH_SECT        137     /* max number of sectors on one chip */
 #endif
 

diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index 1a604f5c81ea364d0a3d748b2b63de78c77f03c6..64eae702160fe8b8ff1d106fd0e86b608df92bde 100644 (file)
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -79,7 +79,6 @@
 #ifdef CONFIG_SYS_FLASH_CFI
 
 #      define CONFIG_SYS_FLASH_SIZE            0x1000000       /* Max size that the board might have */
-#      define CONFIG_SYS_FLASH_CFI_WIDTH       FLASH_CFI_16BIT
 #      define CONFIG_SYS_MAX_FLASH_SECT        137     /* max number of sectors on one chip */
 #      define CONFIG_SYS_FLASH_CHECKSUM
 #      define CONFIG_SYS_FLASH_BANKS_LIST      { CONFIG_SYS_FLASH_BASE }

diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 0a416dc122662f213f7a52e7410a7623d66ffee1..e81768441ec47d5eb9bd58bedcc858418c66e8b3 100644 (file)
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -115,7 +115,6 @@
  * 0x30 is block erase in SST
  */
 #      define CONFIG_SYS_FLASH_SIZE            0x800000
-#      define CONFIG_SYS_FLASH_CFI_WIDTH       FLASH_CFI_16BIT
 #      define CONFIG_FLASH_CFI_LEGACY
 #else
 #      define CONFIG_SYS_SST_SECT              2048

diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 6b4028c17ca28ac873027bd5ac07d4a830bf9ac7..bd4c531751e2ef20948b495bc0d3f9b29f230616 100644 (file)
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -102,7 +102,6 @@
  */
 #ifdef CONFIG_SYS_FLASH_CFI
 #      define CONFIG_SYS_FLASH_SIZE            0x800000        /* Max size that the board might have */
-#      define CONFIG_SYS_FLASH_CFI_WIDTH       FLASH_CFI_16BIT
 #      define CONFIG_SYS_MAX_FLASH_SECT        137     /* max number of sectors on one chip */
 #endif
 

diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index fe04a70b61e9cc8c556b2be77b57539467aab9fd..c0358ccc5269daef3e78886a295453d7b74ecf7f 100644 (file)
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -106,7 +106,6 @@
 #ifdef CONFIG_SYS_FLASH_CFI
 
 #      define CONFIG_SYS_FLASH_SIZE            0x1000000       /* Max size that the board might have */
-#      define CONFIG_SYS_FLASH_CFI_WIDTH       FLASH_CFI_16BIT
 #      define CONFIG_SYS_MAX_FLASH_SECT        137     /* max number of sectors on one chip */
 #      define CONFIG_SYS_FLASH_CHECKSUM
 #      define CONFIG_SYS_FLASH_BANKS_LIST      { CONFIG_SYS_FLASH_BASE }

diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 9b84d3693a3166367b5dc0d34a59688380038068..15173d49b000802c435f2a87ac4b0c255e6a8943 100644 (file)
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -111,7 +111,6 @@
 #ifdef CONFIG_SYS_FLASH_CFI
 #      define CONFIG_FLASH_SPANSION_S29WS_N    1
 #      define CONFIG_SYS_FLASH_SIZE            0x1000000       /* Max size that the board might have */
-#      define CONFIG_SYS_FLASH_CFI_WIDTH       FLASH_CFI_16BIT
 #      define CONFIG_SYS_MAX_FLASH_SECT        137     /* max number of sectors on one chip */
 #endif
 

diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 7e65f9914f4dad35e7b63cd065baf20bf38d5e71..06c023b3ad6a25aa24a69eeddc83cb2706caad1e 100644 (file)
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -106,7 +106,6 @@
  */
 #ifdef CONFIG_SYS_FLASH_CFI
 #      define CONFIG_SYS_FLASH_SIZE            0x800000        /* Max size that the board might have */
-#      define CONFIG_SYS_FLASH_CFI_WIDTH       FLASH_CFI_16BIT
 #      define CONFIG_SYS_MAX_FLASH_SECT        137     /* max number of sectors on one chip */
 #endif
 

diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index b131aefd6dd156ac6b1e1eae109c39a386094a38..6b2d60fac8467d1ea9ffd79ce554978e7ac4c8ff 100644 (file)
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -108,7 +108,6 @@
  */
 #ifdef CONFIG_SYS_FLASH_CFI
 #      define CONFIG_SYS_FLASH_SIZE            0x800000        /* Max size that the board might have */
-#      define CONFIG_SYS_FLASH_CFI_WIDTH       FLASH_CFI_16BIT
 #      define CONFIG_SYS_MAX_FLASH_SECT        137     /* max number of sectors on one chip */
 #endif
 

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index fd5b209a52db25bcb4b17dfb854d91ecd649c63d..78b359dcea9300fa3e8790e9bb034780f3b461c8 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -241,7 +241,6 @@
 #if defined(CONFIG_NOR)
 #define CONFIG_SYS_MAX_FLASH_SECT      128
 #define CONFIG_SYS_FLASH_BASE          (0x08000000)
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
 #define CONFIG_SYS_FLASH_SIZE          0x01000000
 #endif  /* NOR support */
 

diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 44af5b44badf39252663f0d8b4f0770d28a059b9..e7d685a657e35e78ac0cf9c641e43bf792f371a6 100644 (file)
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -47,7 +47,6 @@
 #define CONFIG_SYS_BOOTMAPSZ           (8 * 1024 * 1024)
 
 /* FLASH */
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
 #define CONFIG_SYS_FLASH_BASE          0x00000000
 #define CONFIG_SYS_MAX_FLASH_SECT      512
 #define CONFIG_SYS_FLASH_BANKS_LIST    { (CONFIG_SYS_FLASH_BASE) }

diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h
index 633be8f614140e25e36a08ca2c3a4535b6245fce..03fe9469bf1a55b9527c4e2e2a0be61eebefe0e0 100644 (file)
--- a/include/configs/ax25-ae350.h
+++ b/include/configs/ax25-ae350.h
@@ -58,7 +58,6 @@
 
 /* use CFI framework */
 
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
 #define CONFIG_SYS_CFI_FLASH_STATUS_POLL
 
 /* support JEDEC */

diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index 4f8da5940431f5a8747bf0aa1f445a756ed4d6f3..d0f37b6cc20c21bfaf8565eb8c2ec82acab747d2 100644 (file)
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -28,7 +28,6 @@
 #if !defined(CONFIG_MTD_NOR_FLASH)
 #define CONFIG_SH_QSPI_BASE    0xE6B10000
 #else
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
 #define CONFIG_FLASH_SHOW_PROGRESS     45
 #define CONFIG_SYS_FLASH_BASE          0x00000000
 #define CONFIG_SYS_FLASH_SIZE          0x04000000      /* 64 MB */

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index e16af8824b40fe4ac163d62c387082ab4421d778..9f685b19879174de41a145d16ed25a5d61afe588 100644 (file)
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -95,7 +95,6 @@
 #if defined(CONFIG_NOR)
 /* NOR: device related configs */
 #define CONFIG_SYS_MAX_FLASH_SECT      512
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
 #define CONFIG_SYS_FLASH_SIZE          (64 * 1024 * 1024) /* 64 MB */
 #define CONFIG_SYS_FLASH_BASE          (0x08000000)
 /* Reduce SPL size by removing unlikey targets */

diff --git a/include/configs/draak.h b/include/configs/draak.h
index 476b4c3710a27d26a1f6b27745cccd82bc79b1ea..a38e48634835b8093975f7da427de5ad0dd1f81a 100644 (file)
--- a/include/configs/draak.h
+++ b/include/configs/draak.h
@@ -15,7 +15,6 @@
 
 #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_SECT      256
 #define CONFIG_SYS_WRITE_SWAPPED_DATA
 

diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 70ee288aa72e75d8024e0aefdca26c1462c65851..cbc29ddb5180568b0369a09f3a4886a55af0148d 100644 (file)
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -102,7 +102,6 @@
 #define        CONFIG_SYS_FLASH_ERASE_TOUT     10000000
 
 #define CONFIG_SYS_FLASH_SIZE          16*1024*1024
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE }
 

diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h
index 3adc4180efd9b33c9cb0ca7009017c0c2c910d1a..3dc111f5248d419d988e5332c712d5fac55722da 100644 (file)
--- a/include/configs/ebisu.h
+++ b/include/configs/ebisu.h
@@ -18,7 +18,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS     45
 #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_SECT      256
 #define CONFIG_SYS_WRITE_SWAPPED_DATA
 

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 3fd441e30ba09e4cc7ee8e2d0b271b909c7a3111..d5c9489bce6e4e55506417c28208f5ec68eb2b89 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -108,7 +108,6 @@
 /*
  * NOR FLASH setup
  */
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_8BIT
 #define CONFIG_FLASH_SHOW_PROGRESS     50
 
 #define CONFIG_SYS_FLASH_BASE          0xFF800000

diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 2ea8b82dd0925797c0b0efc97418b9cbbacfdc1f..442505adaa1419400574cc76cdb1ad9fc1390ed9 100644 (file)
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -19,7 +19,6 @@
 /* NOR Flash */
 #define KZM_FLASH_BASE (0x00000000)
 #define CONFIG_SYS_FLASH_BASE          (KZM_FLASH_BASE)
-#define CONFIG_SYS_FLASH_CFI_WIDTH     (FLASH_CFI_16BIT)
 #define CONFIG_SYS_MAX_FLASH_SECT      (512)
 
 /* prompt */

diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index dcce52eb7d37bc86748b93db6dcbc6a831d8145e..f24a0072417366147f00f67131456c12b0fea633 100644 (file)
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -31,7 +31,6 @@
 
 /* NOR 16-bit mode */
 #define CONFIG_SYS_FLASH_BASE           WEIM_ARB_BASE_ADDR
-#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
 #define CONFIG_SYS_FLASH_EMPTY_INFO
 #define CONFIG_FLASH_VERIFY
 

diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index a212652fd7f083ccb97837774771ffc61971f3ea..4537fce19deb65c319a20e6f860e04ee3fe2ddad 100644 (file)
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -42,7 +42,6 @@
 #define CONFIG_SYS_FLASH_SECT_SIZE      (128 * 1024)
 #define CONFIG_SYS_MAX_FLASH_SECT 256   /* max number of sectors on one chip */
 #define CONFIG_SYS_FLASH_EMPTY_INFO
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
 #endif
 
 #define CONFIG_SYS_FSL_USDHC_NUM       2

diff --git a/include/configs/octeon_ebb7304.h b/include/configs/octeon_ebb7304.h
index 8c6c57bd546a13d7794a0f00f72014bdbfe0444e..7035e6313420690d18a6c557d64cb5b73ca5b096 100644 (file)
--- a/include/configs/octeon_ebb7304.h
+++ b/include/configs/octeon_ebb7304.h
@@ -13,7 +13,6 @@
  * CFI flash
  */
 #define CONFIG_SYS_MAX_FLASH_SECT      256
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_8BIT
 #define CONFIG_SYS_FLASH_EMPTY_INFO    /* flinfo indicates empty blocks */
 
 #define PHY_ANEG_TIMEOUT       8000    /* PHY needs a longer aneg time */

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index d3839eb1229301482f859041a24cb12fc1b3bb1c..4112e5570f6a625d18ab19502d4e4cbf56963f8f 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -154,7 +154,6 @@
 #endif
 
 #define CONFIG_SYS_MAX_FLASH_SECT      256
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
 #define CONFIG_SYS_FLASH_SIZE          0x4000000
 
 #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */

diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
index eb00e2b004bc222ff9a2f4460fc6f8d8c14f7425..4b0f20e89b7cc455c3cb77ea7c7d85f0a510e40a 100644 (file)
--- a/include/configs/salvator-x.h
+++ b/include/configs/salvator-x.h
@@ -16,7 +16,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS     45
 #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_SECT      256
 #define CONFIG_SYS_WRITE_SWAPPED_DATA
 

diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h
index 7ab792613612c3797c5520c2089745d5b7a690e6..c0495b7e153a498641a24b50f8526fcc9a1c2911 100644 (file)
--- a/include/configs/total_compute.h
+++ b/include/configs/total_compute.h
@@ -50,8 +50,6 @@
 /* 256 x 256KiB sectors */
 #define CONFIG_SYS_MAX_FLASH_SECT      256
 
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_32BIT
-
 #define CONFIG_SYS_FLASH_EMPTY_INFO    /* flinfo indicates empty blocks */
 #define FLASH_MAX_SECTOR_SIZE          0x00040000
 

diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h
index 14ea40bee3edd79f4e88105a2b13812be65a198b..578873295fb9d0db036849139cbbdb5689eb49a5 100644 (file)
--- a/include/configs/ulcb.h
+++ b/include/configs/ulcb.h
@@ -16,7 +16,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS     45
 #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_SECT      256
 #define CONFIG_SYS_WRITE_SWAPPED_DATA
 

diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h
index df76b9a5612f2dc27bca38a72e0b744e37d499ac..904ed8df0be86507c3774728d402caec2e0e9b70 100644 (file)
--- a/include/configs/vexpress_aemv8.h
+++ b/include/configs/vexpress_aemv8.h
@@ -276,8 +276,6 @@
 /* Store environment at top of flash */
 #endif
 
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_32BIT
-
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_OHCI_NEW
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1

diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 215b7592d2aee674d5039174ec99702fb01a989b..7392582b5e46f1bd3afd4a81015d589d5d63d2a5 100644 (file)
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -170,7 +170,6 @@
 /* Flash & Environment */
 /*=====================*/
 
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
 #ifdef CONFIG_XTFPGA_LX60
 # define CONFIG_SYS_FLASH_SIZE         0x0040000       /* 4MB */
 # define CONFIG_SYS_FLASH_SECT_SZ      0x10000         /* block size 64KB */