armv8: layerscape: move CONFIG_LAYERSCAPE to Kconfig

Moves CONFIG_LAYERSCAPE for all NXP Layerscape platforms.

Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index 614b242f70ffa0c65bae44e572fc6f711137a324..ab9213f954eb35a69594c65d52b06ecc853899be 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -2,6 +2,7 @@ config ARCH_LS1012A
        bool
        select ARMV8_SET_SMPEN
        select ARM_ERRATA_855873 if !TFABOOT
+       select FSL_LAYERSCAPE
        select FSL_LSCH2
        select SYS_FSL_SRDS_1
        select SYS_HAS_SERDES
@@ -23,6 +24,7 @@ config ARCH_LS1043A
        bool
        select ARMV8_SET_SMPEN
        select ARM_ERRATA_855873 if !TFABOOT
+       select FSL_LAYERSCAPE
        select FSL_LSCH2
        select SYS_FSL_SRDS_1
        select SYS_HAS_SERDES
@@ -56,6 +58,7 @@ config ARCH_LS1043A
 config ARCH_LS1046A
        bool
        select ARMV8_SET_SMPEN
+       select FSL_LAYERSCAPE
        select FSL_LSCH2
        select SYS_FSL_SRDS_1
        select SYS_HAS_SERDES
@@ -90,6 +93,7 @@ config ARCH_LS1088A
        bool
        select ARMV8_SET_SMPEN
        select ARM_ERRATA_855873 if !TFABOOT
+       select FSL_LAYERSCAPE
        select FSL_LSCH3
        select SYS_FSL_SRDS_1
        select SYS_HAS_SERDES
@@ -132,6 +136,7 @@ config ARCH_LS2080A
        select ARM_ERRATA_828024
        select ARM_ERRATA_829520
        select ARM_ERRATA_833471
+       select FSL_LAYERSCAPE
        select FSL_LSCH3
        select SYS_FSL_SRDS_1
        select SYS_HAS_SERDES
@@ -234,6 +239,9 @@ config FSL_MC_ENET
 menu "Layerscape architecture"
        depends on FSL_LSCH2 || FSL_LSCH3
 
+config FSL_LAYERSCAPE
+       bool
+
 config FSL_PCIE_COMPAT
        string "PCIe compatible of Kernel DT"
        depends on PCIE_LAYERSCAPE

diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 324dba2b7e27eb6717b457c3535872639c6a4c61..9bbf34883efa2ec1bdc451b680eb797e8cf4d639 100644 (file)
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -6,7 +6,6 @@
 #ifndef __LS1012A_COMMON_H
 #define __LS1012A_COMMON_H
 
-#define CONFIG_FSL_LAYERSCAPE
 #define CONFIG_GICV2
 
 #include <asm/arch/config.h>

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 860b734d421b075b6d17e95f429ff5821ed0727e..662b573ed9683a2e90d8f3abb9874a3a43904d07 100644 (file)
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -26,7 +26,6 @@
 #endif
 
 #define CONFIG_REMAKE_ELF
-#define CONFIG_FSL_LAYERSCAPE
 #define CONFIG_GICV2
 
 #include <asm/arch/stream_id_lsch2.h>

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 6e36c9339bcceb31ae11ddf6201ca8a6eed4f2b3..0266681c52bb012bce9c5adbf3a3d335ce99f271 100644 (file)
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -26,7 +26,6 @@
 #endif
 
 #define CONFIG_REMAKE_ELF
-#define CONFIG_FSL_LAYERSCAPE
 #define CONFIG_GICV2
 
 #include <asm/arch/config.h>

diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index 95e6786e6cfe412f45bb84455b65793a0ba6273a..b663937d8cfd5b4bca1cd8bf98e9ab8672a2f449 100644 (file)
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -21,7 +21,6 @@
 #endif
 
 #define CONFIG_REMAKE_ELF
-#define CONFIG_FSL_LAYERSCAPE
 
 #include <asm/arch/stream_id_lsch3.h>
 #include <asm/arch/config.h>

diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index bc6a6c1924bf438650c4207c2c19f9746a947db9..0a6c90dc8ba33412fcedae820ca247dc05f9e5fd 100644 (file)
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -8,7 +8,6 @@
 #define __LS2_COMMON_H
 
 #define CONFIG_REMAKE_ELF
-#define CONFIG_FSL_LAYERSCAPE
 #define CONFIG_GICV3
 
 #include <asm/arch/stream_id_lsch3.h>

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ef4efd4d724c9436cb18f03f1c4f3c3199dae41f..3fd65c92678c745c91cbb04b38bf380c9d16bee2 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -643,7 +643,6 @@ CONFIG_FSL_I2C_CUSTOM_DFSR
 CONFIG_FSL_I2C_CUSTOM_FDR
 CONFIG_FSL_IIM
 CONFIG_FSL_ISBC_KEY_EXT
-CONFIG_FSL_LAYERSCAPE
 CONFIG_FSL_LBC
 CONFIG_FSL_MC9SDZ60
 CONFIG_FSL_MEMAC