ARM: rmobile: salvator-x: Move OF_LIBFDT and CMD_FDT to board config

Move these two Kconfig symbols to the salvator-x_defconfig.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig
index 8f9b5b53280ae977d10f5f61510802318417f36d..9fb0b898f1b1de14b18d24a2fd92507802fd2619 100644 (file)
--- a/configs/salvator-x_defconfig
+++ b/configs/salvator-x_defconfig
@@ -5,9 +5,11 @@ CONFIG_RCAR_GEN3=y
 CONFIG_TARGET_SALVATOR_X=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_FDT=y
 CONFIG_R8A7795=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
 CONFIG_DOS_PARTITION=y
 # CONFIG_MMC is not set
+CONFIG_OF_LIBFDT=y

diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 304478af073269cbdb107f22a88e8fdc91eac252..6bc8ab18b6cb28ef6254aec41c51a4ab1d1378fa 100644 (file)
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -17,7 +17,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_EXT4
 #define CONFIG_CMD_EXT4_WRITE
-#define CONFIG_CMD_FDT
 
 #define CONFIG_REMAKE_ELF
 
@@ -34,7 +33,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_OF_LIBFDT
 
 #undef CONFIG_SHOW_BOOT_PROGRESS