diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index ec9b516b5775..a8a95ad4a0e6 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -71,6 +71,7 @@ CONFIG_CMA=y
 CONFIG_CMDLINE_PARTITION=y
 CONFIG_CONFIGFS_FS=m
 CONFIG_CRAMFS=m
+CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
 # CONFIG_CXL_BASE is not set
@@ -267,6 +268,7 @@ CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
 CONFIG_NFP=m
+CONFIG_NLS_ISO8859_1=m
 CONFIG_NODES_SHIFT=10
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NOZOMI=m
@@ -335,6 +337,7 @@ CONFIG_REISERFS_FS=m
 # CONFIG_RESET_BERLIN is not set
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_MESON is not set
+# CONFIG_RESET_SUNXI is not set
 CONFIG_RFKILL=y
 CONFIG_ROMFS_FS=m
 CONFIG_RTC_DRV_CMOS=y
@@ -433,6 +436,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 cac69d8c3710..c3c0ac0b5fcf 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -32,6 +32,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 is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_UNIPHIER is not set
 # CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
@@ -80,6 +81,7 @@ CONFIG_CMDLINE_PARTITION=y
 CONFIG_CONFIGFS_FS=m
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CRAMFS=m
+CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM_IMX is not set
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
@@ -286,6 +288,7 @@ CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
 CONFIG_NFP=m
+CONFIG_NLS_ISO8859_1=m
 CONFIG_NODES_SHIFT=6
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NOZOMI=m
@@ -354,6 +357,7 @@ CONFIG_REISERFS_FS=m
 CONFIG_RESET_BERLIN=y
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_MESON is not set
+# CONFIG_RESET_SUNXI is not set
 CONFIG_RFKILL=y
 CONFIG_ROMFS_FS=m
 CONFIG_RTC_DRV_PCF8523=m
@@ -453,6 +457,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/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index ac585665fe9b..12362859c39e 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -204,7 +204,6 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_TMIO=y
 CONFIG_MFD_TPS65217=y
-CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
 CONFIG_MMC=y
@@ -275,7 +274,6 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=4
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
-CONFIG_NVMEM=m
 CONFIG_N_GSM=m
 CONFIG_OF=y
 CONFIG_OMFS_FS=m
@@ -384,7 +382,6 @@ CONFIG_SCSI_WD719X=m
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_DW=m
 # CONFIG_SERIAL_8250_FINTEK is not set
 CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_ALTERA_JTAGUART=m
diff --git a/debian.master/config/armhf/config.flavour.generic b/debian.master/config/armhf/config.flavour.generic
index 37309d31d0e2..edf3bbbb8933 100644
--- a/debian.master/config/armhf/config.flavour.generic
+++ b/debian.master/config/armhf/config.flavour.generic
@@ -5,21 +5,28 @@ CONFIG_ARCH_MXC=y
 CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP4=y
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 # CONFIG_ARM_HIGHBANK_CPUIDLE is not set
 # CONFIG_ARM_LPAE is not set
+CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
 CONFIG_FB_CFB_REV_PIXELS_IN_BYTE=y
 CONFIG_FORCE_MAX_ZONEORDER=12
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
+CONFIG_MII=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NVMEM=y
 CONFIG_PGTABLE_LEVELS=2
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_PWM_TIECAP=m
 CONFIG_PWM_TIEHRPWM=m
 CONFIG_REGULATOR_TWL4030=y
+CONFIG_RESET_SUNXI=y
 CONFIG_RTC_DRV_PCF8523=y
+CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SND_EDMA_SOC=m
 # CONFIG_SND_EMU10K1_SEQ is not set
@@ -28,3 +35,4 @@ CONFIG_SND_SOC_IMX_AUDMUX=y
 CONFIG_SND_SOC_RT5677_SPI=m
 CONFIG_SND_SOC_SGTL5000=y
 CONFIG_SOC_AM33XX=y
