Skip to contentSkip to conversation

Convert CONFIG_PHY_CORTINA to Kconfig

PATCH New Tom Rini 1 participant 4 messages Nov 26, 2019 – Dec 4, 2019

Subsystems (2)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/2 Convert CONFIG_PHY_CORTINA to Kconfig

This converts the following to Kconfig:
CONFIG_PHY_CORTINA

---
 configs/T2080RDB_NAND_defconfig               | 1 +
 configs/T2080RDB_SDCARD_defconfig             | 1 +
 configs/T2080RDB_SECURE_BOOT_defconfig        | 1 +
 configs/T2080RDB_SPIFLASH_defconfig           | 1 +
 configs/T2080RDB_SRIO_PCIE_BOOT_defconfig     | 1 +
 configs/T2080RDB_defconfig                    | 1 +
 configs/T4160RDB_defconfig                    | 1 +
 configs/T4240RDB_SDCARD_defconfig             | 1 +
 configs/T4240RDB_defconfig                    | 1 +
 configs/ls2080ardb_SECURE_BOOT_defconfig      | 1 +
 configs/ls2080ardb_defconfig                  | 1 +
 configs/ls2080ardb_nand_defconfig             | 1 +
 configs/ls2081ardb_defconfig                  | 1 +
 configs/ls2088ardb_qspi_SECURE_BOOT_defconfig | 1 +
 configs/ls2088ardb_qspi_defconfig             | 1 +
 configs/ls2088ardb_tfa_SECURE_BOOT_defconfig  | 1 +
 configs/ls2088ardb_tfa_defconfig              | 1 +
 include/configs/T208xRDB.h                    | 1 -
 include/configs/T4240RDB.h                    | 1 -
 include/configs/ls2080ardb.h                  | 1 -
 20 files changed, 17 insertions(+), 3 deletions(-)
