| Message ID | 20170513135753.8478-10-marek.vasut+renesas@gmail.com |
|---|---|
| State | Accepted |
| Commit | 2aef8f32b680f02fabaa3ade4cba493b12611b78 |
| Delegated to: | Nobuhiro Iwamatsu |
| Headers | show |
Applied to rmobile branch, thanks! 2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>: > 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> > --- > arch/arm/mach-rmobile/Kconfig.64 | 3 +-- > configs/salvator-x_defconfig | 1 + > 2 files changed, 2 insertions(+), 2 deletions(-) > > 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 > -- > 2.11.0 >
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
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> --- arch/arm/mach-rmobile/Kconfig.64 | 3 +-- configs/salvator-x_defconfig | 1 + 2 files changed, 2 insertions(+), 2 deletions(-)