diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig
index 8f9b5b5..9fb0b89 100644
--- a/configs/salvator-x_defconfig
+++ b/configs/salvator-x_defconfig
@@ -5,9 +5,11 @@
 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 304478a..6bc8ab1 100644
--- 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