+CONFIG_SUNXI_SRAM=y
diff --git a/debian.master/config/armhf/config.flavour.generic-lpae b/debian.master/config/armhf/config.flavour.generic-lpae
index e8d240882f85..dc78b4665805 100644
--- a/debian.master/config/armhf/config.flavour.generic-lpae
+++ b/debian.master/config/armhf/config.flavour.generic-lpae
@@ -5,21 +5,28 @@
 # CONFIG_ARCH_OMAP3 is not set
 # CONFIG_ARCH_OMAP4 is not set
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+# CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARM_ATAG_DTB_COMPAT is not set
 CONFIG_ARM_HIGHBANK_CPUIDLE=y
 CONFIG_ARM_LPAE=y
+CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_HUGETLB_PAGE=y
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
+CONFIG_MII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NVMEM=m
 CONFIG_PGTABLE_LEVELS=3
 CONFIG_PHYS_ADDR_T_64BIT=y
 # CONFIG_PWM_TIECAP is not set
 # CONFIG_PWM_TIEHRPWM is not set
 CONFIG_REGULATOR_TWL4030=m
+# CONFIG_RESET_SUNXI is not set
 CONFIG_RTC_DRV_PCF8523=m
+CONFIG_SERIAL_8250_DW=m
 CONFIG_SERIAL_MCTRL_GPIO=m
 # CONFIG_SND_EDMA_SOC is not set
 CONFIG_SND_EMU10K1_SEQ=m
@@ -28,3 +35,4 @@ CONFIG_SND_SOC_IMX_AUDMUX=m
 # CONFIG_SND_SOC_RT5677_SPI is not set
 CONFIG_SND_SOC_SGTL5000=m
 # CONFIG_SOC_AM33XX is not set
+# CONFIG_SUNXI_SRAM is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 9831fa821e42..06a01c2ec963 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -212,6 +212,7 @@ CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_IMX=y
 CONFIG_AHCI_MVEBU=m
 CONFIG_AHCI_QORIQ=m
+CONFIG_AHCI_SUNXI=y
 CONFIG_AHCI_TEGRA=m
 CONFIG_AHCI_XGENE=m
 CONFIG_AIC79XX_CMDS_PER_DEVICE=32
@@ -444,7 +445,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
@@ -1168,6 +1168,7 @@ CONFIG_CAN_SJA1000_PLATFORM=m
 CONFIG_CAN_SLCAN=m
 CONFIG_CAN_SOFTING=m
 CONFIG_CAN_SOFTING_CS=m
+CONFIG_CAN_SUN4I=m
 CONFIG_CAN_TI_HECC=m
 CONFIG_CAN_TSCAN1=m
 CONFIG_CAN_VCAN=m
@@ -1687,7 +1688,6 @@ CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_DES3_EDE_X86_64=m
 CONFIG_CRYPTO_DES_S390=m
 CONFIG_CRYPTO_DEV_BCM_SPU=m
@@ -1736,6 +1736,7 @@ CONFIG_CRYPTO_DEV_QCE=m
 # CONFIG_CRYPTO_DEV_ROCKCHIP is not set
 CONFIG_CRYPTO_DEV_S5P=m
 CONFIG_CRYPTO_DEV_SAHARA=m
+CONFIG_CRYPTO_DEV_SUN4I_SS=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_VMX=y
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
@@ -2033,6 +2034,8 @@ CONFIG_DMA_ENGINE_RAID=y
 CONFIG_DMA_OF=y
 CONFIG_DMA_OMAP=y
 CONFIG_DMA_SHARED_BUFFER=y
+CONFIG_DMA_SUN4I=y
+CONFIG_DMA_SUN6I=y
 CONFIG_DMA_VIRT_OPS=y
 CONFIG_DMI=y
 CONFIG_DMIID=y
@@ -2195,6 +2198,7 @@ CONFIG_DRM_SHMOBILE=m
 CONFIG_DRM_SII902X=m
 CONFIG_DRM_SIL_SII8620=m
 # CONFIG_DRM_STI is not set
