UBUNTU: [Config] enable ARCH_MESON

BugLink: https://bugs.launchpad.net/bugs/1820530
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 3b4f3cb5c23d5e3c8b3d55f2732d7442db9ea9bc..9988691e899d356d38f9964a4ec332e72afcb6e6 100644 (file)
--- 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
@@ -71,6 +70,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 f6576054b01f3618beb078cef9cfff78a7c509e3..3a3cb52e9652604095daa0f3f80846d39ed15534 100644 (file)
--- 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
@@ -63,6 +62,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 01f79e169be35f0fffd4a17a1b80c8ed9410d86e..f8921f539bc9082ca9bb4689f711399d83177e6b 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -439,6 +439,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
@@ -1738,12 +1739,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
@@ -1757,12 +1761,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
@@ -5441,6 +5448,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
@@ -5449,6 +5457,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
@@ -7135,6 +7144,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
@@ -8666,7 +8680,8 @@ CONFIG_SERIAL_MAX3100=m
 CONFIG_SERIAL_MAX310X=y
 CONFIG_SERIAL_MCTRL_GPIO=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