diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-12-12 01:12:56 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-12 01:12:56 +0100 |
commit | 37c0fe6568dce9db064634ef3fb3d212507d9cba (patch) | |
tree | 3ea5a5fc403aeac88537c8642901a52f1c72c8f3 /arch/arm64 | |
parent | Linux 4.4-rc3 (diff) | |
parent | arm64: defconfig: renesas: Enable Renesas r8a7795 SoC (diff) | |
download | linux-37c0fe6568dce9db064634ef3fb3d212507d9cba.tar.xz linux-37c0fe6568dce9db064634ef3fb3d212507d9cba.zip |
Merge tag 'renesas-arm64-defconfig-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/config64
Merge "Renesas ARM64 Based SoC Defconfig Updates for v4.5" from Simon Horman:
* Enable Renesas r8a7795 SoC
* tag 'renesas-arm64-defconfig-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
arm64: defconfig: renesas: Enable Renesas r8a7795 SoC
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/configs/defconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index bdd7aa358d2a..a260e3a46f01 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -39,6 +39,8 @@ CONFIG_ARCH_HISI=y CONFIG_ARCH_MEDIATEK=y CONFIG_ARCH_ROCKCHIP=y CONFIG_ARCH_SEATTLE=y +CONFIG_ARCH_RENESAS=y +CONFIG_ARCH_R8A7795=y CONFIG_ARCH_STRATIX10=y CONFIG_ARCH_TEGRA=y CONFIG_ARCH_TEGRA_132_SOC=y @@ -116,6 +118,9 @@ CONFIG_SERIAL_SAMSUNG=y CONFIG_SERIAL_SAMSUNG_UARTS_4=y CONFIG_SERIAL_SAMSUNG_UARTS=4 CONFIG_SERIAL_SAMSUNG_CONSOLE=y +CONFIG_SERIAL_SH_SCI=y +CONFIG_SERIAL_SH_SCI_NR_UARTS=11 +CONFIG_SERIAL_SH_SCI_CONSOLE=y CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y |