Browse Source

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>
Olof Johansson 9 years ago
parent
commit
a2c8eecb36
1 changed files with 3 additions and 0 deletions
  1. 3 0
      arch/arm64/configs/defconfig

+ 3 - 0
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