diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/net/fm/fm.c | 2 | ||||
| -rw-r--r-- | drivers/qe/Kconfig | 33 |
3 files changed, 40 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 64cdc58f92..e6a4fdf30e 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -195,6 +195,12 @@ config FEC_MXC This driver supports the 10/100 Fast Ethernet controller for NXP i.MX processors. +config FMAN_ENET + bool "Freescale FMan ethernet support" + depends on ARM || PPC + help + This driver support the Freescale FMan Ethernet controller + config FTMAC100 bool "Ftmac100 Ethernet Support" help diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c index e19d7777dc..0a43dfe74e 100644 --- a/drivers/net/fm/fm.c +++ b/drivers/net/fm/fm.c @@ -459,7 +459,7 @@ int fm_init_common(int index, struct ccsr_fman *reg) printf("NAND read of FMAN firmware at offset 0x%x failed %d\n", CONFIG_SYS_FMAN_FW_ADDR, rc); } -#elif defined(CONFIG_SYS_QE_FW_IN_SPIFLASH) +#elif defined(CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH) struct spi_flash *ucode_flash; void *addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH); int ret = 0; diff --git a/drivers/qe/Kconfig b/drivers/qe/Kconfig index 49a6e32b16..864b36b822 100644 --- a/drivers/qe/Kconfig +++ b/drivers/qe/Kconfig @@ -1,6 +1,14 @@ # # QUICC Engine Drivers # +config QE + bool "Enable support for QUICC Engine" + depends on PPC + default y if ARCH_T1040 || ARCH_T1042 || ARCH_T1024 || ARCH_P1021 \ + || ARCH_P1025 + help + Chose this option to add support for the QUICC Engine. + config U_QE bool "Enable support for U QUICC Engine" default y if (ARCH_LS1021A && !SD_BOOT && !NAND_BOOT && !QSPI_BOOT) \ @@ -10,3 +18,28 @@ config U_QE || (TARGET_LS1043ARDB && !SPL_NO_QE && !NAND_BOOT && !QSPI_BOOT) help Choose this option to add support for U QUICC Engine. + +choice + prompt "QUICC Engine FMan ethernet firmware location" + depends on FMAN_ENET || QE + default SYS_QE_FMAN_FW_IN_ROM + +config SYS_QE_FMAN_FW_IN_NOR + bool "NOR flash" + +config SYS_QE_FMAN_FW_IN_NAND + bool "NAND flash" + +config SYS_QE_FMAN_FW_IN_SPIFLASH + bool "SPI flash" + +config SYS_QE_FMAN_FW_IN_MMC + bool "MMC" + +config SYS_QE_FMAN_FW_IN_REMOTE + bool "Remote memory location (PCI)" + +config SYS_QE_FMAN_FW_IN_ROM + bool "Firmware is already in ROM" + +endchoice |