X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=debian.raspi2%2Fconfig%2Fconfig.common.ubuntu;h=c7b661153c860502e91bf95299b579d47147fc19;hb=bcad384f2c39284a002703ec4fb979f2a45fdec8;hp=75e8cd2b9453962557fffafa1da76d18f6c5ab56;hpb=1ffe8c97c95fa201d7ce98c875520a8d1663da13;p=mirror_ubuntu-artful-kernel.git

diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu
index 75e8cd2b9453..c7b661153c86 100644
--- a/debian.raspi2/config/config.common.ubuntu
+++ b/debian.raspi2/config/config.common.ubuntu
@@ -593,7 +593,7 @@ CONFIG_BCM2835_DEVGPIOMEM=y
 CONFIG_BCM2835_MBOX=y
 CONFIG_BCM2835_SMI=m
 CONFIG_BCM2835_SMI_DEV=m
-CONFIG_BCM2835_THERMAL=m
+CONFIG_BCM2835_THERMAL=y
 CONFIG_BCM2835_TIMER=y
 CONFIG_BCM2835_VCHIQ=y
 # CONFIG_BCM2835_VCHIQ_SUPPORT_MEMDUMP is not set
@@ -1424,8 +1424,8 @@ CONFIG_DRM=m
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_ARCPGU=m
 CONFIG_DRM_ARM=y
-CONFIG_DRM_ARMADA=m
-CONFIG_DRM_ATMEL_HLCDC=m
+# CONFIG_DRM_ARMADA is not set
+# CONFIG_DRM_ATMEL_HLCDC is not set
 CONFIG_DRM_BRIDGE=y
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
@@ -1446,7 +1446,7 @@ CONFIG_DRM_EXYNOS_MIXER=y
 # CONFIG_DRM_EXYNOS_VIDI is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
-CONFIG_DRM_FSL_DCU=m
+# CONFIG_DRM_FSL_DCU is not set
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
@@ -1457,11 +1457,7 @@ CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_IMX=m
-CONFIG_DRM_IMX_HDMI=m
-CONFIG_DRM_IMX_LDB=m
-CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
-CONFIG_DRM_IMX_TVE=m
+# CONFIG_DRM_IMX is not set
 CONFIG_DRM_KMS_CMA_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_KMS_HELPER=m
@@ -1496,7 +1492,7 @@ CONFIG_DRM_RCAR_DW_HDMI=m
 CONFIG_DRM_SII902X=m
 CONFIG_DRM_SIL_SII8620=m
 # CONFIG_DRM_STI is not set
-CONFIG_DRM_STM=m
+# CONFIG_DRM_STM is not set
 CONFIG_DRM_TILCDC=m
 CONFIG_DRM_TILCDC_SLAVE_COMPAT=y
 CONFIG_DRM_TINYDRM=m
@@ -1775,6 +1771,7 @@ CONFIG_FB_METRONOME=m
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_NOTIFY=y
 CONFIG_FB_OPENCORES=m
+# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
 CONFIG_FB_RPISENSE=m
 CONFIG_FB_S1D13XXX=m
 # CONFIG_FB_SIMPLE is not set
@@ -1928,7 +1925,7 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_GENERIC_IO=y
 CONFIG_GENERIC_IRQ_CHIP=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+CONFIG_GENERIC_IRQ_DEBUGFS=y
 CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
@@ -3398,8 +3395,9 @@ CONFIG_MMC=y
 CONFIG_MMC35240=m
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_BCM2835=y
-# CONFIG_MMC_BCM2835_DMA is not set
-CONFIG_MMC_BCM2835_MMC=m
+CONFIG_MMC_BCM2835_DMA=y
+CONFIG_MMC_BCM2835_MMC=y
+CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
 CONFIG_MMC_BCM2835_SDHOST=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=32
@@ -4175,6 +4173,7 @@ CONFIG_OPENVSWITCH_GRE=m
 CONFIG_OPENVSWITCH_VXLAN=m
 CONFIG_OPROFILE=m
 CONFIG_OPT3001=m
+# CONFIG_OPTEE is not set
 # CONFIG_ORANGEFS_FS is not set
 CONFIG_ORE=m
 CONFIG_OSF_PARTITION=y
@@ -5279,7 +5278,7 @@ CONFIG_SND_SOC_AC97_CODEC=m
 CONFIG_SND_SOC_ADAU1701=m
 CONFIG_SND_SOC_ADAU1761=m
 CONFIG_SND_SOC_ADAU1761_I2C=m
