diff options
| author | York Sun <york.sun@nxp.com> | 2017-03-06 09:02:25 -0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2017-03-14 08:44:03 -0700 |
| commit | e243b6e1fa37376278488c374052040f04a833ea (patch) | |
| tree | 47f01ce4498808eee2cc82149529a5c14e923cc0 | |
| parent | f2ccf7f7aacf75bd9c521459d1d20df07d1ebe41 (diff) | |
| download | u-boot-e243b6e1fa37376278488c374052040f04a833ea.tar.gz | |
armv8: ls2080a: Move CONFIG_FSL_MC_ENET to Kconfig
Use Kconfig option instead of config macro in header file.
Clean up existing usage.
Signed-off-by: York Sun <york.sun@nxp.com>
| -rw-r--r-- | arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 8 | ||||
| -rw-r--r-- | include/configs/ls2080a_common.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index b8b9cd58c49..1a8a345dcce 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -89,6 +89,14 @@ config FSL_LSCH3 select SYS_FSL_SRDS_1 select SYS_HAS_SERDES +config FSL_MC_ENET + bool "Management Complex network" + depends on ARCH_LS2080A + default y + select RESV_RAM + help + Enable Management Complex (MC) network + menu "Layerscape architecture" depends on FSL_LSCH2 || FSL_LSCH3 diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 4ba273aeef0..b702b4b5a91 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -141,7 +141,6 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SYS_NAND_BASE_PHYS 0x30000000 /* MC firmware */ -#define CONFIG_FSL_MC_ENET /* TODO Actual DPL max length needs to be confirmed with the MC FW team */ #define CONFIG_SYS_LS_MC_DPC_MAX_LENGTH 0x20000 #define CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET 0x00F00000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f38e56cbe3c..8aa013a51a5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1163,7 +1163,6 @@ CONFIG_FSL_LAYERSCAPE CONFIG_FSL_LBC CONFIG_FSL_LINFLEXUART CONFIG_FSL_MC9SDZ60 -CONFIG_FSL_MC_ENET CONFIG_FSL_MEMAC CONFIG_FSL_NFC_CHIPS CONFIG_FSL_NFC_SPARE_SIZE |