configs: Remove SF_DUAL_FLASH
SF_DUAL_FLASH claims to enable support for SF_DUAL_STACKED_FLASH and SF_DUAL_PARALLEL_FLASH. But, in current U-Boot code, grepping for above enums yield no user and therefore support seems to be incomplete. Remove these configs so as to avoid confusion. Signed-off-by: Vignesh R <vigneshr@ti.com> Reviewed-by: Jagan Teki <jagan@openedev.com> Tested-by: Jagan Teki <jagan@amarulasolutions.com> #zynq-microzed
This commit is contained in:
parent
7287597870
commit
75b2ec2a22
@ -40,7 +40,6 @@ CONFIG_MMC_SDHCI=y
|
|||||||
CONFIG_MMC_SDHCI_ZYNQ=y
|
CONFIG_MMC_SDHCI_ZYNQ=y
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_BAR=y
|
CONFIG_SPI_FLASH_BAR=y
|
||||||
CONFIG_SF_DUAL_FLASH=y
|
|
||||||
CONFIG_SPI_FLASH_STMICRO=y
|
CONFIG_SPI_FLASH_STMICRO=y
|
||||||
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
|
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
|
||||||
CONFIG_DEBUG_UART_ZYNQ=y
|
CONFIG_DEBUG_UART_ZYNQ=y
|
||||||
|
@ -39,7 +39,6 @@ CONFIG_MMC_SDHCI=y
|
|||||||
CONFIG_MMC_SDHCI_ZYNQ=y
|
CONFIG_MMC_SDHCI_ZYNQ=y
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_BAR=y
|
CONFIG_SPI_FLASH_BAR=y
|
||||||
CONFIG_SF_DUAL_FLASH=y
|
|
||||||
CONFIG_SPI_FLASH_STMICRO=y
|
CONFIG_SPI_FLASH_STMICRO=y
|
||||||
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
|
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
|
||||||
# CONFIG_NETDEVICES is not set
|
# CONFIG_NETDEVICES is not set
|
||||||
|
@ -54,7 +54,6 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
|
|||||||
# CONFIG_MMC is not set
|
# CONFIG_MMC is not set
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_BAR=y
|
CONFIG_SPI_FLASH_BAR=y
|
||||||
CONFIG_SF_DUAL_FLASH=y
|
|
||||||
CONFIG_SPI_FLASH_ISSI=y
|
CONFIG_SPI_FLASH_ISSI=y
|
||||||
CONFIG_SPI_FLASH_MACRONIX=y
|
CONFIG_SPI_FLASH_MACRONIX=y
|
||||||
CONFIG_SPI_FLASH_SPANSION=y
|
CONFIG_SPI_FLASH_SPANSION=y
|
||||||
|
@ -38,7 +38,6 @@ CONFIG_MISC=y
|
|||||||
# CONFIG_MMC is not set
|
# CONFIG_MMC is not set
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_BAR=y
|
CONFIG_SPI_FLASH_BAR=y
|
||||||
CONFIG_SF_DUAL_FLASH=y
|
|
||||||
CONFIG_SPI_FLASH_ISSI=y
|
CONFIG_SPI_FLASH_ISSI=y
|
||||||
CONFIG_SPI_FLASH_MACRONIX=y
|
CONFIG_SPI_FLASH_MACRONIX=y
|
||||||
CONFIG_SPI_FLASH_SPANSION=y
|
CONFIG_SPI_FLASH_SPANSION=y
|
||||||
|
@ -38,7 +38,6 @@ CONFIG_MISC=y
|
|||||||
# CONFIG_MMC is not set
|
# CONFIG_MMC is not set
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_BAR=y
|
CONFIG_SPI_FLASH_BAR=y
|
||||||
CONFIG_SF_DUAL_FLASH=y
|
|
||||||
CONFIG_SPI_FLASH_ISSI=y
|
CONFIG_SPI_FLASH_ISSI=y
|
||||||
CONFIG_SPI_FLASH_MACRONIX=y
|
CONFIG_SPI_FLASH_MACRONIX=y
|
||||||
CONFIG_SPI_FLASH_SPANSION=y
|
CONFIG_SPI_FLASH_SPANSION=y
|
||||||
|
@ -38,7 +38,6 @@ CONFIG_MISC=y
|
|||||||
# CONFIG_MMC is not set
|
# CONFIG_MMC is not set
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_BAR=y
|
CONFIG_SPI_FLASH_BAR=y
|
||||||
CONFIG_SF_DUAL_FLASH=y
|
|
||||||
CONFIG_SPI_FLASH_ISSI=y
|
CONFIG_SPI_FLASH_ISSI=y
|
||||||
CONFIG_SPI_FLASH_MACRONIX=y
|
CONFIG_SPI_FLASH_MACRONIX=y
|
||||||
CONFIG_SPI_FLASH_SPANSION=y
|
CONFIG_SPI_FLASH_SPANSION=y
|
||||||
|
@ -42,7 +42,6 @@ CONFIG_MMC_SDHCI=y
|
|||||||
CONFIG_MMC_SDHCI_ZYNQ=y
|
CONFIG_MMC_SDHCI_ZYNQ=y
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_BAR=y
|
CONFIG_SPI_FLASH_BAR=y
|
||||||
CONFIG_SF_DUAL_FLASH=y
|
|
||||||
CONFIG_SPI_FLASH_ISSI=y
|
CONFIG_SPI_FLASH_ISSI=y
|
||||||
CONFIG_SPI_FLASH_MACRONIX=y
|
CONFIG_SPI_FLASH_MACRONIX=y
|
||||||
CONFIG_SPI_FLASH_SPANSION=y
|
CONFIG_SPI_FLASH_SPANSION=y
|
||||||
|
@ -62,7 +62,6 @@ CONFIG_MMC_SDHCI=y
|
|||||||
CONFIG_MMC_SDHCI_ZYNQ=y
|
CONFIG_MMC_SDHCI_ZYNQ=y
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_BAR=y
|
CONFIG_SPI_FLASH_BAR=y
|
||||||
CONFIG_SF_DUAL_FLASH=y
|
|
||||||
CONFIG_SPI_FLASH_ISSI=y
|
CONFIG_SPI_FLASH_ISSI=y
|
||||||
CONFIG_SPI_FLASH_MACRONIX=y
|
CONFIG_SPI_FLASH_MACRONIX=y
|
||||||
CONFIG_SPI_FLASH_SPANSION=y
|
CONFIG_SPI_FLASH_SPANSION=y
|
||||||
|
@ -48,7 +48,6 @@ CONFIG_MMC_SDHCI=y
|
|||||||
CONFIG_MMC_SDHCI_ZYNQ=y
|
CONFIG_MMC_SDHCI_ZYNQ=y
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_BAR=y
|
CONFIG_SPI_FLASH_BAR=y
|
||||||
CONFIG_SF_DUAL_FLASH=y
|
|
||||||
CONFIG_SPI_FLASH_ISSI=y
|
CONFIG_SPI_FLASH_ISSI=y
|
||||||
CONFIG_SPI_FLASH_MACRONIX=y
|
CONFIG_SPI_FLASH_MACRONIX=y
|
||||||
CONFIG_SPI_FLASH_SPANSION=y
|
CONFIG_SPI_FLASH_SPANSION=y
|
||||||
|
@ -75,7 +75,6 @@ CONFIG_MMC_SDHCI=y
|
|||||||
CONFIG_MMC_SDHCI_ZYNQ=y
|
CONFIG_MMC_SDHCI_ZYNQ=y
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_BAR=y
|
CONFIG_SPI_FLASH_BAR=y
|
||||||
CONFIG_SF_DUAL_FLASH=y
|
|
||||||
CONFIG_SPI_FLASH_ISSI=y
|
CONFIG_SPI_FLASH_ISSI=y
|
||||||
CONFIG_SPI_FLASH_MACRONIX=y
|
CONFIG_SPI_FLASH_MACRONIX=y
|
||||||
CONFIG_SPI_FLASH_SPANSION=y
|
CONFIG_SPI_FLASH_SPANSION=y
|
||||||
|
@ -73,7 +73,6 @@ CONFIG_MMC_SDHCI=y
|
|||||||
CONFIG_MMC_SDHCI_ZYNQ=y
|
CONFIG_MMC_SDHCI_ZYNQ=y
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_BAR=y
|
CONFIG_SPI_FLASH_BAR=y
|
||||||
CONFIG_SF_DUAL_FLASH=y
|
|
||||||
CONFIG_SPI_FLASH_ISSI=y
|
CONFIG_SPI_FLASH_ISSI=y
|
||||||
CONFIG_SPI_FLASH_MACRONIX=y
|
CONFIG_SPI_FLASH_MACRONIX=y
|
||||||
CONFIG_SPI_FLASH_SPANSION=y
|
CONFIG_SPI_FLASH_SPANSION=y
|
||||||
|
@ -73,7 +73,6 @@ CONFIG_MMC_SDHCI=y
|
|||||||
CONFIG_MMC_SDHCI_ZYNQ=y
|
CONFIG_MMC_SDHCI_ZYNQ=y
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_BAR=y
|
CONFIG_SPI_FLASH_BAR=y
|
||||||
CONFIG_SF_DUAL_FLASH=y
|
|
||||||
CONFIG_SPI_FLASH_ISSI=y
|
CONFIG_SPI_FLASH_ISSI=y
|
||||||
CONFIG_SPI_FLASH_MACRONIX=y
|
CONFIG_SPI_FLASH_MACRONIX=y
|
||||||
CONFIG_SPI_FLASH_SPANSION=y
|
CONFIG_SPI_FLASH_SPANSION=y
|
||||||
|
@ -58,7 +58,6 @@ CONFIG_MMC_SDHCI=y
|
|||||||
CONFIG_MMC_SDHCI_ZYNQ=y
|
CONFIG_MMC_SDHCI_ZYNQ=y
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_BAR=y
|
CONFIG_SPI_FLASH_BAR=y
|
||||||
CONFIG_SF_DUAL_FLASH=y
|
|
||||||
CONFIG_SPI_FLASH_ISSI=y
|
CONFIG_SPI_FLASH_ISSI=y
|
||||||
CONFIG_SPI_FLASH_MACRONIX=y
|
CONFIG_SPI_FLASH_MACRONIX=y
|
||||||
CONFIG_SPI_FLASH_SPANSION=y
|
CONFIG_SPI_FLASH_SPANSION=y
|
||||||
|
@ -59,7 +59,6 @@ CONFIG_MMC_SDHCI=y
|
|||||||
CONFIG_MMC_SDHCI_ZYNQ=y
|
CONFIG_MMC_SDHCI_ZYNQ=y
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_BAR=y
|
CONFIG_SPI_FLASH_BAR=y
|
||||||
CONFIG_SF_DUAL_FLASH=y
|
|
||||||
CONFIG_SPI_FLASH_ISSI=y
|
CONFIG_SPI_FLASH_ISSI=y
|
||||||
CONFIG_SPI_FLASH_MACRONIX=y
|
CONFIG_SPI_FLASH_MACRONIX=y
|
||||||
CONFIG_SPI_FLASH_SPANSION=y
|
CONFIG_SPI_FLASH_SPANSION=y
|
||||||
|
@ -69,7 +69,6 @@ CONFIG_MMC_SDHCI=y
|
|||||||
CONFIG_MMC_SDHCI_ZYNQ=y
|
CONFIG_MMC_SDHCI_ZYNQ=y
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_BAR=y
|
CONFIG_SPI_FLASH_BAR=y
|
||||||
CONFIG_SF_DUAL_FLASH=y
|
|
||||||
CONFIG_SPI_FLASH_ISSI=y
|
CONFIG_SPI_FLASH_ISSI=y
|
||||||
CONFIG_SPI_FLASH_MACRONIX=y
|
CONFIG_SPI_FLASH_MACRONIX=y
|
||||||
CONFIG_SPI_FLASH_SPANSION=y
|
CONFIG_SPI_FLASH_SPANSION=y
|
||||||
|
@ -1,92 +0,0 @@
|
|||||||
SPI/QSPI Dual flash connection modes:
|
|
||||||
=====================================
|
|
||||||
|
|
||||||
This describes how SPI/QSPI flash memories are connected to a given
|
|
||||||
controller in a single chip select line.
|
|
||||||
|
|
||||||
Current spi_flash framework supports, single flash memory connected
|
|
||||||
to a given controller with single chip select line, but there are some
|
|
||||||
hw logics(ex: xilinx zynq qspi) that describes two/dual memories are
|
|
||||||
connected with a single chip select line from a controller.
|
|
||||||
|
|
||||||
"dual_flash" from include/spi.h describes these types of connection mode
|
|
||||||
|
|
||||||
Possible connections:
|
|
||||||
--------------------
|
|
||||||
SF_SINGLE_FLASH:
|
|
||||||
- single spi flash memory connected with single chip select line.
|
|
||||||
|
|
||||||
+------------+ CS +---------------+
|
|
||||||
| |----------------------->| |
|
|
||||||
| Controller | I0[3:0] | Flash memory |
|
|
||||||
| SPI/QSPI |<======================>| (SPI/QSPI) |
|
|
||||||
| | CLK | |
|
|
||||||
| |----------------------->| |
|
|
||||||
+------------+ +---------------+
|
|
||||||
|
|
||||||
SF_DUAL_STACKED_FLASH:
|
|
||||||
- dual spi/qspi flash memories are connected with a single chipselect
|
|
||||||
line and these two memories are operating stacked fasion with shared buses.
|
|
||||||
- xilinx zynq qspi controller has implemented this feature [1]
|
|
||||||
|
|
||||||
+------------+ CS +---------------+
|
|
||||||
| |---------------------->| |
|
|
||||||
| | I0[3:0] | Upper Flash |
|
|
||||||
| | +=========>| memory |
|
|
||||||
| | | CLK | (SPI/QSPI) |
|
|
||||||
| | | +---->| |
|
|
||||||
| Controller | CS | | +---------------+
|
|
||||||
| SPI/QSPI |------------|----|---->| |
|
|
||||||
| | I0[3:0] | | | Lower Flash |
|
|
||||||
| |<===========+====|====>| memory |
|
|
||||||
| | CLK | | (SPI/QSPI) |
|
|
||||||
| |-----------------+---->| |
|
|
||||||
+------------+ +---------------+
|
|
||||||
|
|
||||||
- two memory flash devices should has same hw part attributes (like size,
|
|
||||||
vendor..etc)
|
|
||||||
- Configurations:
|
|
||||||
on LQSPI_CFG register, Enable TWO_MEM[BIT:30] on LQSPI_CFG
|
|
||||||
Enable U_PAGE[BIT:28] if U_PAGE flag set - upper memory
|
|
||||||
Disable U_PAGE[BIT:28] if U_PAGE flag unset - lower memory
|
|
||||||
- Operation:
|
|
||||||
accessing memories serially like one after another.
|
|
||||||
by default, if U_PAGE is unset lower memory should accessible,
|
|
||||||
once user wants to access upper memory need to set U_PAGE.
|
|
||||||
|
|
||||||
SPI_FLASH_CONN_DUALPARALLEL:
|
|
||||||
- dual spi/qspi flash memories are connected with a single chipselect
|
|
||||||
line and these two memories are operating parallel with separate buses.
|
|
||||||
- xilinx zynq qspi controller has implemented this feature [1]
|
|
||||||
|
|
||||||
+-------------+ CS +---------------+
|
|
||||||
| |---------------------->| |
|
|
||||||
| | I0[3:0] | Upper Flash |
|
|
||||||
| |<=====================>| memory |
|
|
||||||
| | CLK | (SPI/QSPI) |
|
|
||||||
| |---------------------->| |
|
|
||||||
| Controller | CS +---------------+
|
|
||||||
| SPI/QSPI |---------------------->| |
|
|
||||||
| | I0[3:0] | Lower Flash |
|
|
||||||
| |<=====================>| memory |
|
|
||||||
| | CLK | (SPI/QSPI) |
|
|
||||||
| |---------------------->| |
|
|
||||||
+-------------+ +---------------+
|
|
||||||
|
|
||||||
- two memory flash devices should has same hw part attributes (like size,
|
|
||||||
vendor..etc)
|
|
||||||
- Configurations:
|
|
||||||
Need to enable SEP_BUS[BIT:29],TWO_MEM[BIT:30] on LQSPI_CFG register.
|
|
||||||
- Operation:
|
|
||||||
Even bits, i.e. bit 0, 2, 4 ., of a data word is located in the lower memory
|
|
||||||
and odd bits, i.e. bit 1, 3, 5, ., of a data word is located in the upper memory.
|
|
||||||
|
|
||||||
Note: Technically there is only one CS line from the controller, but
|
|
||||||
zynq qspi controller has an internal hw logic to enable additional CS
|
|
||||||
when controller is configured for dual memories.
|
|
||||||
|
|
||||||
[1] http://www.xilinx.com/support/documentation/user_guides/ug585-Zynq-7000-TRM.pdf
|
|
||||||
|
|
||||||
--
|
|
||||||
Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
|
|
||||||
05-01-2014.
|
|
@ -57,7 +57,6 @@
|
|||||||
*/
|
*/
|
||||||
#ifdef CONFIG_CADENCE_QSPI
|
#ifdef CONFIG_CADENCE_QSPI
|
||||||
/* Enable it if you want to use dual-stacked mode */
|
/* Enable it if you want to use dual-stacked mode */
|
||||||
#undef CONFIG_SF_DUAL_FLASH
|
|
||||||
/*#define CONFIG_QSPI_RBF_ADDR 0x720000*/
|
/*#define CONFIG_QSPI_RBF_ADDR 0x720000*/
|
||||||
|
|
||||||
/* Flash device info */
|
/* Flash device info */
|
||||||
|
Loading…
Reference in New Issue
Block a user