configs/T2080RDB_NAND_defconfig +1 -0
index 3d4e0eb397fb..a8fc78850eeb 100644
@@ -62,6 +62,7 @@ CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
+CONFIG_PHY_CORTINA=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_MII=y
configs/T2080RDB_SDCARD_defconfig +1 -0
index 1a3a6a37334e..97043dcab60f 100644
@@ -59,6 +59,7 @@ CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
+CONFIG_PHY_CORTINA=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_MII=y
configs/T2080RDB_SECURE_BOOT_defconfig +1 -0
index 5c256f8261ec..65522f79391f 100644
@@ -43,6 +43,7 @@ CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
+CONFIG_PHY_CORTINA=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_MII=y
configs/T2080RDB_SPIFLASH_defconfig +1 -0
index 01723c63d00e..380037ff017e 100644
@@ -62,6 +62,7 @@ CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
+CONFIG_PHY_CORTINA=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_MII=y
configs/T2080RDB_SRIO_PCIE_BOOT_defconfig +1 -0
index d29c147ece15..838d12515dcb 100644
@@ -35,6 +35,7 @@ CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
+CONFIG_PHY_CORTINA=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_MII=y
configs/T2080RDB_defconfig +1 -0
index 71a95599d11a..400c4c18101f 100644
@@ -47,6 +47,7 @@ CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
+CONFIG_PHY_CORTINA=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_MII=y
configs/T4160RDB_defconfig +1 -0
index 986539ad8454..b0a661bfa853 100644
@@ -36,6 +36,7 @@ CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
+CONFIG_PHY_CORTINA=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
configs/T4240RDB_SDCARD_defconfig +1 -0
index b5d306171044..15ecd01a6783 100644
@@ -52,6 +52,7 @@ CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
+CONFIG_PHY_CORTINA=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
configs/T4240RDB_defconfig +1 -0
index 0e926df4fad7..3b3f86a8b796 100644
@@ -40,6 +40,7 @@ CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SF_DEFAULT_SPEED=10000000
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
+CONFIG_PHY_CORTINA=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
configs/ls2080ardb_SECURE_BOOT_defconfig +1 -0
index d231c235f023..bc42a542290e 100644
@@ -42,6 +42,7 @@ CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
+CONFIG_PHY_CORTINA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_PCI=y
configs/ls2080ardb_defconfig +1 -0
index 484030495506..be06206fbe6d 100644
@@ -45,6 +45,7 @@ CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
+CONFIG_PHY_CORTINA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_PCI=y
configs/ls2080ardb_nand_defconfig +1 -0
index 49bdd587ac84..bd5a953182c7 100644
@@ -54,6 +54,7 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
+CONFIG_PHY_CORTINA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_PCI=y
configs/ls2081ardb_defconfig +1 -0
index 01288a7be7f3..d8204f16db92 100644
@@ -41,6 +41,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
+CONFIG_PHY_CORTINA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_PCI=y
configs/ls2088ardb_qspi_SECURE_BOOT_defconfig +1 -0
index 8894df5d31b0..c6327e4bd510 100644
@@ -37,6 +37,7 @@ CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
+CONFIG_PHY_CORTINA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_PCI=y
configs/ls2088ardb_qspi_defconfig +1 -0
index d230000e1925..ae7700610305 100644
@@ -43,6 +43,7 @@ CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
+CONFIG_PHY_CORTINA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_PCI=y
configs/ls2088ardb_tfa_SECURE_BOOT_defconfig +1 -0
index db253d1ce957..c5339e50ba7e 100644
@@ -52,6 +52,7 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
+CONFIG_PHY_CORTINA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_PCI=y
configs/ls2088ardb_tfa_defconfig +1 -0
index 1730c9a5eab1..ed7ef439af63 100644
@@ -59,6 +59,7 @@ CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
+CONFIG_PHY_CORTINA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_PCI=y
include/configs/T208xRDB.h +0 -1
index b64bafdb330e..748a7a0afe0b 100644
@@ -541,7 +541,6 @@ unsigned long get_board_ddr_clk(void);
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_SYS_DPAA_FMAN
-#define CONFIG_PHY_CORTINA
 #define CONFIG_PHY_REALTEK
 #define CONFIG_CORTINA_FW_LENGTH	0x40000
 #define RGMII_PHY1_ADDR		0x01  /* RealTek RTL8211E */
include/configs/T4240RDB.h +0 -1
index fc2aed335688..bbb4ca9b906b 100644
@@ -548,7 +548,6 @@ unsigned long get_board_ddr_clk(void);
 #ifdef CONFIG_SYS_DPAA_FMAN
 #define CONFIG_PHYLIB_10G
 #define CONFIG_PHY_VITESSE
-#define CONFIG_PHY_CORTINA
 #define CONFIG_SYS_CORTINA_FW_IN_NOR
 #define CONFIG_CORTINA_FW_ADDR		0xefe00000
 #define CONFIG_CORTINA_FW_LENGTH	0x40000
include/configs/ls2080ardb.h +0 -1
index c5d57cfdd43b..02f6cd43d3b1 100644
@@ -560,7 +560,6 @@ unsigned long get_board_sys_clk(void);
 
 /* MAC/PHY configuration */
 #ifdef CONFIG_FSL_MC_ENET
-#define CONFIG_PHY_CORTINA
 #define	CONFIG_SYS_CORTINA_FW_IN_NOR
 #ifdef CONFIG_QSPI_BOOT
 #define CONFIG_CORTINA_FW_ADDR		0x20980000
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/2 Convert CONFIG_PHY_CORTINA to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_PHY_CORTINA

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20191203/dc0565a0/attachment.sig>
author
#2 lore raw

PATCH 2/2 Convert CONFIG_SYS_CORTINA_FW_IN_MMC et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_CORTINA_FW_IN_MMC
CONFIG_SYS_CORTINA_FW_IN_NAND
CONFIG_SYS_CORTINA_FW_IN_NOR
CONFIG_SYS_CORTINA_FW_IN_REMOTE
CONFIG_SYS_CORTINA_FW_IN_SPIFLASH