-# CONFIG_SND_SOC_ADAU1761_SPI is not set
+CONFIG_SND_SOC_ADAU1761_SPI=m
 CONFIG_SND_SOC_ADAU17X1=m
 CONFIG_SND_SOC_ADAU1977=m
 CONFIG_SND_SOC_ADAU1977_I2C=m
@@ -5298,7 +5297,7 @@ CONFIG_SND_SOC_COMPRESS=y
 CONFIG_SND_SOC_CS35L32=m
 CONFIG_SND_SOC_CS35L33=m
 CONFIG_SND_SOC_CS35L34=m
-# CONFIG_SND_SOC_CS35L35 is not set
+CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS4265=m
 CONFIG_SND_SOC_CS4270=m
 CONFIG_SND_SOC_CS4271=m
@@ -5314,9 +5313,9 @@ CONFIG_SND_SOC_CS42XX8=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_DIO2125 is not set
-# CONFIG_SND_SOC_ES7134 is not set
-# CONFIG_SND_SOC_ES8316 is not set
+CONFIG_SND_SOC_DIO2125=m
+CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_ES8316=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328_SPI=m
@@ -5341,12 +5340,12 @@ CONFIG_SND_SOC_IMX_AUDMUX=m
 CONFIG_SND_SOC_INNO_RK3036=m
 CONFIG_SND_SOC_MAX98504=m
 CONFIG_SND_SOC_MAX9860=m
-# CONFIG_SND_SOC_MAX98927 is not set
+CONFIG_SND_SOC_MAX98927=m
 CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
 CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 CONFIG_SND_SOC_NAU8540=m
 CONFIG_SND_SOC_NAU8810=m
-# CONFIG_SND_SOC_NAU8824 is not set
+CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_PCM1681=m
 CONFIG_SND_SOC_PCM1794A=m
 CONFIG_SND_SOC_PCM179X=m
@@ -5414,7 +5413,7 @@ CONFIG_SND_SOC_WM8978=m
 CONFIG_SND_SOC_WM8985=m
 CONFIG_SND_SOC_WM_ADSP=m
 CONFIG_SND_SOC_XTFPGA_I2S=m
-# CONFIG_SND_SOC_ZX_AUD96P22 is not set
+CONFIG_SND_SOC_ZX_AUD96P22=m
 CONFIG_SND_SPI=y
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_TIMER=m
@@ -5507,7 +5506,9 @@ CONFIG_SPI_PL022=m
 # CONFIG_SPI_PXA2XX_PCI is not set
 CONFIG_SPI_ROCKCHIP=m
 CONFIG_SPI_SC18IS602=m
-# CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_SLAVE=y
+CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
+CONFIG_SPI_SLAVE_TIME=m
 CONFIG_SPI_SPIDEV=y
 CONFIG_SPI_TLE62X0=m
 CONFIG_SPI_XCOMM=m
@@ -5532,7 +5533,7 @@ CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SRAM=y
 CONFIG_SRAM_EXEC=y
 CONFIG_SRCU=y
-# CONFIG_SRF04 is not set
+CONFIG_SRF04=m
 CONFIG_SRF08=m
 CONFIG_SSB=m
 CONFIG_SSB_BLOCKIO=y
@@ -5667,7 +5668,7 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_MD5SIG=y
 CONFIG_TCS3414=m
 CONFIG_TCS3472=m
-# CONFIG_TEE is not set
+CONFIG_TEE=m
 CONFIG_TEKRAM_DONGLE=m
 CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
@@ -5676,7 +5677,7 @@ CONFIG_TEST_BPF=m
 CONFIG_TEST_FIRMWARE=m
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
-# CONFIG_TEST_KMOD is not set
+CONFIG_TEST_KMOD=m
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_LIST_SORT is not set
 CONFIG_TEST_LKM=m
@@ -5686,7 +5687,7 @@ CONFIG_TEST_POWER=m
 # CONFIG_TEST_SORT is not set
 CONFIG_TEST_STATIC_KEYS=m
 # CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_SYSCTL is not set
+CONFIG_TEST_SYSCTL=m
 CONFIG_TEST_UDELAY=m
 CONFIG_TEST_USER_COPY=m
 # CONFIG_TEST_UUID is not set
@@ -5723,8 +5724,8 @@ CONFIG_TIPC=m
 CONFIG_TIPC_MEDIA_UDP=y
 CONFIG_TI_ADC081C=m
 CONFIG_TI_ADC0832=m
