Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Convert CONFIG_SYS_CORTINA_FW_IN_MMC et al to Kconfig

Browse source 
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

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2019-11-26 17:32:43 -05:00
parent 60f3c01596
commit e78f16b751
9 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configs/T2080RDB_NAND_defconfig
View file

@ -63,6 +63,7 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_AQUANTIA=y CONFIG_PHY_AQUANTIA=y
CONFIG_PHY_CORTINA=y CONFIG_PHY_CORTINA=y
CONFIG_SYS_CORTINA_FW_IN_NAND=y
CONFIG_E1000=y CONFIG_E1000=y
CONFIG_FMAN_ENET=y CONFIG_FMAN_ENET=y
CONFIG_MII=y CONFIG_MII=y

1
configs/T2080RDB_SDCARD_defconfig
View file

@ -60,6 +60,7 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_AQUANTIA=y CONFIG_PHY_AQUANTIA=y
CONFIG_PHY_CORTINA=y CONFIG_PHY_CORTINA=y
CONFIG_SYS_CORTINA_FW_IN_MMC=y
CONFIG_E1000=y CONFIG_E1000=y
CONFIG_FMAN_ENET=y CONFIG_FMAN_ENET=y
CONFIG_MII=y CONFIG_MII=y

1
configs/T2080RDB_SPIFLASH_defconfig
View file

@ -63,6 +63,7 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_AQUANTIA=y CONFIG_PHY_AQUANTIA=y
CONFIG_PHY_CORTINA=y CONFIG_PHY_CORTINA=y
CONFIG_SYS_CORTINA_FW_IN_SPIFLASH=y
CONFIG_E1000=y CONFIG_E1000=y
CONFIG_FMAN_ENET=y CONFIG_FMAN_ENET=y
CONFIG_MII=y CONFIG_MII=y

1
configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
View file

@ -36,6 +36,7 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_AQUANTIA=y CONFIG_PHY_AQUANTIA=y
CONFIG_PHY_CORTINA=y CONFIG_PHY_CORTINA=y
CONFIG_SYS_CORTINA_FW_IN_REMOTE=y
CONFIG_E1000=y CONFIG_E1000=y
CONFIG_FMAN_ENET=y CONFIG_FMAN_ENET=y
CONFIG_MII=y CONFIG_MII=y

22
drivers/net/phy/Kconfig
View file

@ -100,6 +100,28 @@ config PHY_BROADCOM
config PHY_CORTINA config PHY_CORTINA
bool "Cortina Ethernet PHYs support" 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 config PHY_DAVICOM
bool "Davicom Ethernet PHYs support" bool "Davicom Ethernet PHYs support"

5
include/configs/T208xRDB.h
View file

@ -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 is stored at 0x100000, sector size is 0x10000, ucode is stored after
* env, so we got 0x110000. * env, so we got 0x110000.
*/ */
#define CONFIG_SYS_CORTINA_FW_IN_SPIFLASH
#define CONFIG_SYS_FMAN_FW_ADDR 0x110000 #define CONFIG_SYS_FMAN_FW_ADDR 0x110000
#define CONFIG_CORTINA_FW_ADDR 0x120000 #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 * 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. * 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_SYS_FMAN_FW_ADDR (512 * 0x820)
#define CONFIG_CORTINA_FW_ADDR (512 * 0x8a0) #define CONFIG_CORTINA_FW_ADDR (512 * 0x8a0)
#elif defined(CONFIG_NAND) #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_SYS_FMAN_FW_ADDR (3 * CONFIG_SYS_NAND_BLOCK_SIZE)
#define CONFIG_CORTINA_FW_ADDR (4 * CONFIG_SYS_NAND_BLOCK_SIZE) #define CONFIG_CORTINA_FW_ADDR (4 * CONFIG_SYS_NAND_BLOCK_SIZE)
#elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) #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-> * slave SRIO or PCIE outbound window->master inbound window->
* master LAW->the ucode address in master's memory space. * 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_SYS_FMAN_FW_ADDR 0xFFE00000
#define CONFIG_CORTINA_FW_ADDR 0xFFE10000 #define CONFIG_CORTINA_FW_ADDR 0xFFE10000
#else #else
#define CONFIG_SYS_CORTINA_FW_IN_NOR
#define CONFIG_SYS_FMAN_FW_ADDR 0xEFF00000 #define CONFIG_SYS_FMAN_FW_ADDR 0xEFF00000
#define CONFIG_CORTINA_FW_ADDR 0xEFE00000 #define CONFIG_CORTINA_FW_ADDR 0xEFE00000
#endif #endif

1
include/configs/T4240RDB.h
View file

@ -548,7 +548,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN
#define CONFIG_PHYLIB_10G #define CONFIG_PHYLIB_10G
#define CONFIG_PHY_VITESSE #define CONFIG_PHY_VITESSE
#define CONFIG_SYS_CORTINA_FW_IN_NOR
#define CONFIG_CORTINA_FW_ADDR 0xefe00000 #define CONFIG_CORTINA_FW_ADDR 0xefe00000
#define CONFIG_CORTINA_FW_LENGTH 0x40000 #define CONFIG_CORTINA_FW_LENGTH 0x40000
#define CONFIG_PHY_TERANETICS #define CONFIG_PHY_TERANETICS

1
include/configs/ls2080ardb.h
View file

@ -560,7 +560,6 @@ unsigned long get_board_sys_clk(void);
/* MAC/PHY configuration */ /* MAC/PHY configuration */
#ifdef CONFIG_FSL_MC_ENET #ifdef CONFIG_FSL_MC_ENET
#define CONFIG_SYS_CORTINA_FW_IN_NOR
#ifdef CONFIG_QSPI_BOOT #ifdef CONFIG_QSPI_BOOT
#define CONFIG_CORTINA_FW_ADDR 0x20980000 #define CONFIG_CORTINA_FW_ADDR 0x20980000
#else #else

5
scripts/config_whitelist.txt
View file

@ -1918,11 +1918,6 @@ CONFIG_SYS_CMXFCR_VALUE2
CONFIG_SYS_CMXFCR_VALUE3 CONFIG_SYS_CMXFCR_VALUE3
CONFIG_SYS_CORE_SRAM CONFIG_SYS_CORE_SRAM
CONFIG_SYS_CORE_SRAM_SIZE 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_CPC_REINIT_F
CONFIG_SYS_CPLD_AMASK CONFIG_SYS_CPLD_AMASK
CONFIG_SYS_CPLD_BASE CONFIG_SYS_CPLD_BASE