---
 configs/T2080RDB_NAND_defconfig           |  1 +
 configs/T2080RDB_SDCARD_defconfig         |  1 +
 configs/T2080RDB_SPIFLASH_defconfig       |  1 +
 configs/T2080RDB_SRIO_PCIE_BOOT_defconfig |  1 +
 drivers/net/phy/Kconfig                   | 22 ++++++++++++++++++++++
 include/configs/T208xRDB.h                |  5 -----
 include/configs/T4240RDB.h                |  1 -
 include/configs/ls2080ardb.h              |  1 -
 scripts/config_whitelist.txt              |  5 -----
 9 files changed, 26 insertions(+), 12 deletions(-)
configs/T2080RDB_NAND_defconfig +1 -0
index a8fc78850eeb..1b6d15e279aa 100644
@@ -63,6 +63,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
 CONFIG_PHY_CORTINA=y
+CONFIG_SYS_CORTINA_FW_IN_NAND=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_MII=y
configs/T2080RDB_SDCARD_defconfig +1 -0
index 97043dcab60f..2e89beb45a34 100644
@@ -60,6 +60,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
 CONFIG_PHY_CORTINA=y
+CONFIG_SYS_CORTINA_FW_IN_MMC=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_MII=y
configs/T2080RDB_SPIFLASH_defconfig +1 -0
index 380037ff017e..d78f009b1166 100644
@@ -63,6 +63,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
 CONFIG_PHY_CORTINA=y
+CONFIG_SYS_CORTINA_FW_IN_SPIFLASH=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_MII=y
configs/T2080RDB_SRIO_PCIE_BOOT_defconfig +1 -0
index 838d12515dcb..8f6a5ced2246 100644
@@ -36,6 +36,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
 CONFIG_PHY_CORTINA=y
+CONFIG_SYS_CORTINA_FW_IN_REMOTE=y
 CONFIG_E1000=y
 CONFIG_FMAN_ENET=y
 CONFIG_MII=y
drivers/net/phy/Kconfig +22 -0
index 30bd8e765304..bcea8a0c3e6c 100644
@@ -100,6 +100,28 @@ config PHY_BROADCOM
 config PHY_CORTINA
 	bool "Cortina Ethernet PHYs support"
 
+choice
+	prompt "Location of the Cortina firmware"
+	default SYS_CORTINA_FW_IN_NOR
+	depends on PHY_CORTINA
+
+config SYS_CORTINA_FW_IN_MMC
+	bool "Cortina firmware in MMC"
+
+config SYS_CORTINA_FW_IN_NAND
+	bool "Cortina firmware in NAND flash"
+
+config SYS_CORTINA_FW_IN_NOR
+	bool "Cortina firmware in NOR flash"
+
+config SYS_CORTINA_FW_IN_REMOTE
+	bool "Cortina firmware in remote device"
+
+config SYS_CORTINA_FW_IN_SPIFLASH
+	bool "Cortina firmware in SPI flash"
+
+endchoice
+
 config PHY_DAVICOM
 	bool "Davicom Ethernet PHYs support"
 
include/configs/T208xRDB.h +0 -5
index 748a7a0afe0b..8c0b81adfd11 100644
@@ -502,7 +502,6 @@ unsigned long get_board_ddr_clk(void);
  * env is stored at 0x100000, sector size is 0x10000, ucode is stored after
  * env, so we got 0x110000.
  */
-#define CONFIG_SYS_CORTINA_FW_IN_SPIFLASH
 #define CONFIG_SYS_FMAN_FW_ADDR		0x110000
 #define CONFIG_CORTINA_FW_ADDR		0x120000
 
