arm64: zynqmp: Define CONFIG_MP through Kconfig

This patch removes CONFIG_MP definition from .h and
enables it through Kconfig as it was already moved to
Kconfig.

Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5eda484d1fe92a90600b9f2b60bbed45a84db904..86335a3537d4e90c406d333ef118c38d3ac3b972 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -775,6 +775,7 @@ config ARCH_ZYNQMP
        select SPL_CLK if SPL
        select DM_USB if USB
        imply FAT_WRITE
+       imply MP
 
 config TEGRA
        bool "NVIDIA Tegra"

diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig
index 3e7571fbe154959bcbf3e896401b74a5682ac764..3025f281055f26f238a14a2356bd694fb4d36e4b 100644 (file)
--- a/configs/xilinx_zynqmp_mini_defconfig
+++ b/configs/xilinx_zynqmp_mini_defconfig
@@ -3,7 +3,6 @@ CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0xFFFC0000
 CONFIG_SYS_MEM_RSVD_FOR_MMU=y
-CONFIG_DEFINE_TCM_OCM_MMAP=y
 CONFIG_ZYNQMP_PSU_INIT_ENABLED=y
 # CONFIG_CMD_ZYNQMP is not set
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini"

diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig
index c24ffc2549602fff9bea3d20635a2b5a71ddae75..012c2e19bf541d130e3525b30d5b8e75e00df30f 100644 (file)
--- a/configs/xilinx_zynqmp_mini_emmc0_defconfig
+++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig
@@ -36,6 +36,7 @@ CONFIG_CMD_MMC=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+# CONFIG_MP is not set
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_EMBED=y

diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig
index 8212cefda89bb0c92c4fa1e9061d00b7db8f2d39..52e101983cfe29e12ffb3f5f9b5dd8416048de6a 100644 (file)
--- a/configs/xilinx_zynqmp_mini_emmc1_defconfig
+++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig
@@ -36,6 +36,7 @@ CONFIG_CMD_MMC=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+# CONFIG_MP is not set
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_EMBED=y

diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig
index 1849269f0e4d728cccc23591d2db4355e1b89f8f..a1189a5db257499246839ba4e1bd4505baf53d32 100644 (file)
--- a/configs/xilinx_zynqmp_mini_nand_defconfig
+++ b/configs/xilinx_zynqmp_mini_nand_defconfig
@@ -35,6 +35,7 @@ CONFIG_SYS_PROMPT="ZynqMP> "
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+# CONFIG_MP is not set
 # CONFIG_PARTITIONS is not set
 CONFIG_OF_EMBED=y
 # CONFIG_DM_WARN is not set

diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig
index d735c1eabd8083acdb6be4a0f2b00a4a6bfba21b..1713b1ad3162bd05800a41eadf6fd7e609b46cde 100644 (file)
--- a/configs/xilinx_zynqmp_mini_qspi_defconfig
+++ b/configs/xilinx_zynqmp_mini_qspi_defconfig
@@ -5,7 +5,6 @@ CONFIG_SYS_TEXT_BASE=0xFFFC0000
 CONFIG_SYS_MEM_RSVD_FOR_MMU=y
 CONFIG_ZYNQMP_QSPI=y
 CONFIG_ZYNQMP_NO_DDR=y
-CONFIG_DEFINE_TCM_OCM_MMAP=y
 CONFIG_SPI_GENERIC=y
 # CONFIG_CMD_ZYNQMP is not set
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-qspi-single"

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 59caeae3954c466951b71108db3b4f2131275168..3405cdbd569145529cc5d5c0ec084e0bc9bc6f1f 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -49,9 +49,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE \
        { 4800, 9600, 19200, 38400, 57600, 115200 }
 
-/* Command line configuration */
-#define CONFIG_MP
-
 /* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
 #define CONFIG_BOOTP_BOOTPATH

diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h
index 2624588330afbf11b2868130fa87eeadf9114b19..a0aae7431289ce3f2443b4397da789627f981633 100644 (file)
--- a/include/configs/xilinx_zynqmp_mini.h
+++ b/include/configs/xilinx_zynqmp_mini.h
@@ -34,7 +34,6 @@
 #undef CONFIG_GZIP
 #undef CONFIG_CMD_SPL
 #undef CONFIG_CMD_ENV
-#undef CONFIG_MP
 #undef CONFIG_SYS_INIT_SP_ADDR
 #undef CONFIG_SYS_LONGHELP
 #undef CONFIG_CMD_SF_TEST
@@ -80,7 +79,6 @@
 # define CONFIG_ENV_SIZE               1400
 # define CONFIG_SYS_INIT_SP_ADDR       (CONFIG_SYS_SDRAM_BASE + 0x20000)
 # define CONFIG_SYS_MALLOC_LEN         0x2000
-# define CONFIG_MP
 
 #elif defined(CONFIG_MINI_NAND)
 # define CONFIG_SYS_SDRAM_SIZE         0x1000000

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 5790c89e12d2643c6d6b90dfdde19479231c056d..6b9209f8091cb859bae94e7900a442cdede1d78e 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1376,7 +1376,6 @@ CONFIG_MMC_TRACE
 CONFIG_MMU
 CONFIG_MODVERSIONS
 CONFIG_MONITOR_IS_IN_RAM
-CONFIG_MP
 CONFIG_MPC8308
 CONFIG_MPC8308RDB
 CONFIG_MPC8308_P1M