UBUNTU: [Config] Enable CONFIG_ARCH_SUNXI and related options for arm64

BugLink: http://bugs.launchpad.net/bugs/1701137
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 6b122e2d39467787eb81bd8fb2aaa97ac4263118..87b9a8c6b17d6949d326180a873248bde65feab4 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -343,6 +343,7 @@ CONFIG_REISERFS_FS=m
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_IMX7 is not set
 # CONFIG_RESET_MESON is not set
+# CONFIG_RESET_SUNXI is not set
 CONFIG_RFKILL=y
 CONFIG_ROMFS_FS=m
 CONFIG_RTC_DRV_CMOS=y
@@ -438,6 +439,7 @@ CONFIG_SRAM=y
 CONFIG_SSB=m
 CONFIG_STAGING=y
 # CONFIG_STANDALONE is not set
+# CONFIG_SUNXI_SRAM is not set
 CONFIG_SUN_PARTITION=y
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 525b5d8fd01833eb38877c8ae2075acd49682b08..090204cae5c5d35699994a310e8f2101327d9723 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -33,6 +33,7 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 # CONFIG_ARCH_ROCKCHIP is not set
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_UNIPHIER is not set
 # CONFIG_ARCH_WANTS_THP_SWAP is not set
@@ -360,6 +361,7 @@ CONFIG_RESET_BERLIN=y
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_IMX7 is not set
 # CONFIG_RESET_MESON is not set
+CONFIG_RESET_SUNXI=y
 CONFIG_RFKILL=y
 CONFIG_ROMFS_FS=m
 CONFIG_RTC_DRV_PCF8523=m
@@ -456,6 +458,7 @@ CONFIG_SRAM=y
 CONFIG_SSB=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
+CONFIG_SUNXI_SRAM=y
 CONFIG_SUN_PARTITION=y
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 28ca015af23f2ac3b47d1eb7b28f6f017c8bd040..9f29322c7e31395bce44376ad5e038b167b2cae7 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -27,6 +27,7 @@ CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
 CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SUNXI is not set
 CONFIG_ARCH_UNIPHIER=y
 # CONFIG_ARCH_WANTS_THP_SWAP is not set
 # CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
@@ -338,6 +339,7 @@ CONFIG_REISERFS_FS=m
 CONFIG_RESET_BERLIN=y
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_MESON=y
+# CONFIG_RESET_SUNXI is not set
 CONFIG_RFKILL=y
 CONFIG_ROMFS_FS=m
 CONFIG_RTC_DRV_CMOS=m
@@ -429,6 +431,7 @@ CONFIG_SRAM=y
 CONFIG_SSB=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
+# CONFIG_SUNXI_SRAM is not set
 CONFIG_SUN_PARTITION=y
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 3ace504d6f89ef54cf50a8e39d0addaa5c319f73..d9615b264f74cd41b79b434ad23cb7b5f942ad9c 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -213,6 +213,7 @@ CONFIG_AHCI_DM816=m
 CONFIG_AHCI_IMX=y
 CONFIG_AHCI_MVEBU=m
 CONFIG_AHCI_QORIQ=m
+# CONFIG_AHCI_SUNXI is not set
 CONFIG_AHCI_TEGRA=m
 CONFIG_AHCI_XGENE=m
 CONFIG_AIC79XX_CMDS_PER_DEVICE=32
@@ -453,7 +454,6 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SPRD=y
 # CONFIG_ARCH_STI is not set
 CONFIG_ARCH_STRATIX10=y
-# CONFIG_ARCH_SUNXI is not set
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -2114,6 +2114,7 @@ CONFIG_DMA_ENGINE_RAID=y
 CONFIG_DMA_OF=y
 CONFIG_DMA_OMAP=y
 CONFIG_DMA_SHARED_BUFFER=y
+CONFIG_DMA_SUN6I=m
 CONFIG_DMA_VIRT_OPS=y
 CONFIG_DMI=y
 CONFIG_DMIID=y
@@ -2515,6 +2516,8 @@ CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
 CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_DWMAC_SUN8I=m