+CONFIG_DRM_SUN4I=m
 CONFIG_DRM_TEGRA=m
 # CONFIG_DRM_TEGRA_DEBUG is not set
 CONFIG_DRM_TEGRA_STAGING=y
@@ -2416,6 +2420,7 @@ CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
 CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_DWMAC_SUNXI=m
 CONFIG_DW_APB_ICTL=y
 CONFIG_DW_APB_TIMER=y
 CONFIG_DW_APB_TIMER_OF=y
@@ -3592,6 +3597,7 @@ CONFIG_I2C_SIS96X=m
 CONFIG_I2C_SLAVE_EEPROM=m
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_STUB=m
+CONFIG_I2C_SUN6I_P2WI=y
 CONFIG_I2C_TAOS_EVM=m
 CONFIG_I2C_TEGRA=m
 CONFIG_I2C_THUNDERX=m
@@ -4185,6 +4191,7 @@ CONFIG_IR_SHARP_DECODER=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
@@ -4373,6 +4380,7 @@ CONFIG_KEYBOARD_SH_KEYSC=m
 CONFIG_KEYBOARD_SNVS_PWRKEY=m
 CONFIG_KEYBOARD_STMPE=m
 CONFIG_KEYBOARD_STOWAWAY=m
+CONFIG_KEYBOARD_SUN4I_LRADC=y
 CONFIG_KEYBOARD_SUNKBD=m
 CONFIG_KEYBOARD_TC3589X=m
 CONFIG_KEYBOARD_TCA6416=m
@@ -4669,6 +4677,12 @@ CONFIG_MACH_MVEBU_V7=y
 # CONFIG_MACH_OMAP3517EVM is not set
 CONFIG_MACH_OMAP3_PANDORA=y
 CONFIG_MACH_OMAP_GENERIC=y
+CONFIG_MACH_SUN4I=y
+CONFIG_MACH_SUN5I=y
+CONFIG_MACH_SUN6I=y
+CONFIG_MACH_SUN7I=y
+CONFIG_MACH_SUN8I=y
+CONFIG_MACH_SUN9I=y
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
@@ -4744,6 +4758,7 @@ CONFIG_MDIO_CAVIUM=m
 CONFIG_MDIO_GPIO=m
 CONFIG_MDIO_HISI_FEMAC=m
 CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_SUN4I=y
 CONFIG_MDIO_THUNDER=m
 CONFIG_MDIO_XGENE=m
 CONFIG_MDM_GCC_9615=m
@@ -4849,6 +4864,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
@@ -4860,6 +4876,7 @@ CONFIG_MFD_ATMEL_FLEXCOM=m
 CONFIG_MFD_ATMEL_HLCDC=m
 CONFIG_MFD_AXP20X=m
 CONFIG_MFD_AXP20X_I2C=m
+# CONFIG_MFD_AXP20X_RSB is not set
 CONFIG_MFD_BCM590XX=m
 CONFIG_MFD_CPCAP=m
 CONFIG_MFD_CROS_EC=m
@@ -4918,6 +4935,7 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SMSC=y
 CONFIG_MFD_SPMI_PMIC=m
 CONFIG_MFD_STMPE=y
+CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_T7L66XB=y
 CONFIG_MFD_TC3589X=y
 CONFIG_MFD_TC6387XB=y
@@ -5060,6 +5078,7 @@ CONFIG_MMC_SDHI=m
 CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_SH_MMCIF=m
 CONFIG_MMC_SPI=m
+CONFIG_MMC_SUNXI=y
 # CONFIG_MMC_TEST is not set
 CONFIG_MMC_TIFM_SD=m
 CONFIG_MMC_TMIO=m
@@ -5249,6 +5268,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
@@ -5600,6 +5620,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
@@ -5831,7 +5852,6 @@ CONFIG_NLS_CODEPAGE_936=m
 CONFIG_NLS_CODEPAGE_949=m
 CONFIG_NLS_CODEPAGE_950=m
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_ISO8859_1=m
 CONFIG_NLS_ISO8859_13=m
 CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