@@ -512,12 +511,10 @@ unsigned long get_board_ddr_clk(void);
  * about 1MB (2048 blocks), Env is stored after the image, and the env size is
  * 0x2000 (16 blocks), 8 + 2048 + 16 = 2072, enlarge it to 2080.
  */
-#define CONFIG_SYS_CORTINA_FW_IN_MMC
 #define CONFIG_SYS_FMAN_FW_ADDR		(512 * 0x820)
 #define CONFIG_CORTINA_FW_ADDR		(512 * 0x8a0)
 
 #elif defined(CONFIG_NAND)
-#define CONFIG_SYS_CORTINA_FW_IN_NAND
 #define CONFIG_SYS_FMAN_FW_ADDR		(3 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #define CONFIG_CORTINA_FW_ADDR		(4 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
@@ -528,11 +525,9 @@ unsigned long get_board_ddr_clk(void);
  * slave SRIO or PCIE outbound window->master inbound window->
  * master LAW->the ucode address in master's memory space.
  */
-#define CONFIG_SYS_CORTINA_FW_IN_REMOTE
 #define CONFIG_SYS_FMAN_FW_ADDR		0xFFE00000
 #define CONFIG_CORTINA_FW_ADDR		0xFFE10000
 #else
-#define CONFIG_SYS_CORTINA_FW_IN_NOR
 #define CONFIG_SYS_FMAN_FW_ADDR		0xEFF00000
 #define CONFIG_CORTINA_FW_ADDR		0xEFE00000
 #endif
include/configs/T4240RDB.h +0 -1
index bbb4ca9b906b..493da70f669e 100644
@@ -548,7 +548,6 @@ unsigned long get_board_ddr_clk(void);
 #ifdef CONFIG_SYS_DPAA_FMAN
 #define CONFIG_PHYLIB_10G
 #define CONFIG_PHY_VITESSE
-#define CONFIG_SYS_CORTINA_FW_IN_NOR
 #define CONFIG_CORTINA_FW_ADDR		0xefe00000
 #define CONFIG_CORTINA_FW_LENGTH	0x40000
 #define CONFIG_PHY_TERANETICS
include/configs/ls2080ardb.h +0 -1
index 02f6cd43d3b1..926239a58834 100644
@@ -560,7 +560,6 @@ unsigned long get_board_sys_clk(void);
 
 /* MAC/PHY configuration */
 #ifdef CONFIG_FSL_MC_ENET
-#define	CONFIG_SYS_CORTINA_FW_IN_NOR
 #ifdef CONFIG_QSPI_BOOT
 #define CONFIG_CORTINA_FW_ADDR		0x20980000
 #else
scripts/config_whitelist.txt +0 -5
index 7784922693bf..14627f83a68e 100644
@@ -1919,11 +1919,6 @@ CONFIG_SYS_CMXFCR_VALUE2
 CONFIG_SYS_CMXFCR_VALUE3
 CONFIG_SYS_CORE_SRAM
 CONFIG_SYS_CORE_SRAM_SIZE
-CONFIG_SYS_CORTINA_FW_IN_MMC
-CONFIG_SYS_CORTINA_FW_IN_NAND
-CONFIG_SYS_CORTINA_FW_IN_NOR
-CONFIG_SYS_CORTINA_FW_IN_REMOTE
-CONFIG_SYS_CORTINA_FW_IN_SPIFLASH
 CONFIG_SYS_CPC_REINIT_F
 CONFIG_SYS_CPLD_AMASK
 CONFIG_SYS_CPLD_BASE
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH 2/2 Convert CONFIG_SYS_CORTINA_FW_IN_MMC et al to Kconfig

Quoted 8 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_CORTINA_FW_IN_MMC
CONFIG_SYS_CORTINA_FW_IN_NAND
CONFIG_SYS_CORTINA_FW_IN_NOR
CONFIG_SYS_CORTINA_FW_IN_REMOTE
CONFIG_SYS_CORTINA_FW_IN_SPIFLASH

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20191203/8aa69017/attachment.sig>