From: Marek Vasut <marek.vasut@gmail.com>
Date: Sat, 13 May 2017 13:57:40 +0000 (+0200)
Subject: ARM: rmobile: Allow R8A7796 Salvator-X configuration
X-Git-Tag: v2017.07-rc1~191^2~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2aef8f32b680f02fabaa3ade4cba493b12611b78;p=oweals%2Fu-boot.git

ARM: rmobile: Allow R8A7796 Salvator-X configuration

The Salvator-X can have both H3 and M3 CPU on it, drop the
select R8A7795 to allow both configurations.

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/arch/arm/mach-rmobile/Kconfig.64 b/arch/arm/mach-rmobile/Kconfig.64
index 4ffc40edc6..5db93ac8d6 100644
--- a/arch/arm/mach-rmobile/Kconfig.64
+++ b/arch/arm/mach-rmobile/Kconfig.64
@@ -17,9 +17,8 @@ choice
 
 config TARGET_SALVATOR_X
 	bool "Salvator-X board"
-	select R8A7795
 	help
-          Support for Renesas R-Car Gen3 R8a7795 platform
+          Support for Renesas R-Car Gen3 platform
 
 endchoice
 
diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig
index b1500296da..8f9b5b5328 100644
--- a/configs/salvator-x_defconfig
+++ b/configs/salvator-x_defconfig
@@ -5,6 +5,7 @@ CONFIG_RCAR_GEN3=y
 CONFIG_TARGET_SALVATOR_X=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_CMD_BOOTZ=y
+CONFIG_R8A7795=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set