+# CONFIG_DWMAC_SUNXI is not set
 CONFIG_DW_APB_ICTL=y
 CONFIG_DW_APB_TIMER=y
 CONFIG_DW_APB_TIMER_OF=y
@@ -4335,6 +4338,7 @@ CONFIG_IR_SIR=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_SPI=m
 CONFIG_IR_STREAMZAP=m
+CONFIG_IR_SUNXI=m
 CONFIG_IR_TTUSBIR=m
 CONFIG_IR_WINBOND_CIR=m
 CONFIG_IR_XMP_DECODER=m
@@ -4526,6 +4530,7 @@ CONFIG_KEYBOARD_SH_KEYSC=m
 CONFIG_KEYBOARD_SNVS_PWRKEY=m
 CONFIG_KEYBOARD_STMPE=m
 CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUN4I_LRADC is not set
 CONFIG_KEYBOARD_SUNKBD=m
 CONFIG_KEYBOARD_TC3589X=m
 CONFIG_KEYBOARD_TCA6416=m
@@ -4907,6 +4912,7 @@ CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 CONFIG_MDIO_HISI_FEMAC=m
 CONFIG_MDIO_OCTEON=m
+# CONFIG_MDIO_SUN4I is not set
 CONFIG_MDIO_THUNDER=m
 CONFIG_MDIO_XGENE=m
 CONFIG_MDM_GCC_9615=m
@@ -5010,6 +5016,7 @@ CONFIG_MFD_88PM800=m
 CONFIG_MFD_88PM805=m
 CONFIG_MFD_88PM860X=y
 CONFIG_MFD_AAT2870_CORE=y
+# CONFIG_MFD_AC100 is not set
 CONFIG_MFD_ACT8945A=m
 CONFIG_MFD_ARIZONA=y
 CONFIG_MFD_ARIZONA_I2C=m
@@ -5021,6 +5028,7 @@ CONFIG_MFD_ATMEL_FLEXCOM=m
 CONFIG_MFD_ATMEL_HLCDC=m
 CONFIG_MFD_AXP20X=m
 CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_AXP20X_RSB=m
 CONFIG_MFD_BCM590XX=m
 CONFIG_MFD_CPCAP=m
 CONFIG_MFD_CROS_EC=m
@@ -5079,6 +5087,8 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SMSC=y
 CONFIG_MFD_SPMI_PMIC=m
 CONFIG_MFD_STMPE=y
+CONFIG_MFD_SUN4I_GPADC=m
+CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_T7L66XB=y
 CONFIG_MFD_TC3589X=y
 CONFIG_MFD_TC6387XB=y
@@ -5230,6 +5240,7 @@ CONFIG_MMC_SDHI=m
 CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_SH_MMCIF=m
 CONFIG_MMC_SPI=m
+CONFIG_MMC_SUNXI=m
 # CONFIG_MMC_TEST is not set
 CONFIG_MMC_TIFM_SD=m
 CONFIG_MMC_TMIO=m
@@ -5420,6 +5431,7 @@ CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_NAND_PXA3xx=m
 CONFIG_MTD_NAND_QCOM=m
 CONFIG_MTD_NAND_RICOH=m
+# CONFIG_MTD_NAND_SUNXI is not set
 CONFIG_MTD_NAND_TANGO=m
 CONFIG_MTD_NAND_TMIO=m
 # CONFIG_MTD_NAND_VF610_NFC is not set
@@ -5785,6 +5797,7 @@ CONFIG_NET_TULIP=y
 CONFIG_NET_UDP_TUNNEL=m
 CONFIG_NET_VENDOR_8390=y
 CONFIG_NET_VENDOR_ALACRITECH=y
+CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AQUANTIA=y
 CONFIG_NET_VENDOR_AURORA=y
@@ -6085,6 +6098,7 @@ CONFIG_NVM=y
 CONFIG_NVMEM_BCM_OCOTP=m
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_SUNXI_SID=m
 # CONFIG_NVMEM_VF610_OCOTP is not set
 CONFIG_NVME_CORE=m
 CONFIG_NVME_FABRICS=m
@@ -6462,6 +6476,8 @@ CONFIG_PHY_ROCKCHIP_PCIE=m
 CONFIG_PHY_ROCKCHIP_TYPEC=m
 CONFIG_PHY_ROCKCHIP_USB=m
 CONFIG_PHY_SAMSUNG_USB2=m