-# CONFIG_TI_ADC084S021 is not set
-# CONFIG_TI_ADC108S102 is not set
+CONFIG_TI_ADC084S021=m
+CONFIG_TI_ADC108S102=m
 CONFIG_TI_ADC12138=m
 CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
@@ -5735,7 +5736,7 @@ CONFIG_TI_AM335X_ADC=m
 CONFIG_TI_DAC7512=m
 CONFIG_TI_ST=m
 CONFIG_TI_TLC4541=m
-# CONFIG_TLS is not set
+CONFIG_TLS=m
 CONFIG_TMP006=m
 CONFIG_TMP007=m
 CONFIG_TMPFS=y
@@ -5797,7 +5798,7 @@ CONFIG_TOUCHSCREEN_RPI_FT5406=m
 CONFIG_TOUCHSCREEN_SILEAD=m
 CONFIG_TOUCHSCREEN_SIS_I2C=m
 CONFIG_TOUCHSCREEN_ST1232=m
-# CONFIG_TOUCHSCREEN_STMFTS is not set
+CONFIG_TOUCHSCREEN_STMFTS=m
 CONFIG_TOUCHSCREEN_STMPE=m
 CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
@@ -5880,8 +5881,11 @@ CONFIG_TWL4030_POWER=y
 CONFIG_TWL4030_WATCHDOG=m
 CONFIG_TWL6030_GPADC=m
 CONFIG_TWL6040_CORE=y
-# CONFIG_TYPEC_TCPM is not set
-# CONFIG_TYPEC_UCSI is not set
+CONFIG_TYPEC=m
+# CONFIG_TYPEC_FUSB302 is not set
+# CONFIG_TYPEC_TCPCI is not set
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_UCSI=m
 CONFIG_UACCESS_WITH_MEMCPY=y
 # CONFIG_UBIFS_ATIME_SUPPORT is not set
 CONFIG_UBIFS_FS=m
@@ -6096,7 +6100,7 @@ CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
 CONFIG_USB_R8A66597_HCD=m
-# CONFIG_USB_RAINSHADOW_CEC is not set
+CONFIG_USB_RAINSHADOW_CEC=m
 CONFIG_USB_RAREMONO=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_RTL8150=m
@@ -6298,7 +6302,7 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_MT9M111=m
 CONFIG_VIDEO_MT9V011=m
-# CONFIG_VIDEO_MUX is not set
+CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_OV2640=m
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_PVRUSB2=m
@@ -6326,7 +6330,7 @@ CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2_TPG=m
 CONFIG_VIDEO_VIM2M=m
-# CONFIG_VIDEO_VIMC is not set
+CONFIG_VIDEO_VIMC=m
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
@@ -6348,7 +6352,7 @@ CONFIG_VIRTUALIZATION=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VITESSE_PHY=m
-# CONFIG_VL6180 is not set
+CONFIG_VL6180=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -6358,7 +6362,7 @@ CONFIG_VMSPLIT_2G=y
 # CONFIG_VMSPLIT_3G_OPT is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VSOCKETS=m
-# CONFIG_VSOCKMON is not set
+CONFIG_VSOCKMON=m
 CONFIG_VT=y
 CONFIG_VT6656=m
 CONFIG_VT_CONSOLE=y
@@ -6383,7 +6387,7 @@ CONFIG_W1_SLAVE_DS2423=m
 CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 # CONFIG_W1_SLAVE_DS2433_CRC is not set
-# CONFIG_W1_SLAVE_DS2438 is not set
+CONFIG_W1_SLAVE_DS2438=m
 CONFIG_W1_SLAVE_DS2760=m
 CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
@@ -6466,13 +6470,13 @@ CONFIG_X25_ASY=m
 CONFIG_X509_CERTIFICATE_PARSER=y
 # CONFIG_XEN is not set
 CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_ALGO=y
 CONFIG_XFRM_IPCOMP=m
 # CONFIG_XFRM_MIGRATE is not set
 CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 # CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_USER=m
+CONFIG_XFRM_USER=y
 # CONFIG_XFS_DEBUG is not set
 CONFIG_XFS_FS=m
 CONFIG_XFS_POSIX_ACL=y
@@ -6481,7 +6485,7 @@ CONFIG_XFS_RT=y
 # CONFIG_XFS_WARN is not set
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_PR_DECOUPLER is not set
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_WATCHDOG=m
 # CONFIG_XILINX_ZYNQMP_DMA is not set
 CONFIG_XILLYBUS=m
@@ -6518,4 +6522,4 @@ CONFIG_ZRAM=m
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSWAP=y
-# CONFIG_ZX_TDM is not set
+CONFIG_ZX_TDM=m