@@ -5896,6 +5916,7 @@ CONFIG_NVEC_POWER=m
 CONFIG_NVM=y
 CONFIG_NVMEM_BCM_OCOTP=m
 CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_SUNXI_SID=y
 # CONFIG_NVMEM_VF610_OCOTP is not set
 CONFIG_NVME_CORE=m
 CONFIG_NVME_FABRICS=m
@@ -6248,6 +6269,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=y
+CONFIG_PHY_SUN9I_USB=y
 CONFIG_PHY_TEGRA_XUSB=m
 CONFIG_PHY_TUSB1210=m
 CONFIG_PHY_XGENE=y
@@ -6326,7 +6349,22 @@ CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_SH_PFC=y
 CONFIG_PINCTRL_SH_PFC_GPIO=y
 CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_SUN4I_A10=y
+CONFIG_PINCTRL_SUN5I=y
+CONFIG_PINCTRL_SUN6I_A31=y
+CONFIG_PINCTRL_SUN6I_A31_R=y
+CONFIG_PINCTRL_SUN7I_A20=y
+CONFIG_PINCTRL_SUN8I_A23=y
+CONFIG_PINCTRL_SUN8I_A23_R=y
+CONFIG_PINCTRL_SUN8I_A33=y
+CONFIG_PINCTRL_SUN8I_A83T=y
+CONFIG_PINCTRL_SUN8I_H3=y
+CONFIG_PINCTRL_SUN8I_H3_R=y
+CONFIG_PINCTRL_SUN8I_V3S=y
+CONFIG_PINCTRL_SUN9I_A80=y
+CONFIG_PINCTRL_SUN9I_A80_R=y
 CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_SX150X=y
 CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA114=y
@@ -6572,6 +6610,7 @@ CONFIG_PWM_RENESAS_TPU=m
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_SAMSUNG=m
 CONFIG_PWM_STMPE=y
+CONFIG_PWM_SUN4I=y
 CONFIG_PWM_SYSFS=y
 CONFIG_PWM_TEGRA=m
 CONFIG_PWM_TIPWMSS=y
@@ -6875,7 +6914,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_UNIPHIER=m
 # CONFIG_RESET_ZYNQ is not set
@@ -7069,6 +7107,8 @@ CONFIG_RTC_DRV_S3C=y
 CONFIG_RTC_DRV_S5M=m
 CONFIG_RTC_DRV_SNVS=m
 CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_SUN6I=y
+CONFIG_RTC_DRV_SUNXI=y
 CONFIG_RTC_DRV_TEGRA=m
 # CONFIG_RTC_DRV_TEST is not set
 CONFIG_RTC_DRV_TPS6586X=m
@@ -7612,6 +7652,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
@@ -8112,6 +8153,11 @@ 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=m
+CONFIG_SND_SUN4I_I2S=m
+CONFIG_SND_SUN4I_SPDIF=m
+CONFIG_SND_SUN8I_CODEC=m
+CONFIG_SND_SUN8I_CODEC_ANALOG=m
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_USB=y
@@ -8267,6 +8313,8 @@ CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_SH_HSPI=m
 CONFIG_SPI_SH_MSIOF=m
 CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_SUN4I=y
+CONFIG_SPI_SUN6I=y
 CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_TEGRA20_SFLASH=m
 CONFIG_SPI_TEGRA20_SLINK=m
@@ -8347,6 +8395,17 @@ CONFIG_STRICT_MODULE_RWX=y
 CONFIG_STUB_CLK_HI6220=y
 CONFIG_STX104=m
 CONFIG_SUDMAC=m