+CONFIG_PHY_SUN4I_USB=m
+# CONFIG_PHY_SUN9I_USB is not set
 CONFIG_PHY_TEGRA_XUSB=m
 CONFIG_PHY_TUSB1210=m
 CONFIG_PHY_XGENE=y
@@ -6546,7 +6562,25 @@ CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_SH_PFC=y
 CONFIG_PINCTRL_SH_PFC_GPIO=y
 CONFIG_PINCTRL_SINGLE=y
+# CONFIG_PINCTRL_SUN4I_A10 is not set
+CONFIG_PINCTRL_SUN50I_A64=y
+CONFIG_PINCTRL_SUN50I_A64_R=y
+CONFIG_PINCTRL_SUN50I_H5=y
+# CONFIG_PINCTRL_SUN5I is not set
+# CONFIG_PINCTRL_SUN6I_A31 is not set
+# CONFIG_PINCTRL_SUN6I_A31_R is not set
+# CONFIG_PINCTRL_SUN8I_A23 is not set
+# CONFIG_PINCTRL_SUN8I_A23_R is not set
+# CONFIG_PINCTRL_SUN8I_A33 is not set
+# CONFIG_PINCTRL_SUN8I_A83T is not set
+# CONFIG_PINCTRL_SUN8I_A83T_R is not set
+# CONFIG_PINCTRL_SUN8I_H3 is not set
+CONFIG_PINCTRL_SUN8I_H3_R=y
+# CONFIG_PINCTRL_SUN8I_V3S is not set
+# CONFIG_PINCTRL_SUN9I_A80 is not set
+# CONFIG_PINCTRL_SUN9I_A80_R is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_SX150X=y
 CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA114=y
@@ -6794,6 +6828,7 @@ CONFIG_PWM_RENESAS_TPU=m
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_SAMSUNG=m
 CONFIG_PWM_STMPE=y
+CONFIG_PWM_SUN4I=m
 CONFIG_PWM_SYSFS=y
 CONFIG_PWM_TEGRA=m
 CONFIG_PWM_TIPWMSS=y
@@ -7115,7 +7150,6 @@ CONFIG_RESET_HISI=y
 # CONFIG_RESET_PISTACHIO is not set
 # CONFIG_RESET_SOCFPGA is not set
 # CONFIG_RESET_STM32 is not set
-# CONFIG_RESET_SUNXI is not set
 # CONFIG_RESET_TEGRA_BPMP is not set
 CONFIG_RESET_TI_SYSCON=m
 CONFIG_RESET_UNIPHIER=m
@@ -7318,6 +7352,7 @@ CONFIG_RTC_DRV_S5M=m
 CONFIG_RTC_DRV_SH=m
 CONFIG_RTC_DRV_SNVS=m
 CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_SUN6I=y
 CONFIG_RTC_DRV_TEGRA=m
 # CONFIG_RTC_DRV_TEST is not set
 CONFIG_RTC_DRV_TPS6586X=m
@@ -7871,6 +7906,7 @@ CONFIG_SERIO_PCIPS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
+# CONFIG_SERIO_SUN4I_PS2 is not set
 CONFIG_SERIO_XILINX_XPS_PS2=m
 CONFIG_SFC_FALCON_MTD=y
 CONFIG_SFC_MCDI_LOGGING=y
@@ -8404,6 +8440,10 @@ CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
 CONFIG_SND_SST_IPC=m
 CONFIG_SND_SST_IPC_ACPI=m
 CONFIG_SND_SST_IPC_PCI=m
+# CONFIG_SND_SUN4I_CODEC is not set
+# CONFIG_SND_SUN4I_I2S is not set
+# CONFIG_SND_SUN4I_SPDIF is not set
+CONFIG_SND_SUN8I_CODEC_ANALOG=m
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_SYNTH_EMUX=m
 CONFIG_SND_TRIDENT=m
@@ -8565,6 +8605,8 @@ CONFIG_SPI_SLAVE=y
 CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
 CONFIG_SPI_SLAVE_TIME=m
 CONFIG_SPI_SPIDEV=m
