diff options
| author | Olof Johansson <olof@lixom.net> | 2016-04-13 19:16:36 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-04-13 19:16:36 +0200 |
| commit | a2c8eecb36b54458716c3d5f60c05c57c0727f73 (patch) | |
| tree | 8347468247462fce0c0c08f7ed92df992f33c212 /arch/arm64/configs | |
| parent | Linux 4.6-rc3 (diff) | |
| parent | arm64: defconfig: enable basic boot for Amlogic meson (diff) | |
| download | linux-a2c8eecb36b54458716c3d5f60c05c57c0727f73.tar.xz linux-a2c8eecb36b54458716c3d5f60c05c57c0727f73.zip | |
Merge tag 'gxbb-arm64' of https://github.com/carlocaione/linux-meson into next/arm64
Update defconfig to have basic boot for the Amlogic meson boards.
* tag 'gxbb-arm64' of https://github.com/carlocaione/linux-meson:
arm64: defconfig: enable basic boot for Amlogic meson
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/configs')
| -rw-r--r-- | arch/arm64/configs/defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index a44ef995d8ae..6d15d453fcb9 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -38,6 +38,7 @@ CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_LAYERSCAPE=y CONFIG_ARCH_HISI=y CONFIG_ARCH_MEDIATEK=y +CONFIG_ARCH_MESON=y CONFIG_ARCH_MVEBU=y CONFIG_ARCH_QCOM=y CONFIG_ARCH_ROCKCHIP=y @@ -138,6 +139,8 @@ CONFIG_SERIAL_TEGRA=y CONFIG_SERIAL_SH_SCI=y CONFIG_SERIAL_SH_SCI_NR_UARTS=11 CONFIG_SERIAL_SH_SCI_CONSOLE=y +CONFIG_SERIAL_MESON=y +CONFIG_SERIAL_MESON_CONSOLE=y CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y CONFIG_SERIAL_XILINX_PS_UART=y |