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>

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index b8b9cd58c4904d2cd361cd114cdbd3e645a0ffc4..1a8a345dcce5d1fce97f54e19b2c175c250263ee 100644 (file)
--- 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 4ba273aeef0f875e2cec9db9518f08c1093bcc00..b702b4b5a91f3ff16083dfec6637d055df25ad2b 100644 (file)
--- 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 f38e56cbe3c8ffc97edb86695815e9bd824efa94..8aa013a51a5126f8c8a0bdcea655ced252f7ee7f 100644 (file)
--- 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