+# CONFIG_SPI_SUN4I is not set
+CONFIG_SPI_SUN6I=m
 CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_TEGRA20_SFLASH=m
 CONFIG_SPI_TEGRA20_SLINK=m
@@ -8646,6 +8688,13 @@ CONFIG_STRICT_MODULE_RWX=y
 CONFIG_STUB_CLK_HI6220=y
 CONFIG_STX104=m
 CONFIG_SUDMAC=m
+# CONFIG_SUN4I_EMAC is not set
+# CONFIG_SUN4I_GPADC is not set
+CONFIG_SUN50I_A64_CCU=y
+CONFIG_SUN8I_A83T_CCU=y
+CONFIG_SUN8I_DE2_CCU=y
+CONFIG_SUN8I_H3_CCU=y
+CONFIG_SUN8I_R_CCU=y
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_SUNGEM=m
@@ -8656,7 +8705,9 @@ CONFIG_SUNRPC_DEBUG=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_SWAP=y
 CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_SUNXI_SRAM is not set
+CONFIG_SUNXI_CCU=y
+CONFIG_SUNXI_RSB=m
+CONFIG_SUNXI_WATCHDOG=m
 CONFIG_SURFACE3_WMI=m
 CONFIG_SURFACE_3_BUTTON=m
 CONFIG_SURFACE_PRO3_BUTTON=m
@@ -8972,6 +9023,7 @@ CONFIG_TOUCHSCREEN_SIS_I2C=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_STMFTS=m
 CONFIG_TOUCHSCREEN_STMPE=m
+# CONFIG_TOUCHSCREEN_SUN4I is not set
 CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
 CONFIG_TOUCHSCREEN_SX8654=m
@@ -9384,6 +9436,7 @@ CONFIG_USB_MUSB_DUAL_ROLE=y
 # CONFIG_USB_MUSB_GADGET is not set
 # CONFIG_USB_MUSB_HOST is not set
 CONFIG_USB_MUSB_OMAP2PLUS=m
+CONFIG_USB_MUSB_SUNXI=m
 CONFIG_USB_MUSB_TUSB6010=m
 CONFIG_USB_MV_U3D=m
 CONFIG_USB_MV_UDC=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 1867ef82842264eadfeceb73f419325eb7abbd1b..af32747a5b6ecbdc1d1c556eeedc25f89cdc8ea9 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -337,6 +337,7 @@ CONFIG_REISERFS_FS=m
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_IMX7 is not set
 # CONFIG_RESET_MESON is not set
+# CONFIG_RESET_SUNXI is not set
 CONFIG_RFKILL=y
 CONFIG_ROMFS_FS=m
 CONFIG_RTC_DRV_CMOS=y
@@ -432,6 +433,7 @@ CONFIG_SRAM=y
 CONFIG_SSB=m
 CONFIG_STAGING=y
 # CONFIG_STANDALONE is not set
+# CONFIG_SUNXI_SRAM is not set
 CONFIG_SUN_PARTITION=y
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index f29f671136928abd4386faf763e0f2d28b95717e..7b320a32c2b37549119cad15b80da5e5f3ab1126 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -342,6 +342,7 @@ CONFIG_REISERFS_FS=m
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_IMX7 is not set
 # CONFIG_RESET_MESON is not set
+# CONFIG_RESET_SUNXI is not set
 CONFIG_RFKILL=y
 CONFIG_ROMFS_FS=m
 CONFIG_RTC_DRV_CMOS=m
@@ -436,6 +437,7 @@ CONFIG_SRAM=y
 CONFIG_SSB=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
+# CONFIG_SUNXI_SRAM is not set
 CONFIG_SUN_PARTITION=y
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 00438de668adae95b53a3ac560f4e53da44f1526..055fb67630698c0e536d57870a5293d33114250b 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -363,6 +363,7 @@ CONFIG_SERIAL_CORE=m
 # CONFIG_SSB is not set
 # CONFIG_STAGING is not set
 CONFIG_STANDALONE=y
+# CONFIG_SUNXI_SRAM is not set
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_SYSV_FS is not set