summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2017-05-13 15:57:43 +0200
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>2017-05-22 04:38:26 +0900
commitf7fda5d1c05e6c86cf60cbd16b7258be56477dfc (patch)
tree709ebe2dd1fb8552899573c309b85a3df0bce48e
parentc94cb71d95d1a152d27685bc95897999ea17278d (diff)
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 <marek.vasut+renesas@gmail.com> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
-rw-r--r--configs/salvator-x_defconfig1
-rw-r--r--include/configs/rcar-gen3-common.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig
index 9fb0b898f1..8cef6075e9 100644
--- 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 6bc8ab18b6..e73bc61856 100644
--- 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 */