From e11decd3b7fd3cd8df74552fc7beff0aab1b7ba6 Mon Sep 17 00:00:00 2001 From: Paolo Pisati Date: Wed, 10 Jul 2019 13:21:47 +0000 Subject: [PATCH 1/2] UBUNTU: [Config] enable ARCH_MESON Signed-off-by: Paolo Pisati --- .../config/arm64/config.common.arm64 | 2 +- .../config/armhf/config.common.armhf | 2 +- debian.master/config/config.common.ubuntu | 19 +++++++++++++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index dd86c8e0c2f6..6097b458f3f6 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -20,7 +20,6 @@ CONFIG_APDS9802ALS=m CONFIG_APPLICOM=m # CONFIG_ARCH_ALPINE is not set # CONFIG_ARCH_EXYNOS is not set -# CONFIG_ARCH_MESON is not set CONFIG_ARCH_MMAP_RND_BITS=18 CONFIG_ARCH_MMAP_RND_BITS_MAX=33 CONFIG_ARCH_MMAP_RND_BITS_MIN=18 @@ -72,6 +71,7 @@ CONFIG_CB710_CORE=m CONFIG_CDROM_PKTCDVD=m CONFIG_CMDLINE="console=ttyAMA0" CONFIG_CMDLINE_PARTITION=y +CONFIG_COMMON_CLK_MESON_INPUT=y CONFIG_COUNTER=m # CONFIG_CPU_BIG_ENDIAN is not set CONFIG_CRAMFS=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 8645aa531323..3d661024db42 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -17,7 +17,6 @@ CONFIG_APDS9802ALS=m CONFIG_APPLICOM=m CONFIG_ARCH_ALPINE=y CONFIG_ARCH_EXYNOS=y -CONFIG_ARCH_MESON=y CONFIG_ARCH_MMAP_RND_BITS=8 CONFIG_ARCH_MMAP_RND_BITS_MAX=16 CONFIG_ARCH_MMAP_RND_BITS_MIN=8 @@ -64,6 +63,7 @@ CONFIG_CB710_CORE=m CONFIG_CDROM_PKTCDVD=m CONFIG_CMDLINE="" CONFIG_CMDLINE_PARTITION=y +CONFIG_COMMON_CLK_MESON_INPUT=m CONFIG_COUNTER=m # CONFIG_CPU_BIG_ENDIAN is not set CONFIG_CRAMFS=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 3fc55c778fe6..45a5e20350c6 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -433,6 +433,7 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_ARCH_MDM9615=y CONFIG_ARCH_MEDIATEK=y CONFIG_ARCH_MEMORY_PROBE=y +CONFIG_ARCH_MESON=y CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y @@ -1711,12 +1712,15 @@ CONFIG_COMEDI_USBDUXSIGMA=m CONFIG_COMEDI_USB_DRIVERS=m CONFIG_COMEDI_VMK80XX=m CONFIG_COMMON_CLK=y +CONFIG_COMMON_CLK_AXG=y CONFIG_COMMON_CLK_AXG_AUDIO=m CONFIG_COMMON_CLK_BD718XX=m CONFIG_COMMON_CLK_CDCE706=m CONFIG_COMMON_CLK_CDCE925=m CONFIG_COMMON_CLK_CS2000_CP=m CONFIG_COMMON_CLK_FIXED_MMIO=y +CONFIG_COMMON_CLK_G12A=y +CONFIG_COMMON_CLK_GXBB=y CONFIG_COMMON_CLK_HI3516CV300=m CONFIG_COMMON_CLK_HI3519=m CONFIG_COMMON_CLK_HI3660=y @@ -1730,12 +1734,15 @@ CONFIG_COMMON_CLK_MAX77686=m CONFIG_COMMON_CLK_MAX9485=m CONFIG_COMMON_CLK_MEDIATEK=y CONFIG_COMMON_CLK_MESON8B=y -CONFIG_COMMON_CLK_MESON_INPUT=m +CONFIG_COMMON_CLK_MESON_AO_CLKC=y +CONFIG_COMMON_CLK_MESON_DUALDIV=y +CONFIG_COMMON_CLK_MESON_EE_CLKC=y CONFIG_COMMON_CLK_MESON_MPLL=y CONFIG_COMMON_CLK_MESON_PHASE=m CONFIG_COMMON_CLK_MESON_PLL=y CONFIG_COMMON_CLK_MESON_REGMAP=y CONFIG_COMMON_CLK_MESON_SCLK_DIV=m +CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y # CONFIG_COMMON_CLK_MT2701 is not set CONFIG_COMMON_CLK_MT2712=y CONFIG_COMMON_CLK_MT2712_BDPSYS=y @@ -5429,6 +5436,7 @@ CONFIG_MEN_Z188_ADC=m CONFIG_MESON6_TIMER=y CONFIG_MESON_CANVAS=m CONFIG_MESON_CLK_MEASURE=y +CONFIG_MESON_EFUSE=m CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_GXL_PHY=m CONFIG_MESON_GX_PM_DOMAINS=y @@ -5437,6 +5445,7 @@ CONFIG_MESON_IRQ_GPIO=y CONFIG_MESON_MX_EFUSE=m CONFIG_MESON_MX_SOCINFO=y CONFIG_MESON_SARADC=m +CONFIG_MESON_SM=y CONFIG_MESON_WATCHDOG=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 CONFIG_MFD_88PM860X=y @@ -7088,6 +7097,11 @@ CONFIG_PINCTRL_MESON=y CONFIG_PINCTRL_MESON8=y CONFIG_PINCTRL_MESON8B=y CONFIG_PINCTRL_MESON8_PMX=y +CONFIG_PINCTRL_MESON_AXG=y +CONFIG_PINCTRL_MESON_AXG_PMX=y +CONFIG_PINCTRL_MESON_G12A=y +CONFIG_PINCTRL_MESON_GXBB=y +CONFIG_PINCTRL_MESON_GXL=y CONFIG_PINCTRL_MSM=y CONFIG_PINCTRL_MSM8660=m CONFIG_PINCTRL_MSM8916=m @@ -8602,7 +8616,8 @@ CONFIG_SERIAL_KGDB_NMI=y CONFIG_SERIAL_MAX3100=m CONFIG_SERIAL_MAX310X=y CONFIG_SERIAL_MEN_Z135=m -CONFIG_SERIAL_MESON=m +CONFIG_SERIAL_MESON=y +CONFIG_SERIAL_MESON_CONSOLE=y CONFIG_SERIAL_MILBEAUT_USIO=m CONFIG_SERIAL_MILBEAUT_USIO_PORTS=4 CONFIG_SERIAL_MSM=y -- 2.20.1