+CONFIG_SUN4I_EMAC=y
+CONFIG_SUN4I_TIMER=y
+# CONFIG_SUN50I_A64_CCU is not set
+CONFIG_SUN5I_CCU=y
+CONFIG_SUN5I_HSTIMER=y
+CONFIG_SUN6I_A31_CCU=y
+CONFIG_SUN8I_A23_CCU=y
+CONFIG_SUN8I_A33_CCU=y
+CONFIG_SUN8I_H3_CCU=y
+CONFIG_SUN8I_V3S_CCU=y
+CONFIG_SUN9I_A80_CCU=y
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_SUNGEM=m
@@ -8357,7 +8416,20 @@ 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_CCU_DIV=y
+CONFIG_SUNXI_CCU_FRAC=y
+CONFIG_SUNXI_CCU_GATE=y
+CONFIG_SUNXI_CCU_MP=y
+CONFIG_SUNXI_CCU_MULT=y
+CONFIG_SUNXI_CCU_MUX=y
+CONFIG_SUNXI_CCU_NK=y
+CONFIG_SUNXI_CCU_NKM=y
+CONFIG_SUNXI_CCU_NKMP=y
+CONFIG_SUNXI_CCU_NM=y
+CONFIG_SUNXI_CCU_PHASE=y
+CONFIG_SUNXI_RSB=y
+CONFIG_SUNXI_WATCHDOG=y
 CONFIG_SURFACE3_WMI=m
 CONFIG_SURFACE_3_BUTTON=m
 CONFIG_SURFACE_PRO3_BUTTON=m
@@ -8648,6 +8720,7 @@ CONFIG_TOUCHSCREEN_SILEAD=m
 CONFIG_TOUCHSCREEN_SIS_I2C=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_STMPE=m
+CONFIG_TOUCHSCREEN_SUN4I=y
 CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
 CONFIG_TOUCHSCREEN_SX8654=m
@@ -9050,6 +9123,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 is not set
 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 fde23de850f6..37adbe4e716b 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -68,6 +68,7 @@ CONFIG_CMA=y
 CONFIG_CMDLINE_PARTITION=y
 CONFIG_CONFIGFS_FS=m
 CONFIG_CRAMFS=m
+CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
 # CONFIG_CXL_BASE is not set
@@ -263,6 +264,7 @@ CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
 CONFIG_NFP=m
+CONFIG_NLS_ISO8859_1=m
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=8
@@ -329,6 +331,7 @@ CONFIG_REISERFS_FS=m
 # CONFIG_RESET_BERLIN is not set
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_MESON is not set
+# CONFIG_RESET_SUNXI is not set
 CONFIG_RFKILL=y
 CONFIG_ROMFS_FS=m
 CONFIG_RTC_DRV_CMOS=y
@@ -427,6 +430,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 8aedb32479b0..e68a2079279a 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -68,6 +68,7 @@ CONFIG_CMM=m
 CONFIG_CONFIGFS_FS=m
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CRAMFS=m
+CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
 CONFIG_CXL_AFU_DRIVER_OPS=y
 CONFIG_CXL_BASE=y
@@ -269,6 +270,7 @@ CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
 CONFIG_NFP=m
+CONFIG_NLS_ISO8859_1=m
 CONFIG_NODES_SHIFT=8
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NOZOMI=m
@@ -333,6 +335,7 @@ CONFIG_REISERFS_FS=m
 # CONFIG_RESET_BERLIN is not set
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_MESON is not set
+# CONFIG_RESET_SUNXI is not set
 CONFIG_RFKILL=y
 CONFIG_ROMFS_FS=m
 CONFIG_RTC_DRV_CMOS=m
@@ -430,6 +433,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 39f4e8a50df6..f6d9e7ae8543 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -61,6 +61,7 @@ CONFIG_CMM=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CRAMFS is not set
+CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
 # CONFIG_CXL_BASE is not set
@@ -234,6 +235,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_NEW_LEDS is not set
 # CONFIG_NFC is not set
 # CONFIG_NFP is not set
+CONFIG_NLS_ISO8859_1=m
 CONFIG_NODES_SHIFT=4
 # CONFIG_NOZOMI is not set
 CONFIG_NR_CPUS=256
@@ -362,6 +364,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