ARM: rmobile: salvator-x: Set default device tree

Set default device tree file in the salvator-x_defconfig
and use it in the environment.

Signed-off-by: Marek Vasut <[email protected]>
Cc: Hiroyuki Yokoyama <[email protected]>
Cc: Nobuhiro Iwamatsu <[email protected]>

diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig
index 9fb0b898f1b1de14b18d24a2fd92507802fd2619..8cef6075e94b905dc7e96efb05f9245531ccc102 100644 (file)
--- a/configs/salvator-x_defconfig
+++ b/configs/salvator-x_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_RCAR_GEN3=y
 CONFIG_TARGET_SALVATOR_X=y
+CONFIG_DEFAULT_FDT_FILE=r8a7795-salvator-x.dtb
 CONFIG_VERSION_VARIABLE=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_FDT=y

diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 6bc8ab18b6cb28ef6254aec41c51a4ab1d1378fa..e73bc6185631151fec258d41287aa849cfe590ff 100644 (file)
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -100,7 +100,7 @@
 
 #define CONFIG_BOOTCOMMAND     \
        "tftp 0x48080000 Image; " \
-       "tftp 0x48000000 Image-r8a7795-salvator-x.dtb; " \
+       "tftp 0x48000000 Image-"CONFIG_DEFAULT_FDT_FILE"; " \
        "booti 0x48080000 - 0x48000000"
 
 #endif /* __RCAR_GEN3_COMMON_H */