diff options
| author | Tom Rini <trini@konsulko.com> | 2019-02-28 18:57:17 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-28 18:57:17 -0500 |
| commit | 35b05146f6a4853554b18ddc196d3bfcab5dd734 (patch) | |
| tree | 80a8169ce82665780267c50a55852496ed977e41 /arch/arm | |
| parent | da206916a14fc8ab8962763c47673128a29b4b9c (diff) | |
| parent | ba41c45ec3402178520ca59d5d847c1c94ae25c4 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
- Gen2/Gen3 fixes for warnings and sdhi
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-rmobile/Kconfig.32 | 10 | ||||
| -rw-r--r-- | arch/arm/mach-rmobile/Kconfig.64 | 24 |
2 files changed, 30 insertions, 4 deletions
diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32 index 076a019135..67f669a6fc 100644 --- a/arch/arm/mach-rmobile/Kconfig.32 +++ b/arch/arm/mach-rmobile/Kconfig.32 @@ -16,25 +16,35 @@ config R8A7790 bool "Renesas SoC R8A7790" select RCAR_GEN2 select ARM_CORTEX_A15_CVE_2017_5715 + imply CLK_R8A7790 + imply PINCTRL_PFC_R8A7790 config R8A7791 bool "Renesas SoC R8A7791" select RCAR_GEN2 select ARM_CORTEX_A15_CVE_2017_5715 + imply CLK_R8A7791 + imply PINCTRL_PFC_R8A7791 config R8A7792 bool "Renesas SoC R8A7792" select RCAR_GEN2 select ARM_CORTEX_A15_CVE_2017_5715 + imply CLK_R8A7792 + imply PINCTRL_PFC_R8A7792 config R8A7793 bool "Renesas SoC R8A7793" select RCAR_GEN2 select ARM_CORTEX_A15_CVE_2017_5715 + imply CLK_R8A7793 + imply PINCTRL_PFC_R8A7793 config R8A7794 bool "Renesas SoC R8A7794" select RCAR_GEN2 + imply CLK_R8A7794 + imply PINCTRL_PFC_R8A7794 choice prompt "Renesas ARM SoCs board select" diff --git a/arch/arm/mach-rmobile/Kconfig.64 b/arch/arm/mach-rmobile/Kconfig.64 index cb9f569e5f..b2ac1cdad7 100644 --- a/arch/arm/mach-rmobile/Kconfig.64 +++ b/arch/arm/mach-rmobile/Kconfig.64 @@ -1,51 +1,67 @@ if RCAR_GEN3 -choice - prompt "Select Target SoC" +menu "Select Target SoC" config R8A7795 bool "Renesas SoC R8A7795" + imply CLK_R8A7795 + imply PINCTRL_PFC_R8A7795 config R8A7796 bool "Renesas SoC R8A7796" + imply CLK_R8A7796 + imply PINCTRL_PFC_R8A7796 config R8A77970 bool "Renesas SoC R8A77970" + imply CLK_R8A77970 + imply PINCTRL_PFC_R8A77970 config R8A77990 bool "Renesas SoC R8A77990" + imply CLK_R8A77990 + imply PINCTRL_PFC_R8A77990 config R8A77995 bool "Renesas SoC R8A77995" + imply CLK_R8A77995 + imply PINCTRL_PFC_R8A77995 -endchoice +endmenu choice - prompt "Renesus ARM64 SoCs board select" + prompt "Renesas ARM64 SoCs board select" optional config TARGET_DRAAK bool "Draak board" + imply R8A77995 help Support for Renesas R-Car Gen3 Draak platform config TARGET_EAGLE bool "Eagle board" + imply R8A77970 help Support for Renesas R-Car Gen3 Eagle platform config TARGET_EBISU bool "Ebisu board" + imply R8A77990 help Support for Renesas R-Car Gen3 Ebisu platform config TARGET_SALVATOR_X bool "Salvator-X board" + imply R8A7795 + imply R8A7796 help Support for Renesas R-Car Gen3 platform config TARGET_ULCB bool "ULCB board" + imply R8A7795 + imply R8A7796 help Support for Renesas R-Car Gen3 ULCB platform |