arm: socfpga: migration of CONFIG_SPI_FLASH_BAR

PATCH New Denis Bakhvalov 2 participants 2 messages Mar 24, 2016 – Mar 26, 2016

Share & tools

Denis Bakhvalov

author

2016-03-24 21:39 UTC #0 lore raw

PATCH v3 1/1 arm: socfpga: migration of CONFIG_SPI_FLASH_BAR

CONFIG_SPI_FLASH_BAR was deleted from socfpga_common.h and placed in socfpga_*_defconfig because it is Kconfig symbol.

Signed-off-by Denis Bakhvalov <[email protected]>

Reported-by Denis Bakhvalov <[email protected]>

Cc Marek Vasut <[email protected]>

Acked-by Marek Vasut <[email protected]>

---
Changes for v2:
- Diff was generated from u-boot-socfpga
Changes for v3:
- Fixed description of changes

 configs/socfpga_arria5_defconfig       | 1 +
 configs/socfpga_cyclone5_defconfig     | 1 +
 configs/socfpga_de0_nano_soc_defconfig | 1 +
 configs/socfpga_mcvevk_defconfig       | 1 +
 configs/socfpga_sockit_defconfig       | 1 +
 configs/socfpga_socrates_defconfig     | 1 +
 configs/socfpga_sr1500_defconfig       | 1 +
 include/configs/socfpga_common.h       | 2 --
 8 files changed, 7 insertions(+), 2 deletions(-)

configs/socfpga_arria5_defconfig +1 -0

index 7b60d95..505a68d 100644
@@ -19,6 +19,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SYS_NS16550=y

configs/socfpga_cyclone5_defconfig +1 -0

index 6a487f4..df19a95 100644
@@ -19,6 +19,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SYS_NS16550=y

configs/socfpga_de0_nano_soc_defconfig +1 -0

index cfcae5d..bb37825 100644
@@ -19,5 +19,6 @@ CONFIG_ETH_DESIGNWARE=y
 CONFIG_SYS_NS16550=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

configs/socfpga_mcvevk_defconfig +1 -0

index b6f6a65..8a76aa1 100644
@@ -19,5 +19,6 @@ CONFIG_ETH_DESIGNWARE=y
 CONFIG_SYS_NS16550=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

configs/socfpga_sockit_defconfig +1 -0

index f45c3ed..36bb1e1 100644
@@ -19,6 +19,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SYS_NS16550=y

configs/socfpga_socrates_defconfig +1 -0

index e25d09b..937f14f 100644
@@ -23,5 +23,6 @@ CONFIG_ETH_DESIGNWARE=y
 CONFIG_SYS_NS16550=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

configs/socfpga_sr1500_defconfig +1 -0

index d499a14..83eada3 100644
@@ -17,6 +17,7 @@ CONFIG_DM_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SYS_NS16550=y

include/configs/socfpga_common.h +0 -2

index 56d32e6..2ad0287 100644
@@ -93,7 +93,6 @@
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_SPEED		30000000
-#define CONFIG_SPI_FLASH_BAR
 /*
  * The base address is configurable in QSys, each board must specify the
  * base address based on it's particular FPGA configuration. Please note

@@ -219,7 +218,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #endif
 #define CONFIG_CQSPI_DECODER		0
 #define CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH_BAR
 
 /*
  * Designware SPI support

Signature · 1 line

1.9.1

Marek Vasut

Applied

2016-03-26 08:36 UTC #1 lore raw

PATCH v3 1/1 arm: socfpga: migration of CONFIG_SPI_FLASH_BAR

Quoted 7 lines · Denis Bakhvalov

CONFIG_SPI_FLASH_BAR was deleted from socfpga_common.h and placed in socfpga_*_defconfig because it is Kconfig symbol.
Signed-off-by Denis Bakhvalov <[email protected]>
Reported-by Denis Bakhvalov <[email protected]>
Cc Marek Vasut <[email protected]>
Acked-by Marek Vasut <[email protected]>

Quoted 5 lines

---
Changes for v2:
- Diff was generated from u-boot-socfpga
Changes for v3:
- Fixed description of changes

Applied, thanks!

Best regards,
Marek Vasut