Skip to content

Commit a46be40

Browse files
committed
Merge tag 'at91-defconfig-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/defconfig
AT91 defconfig #1 for 5.19: - update to MTD options and use of UBI - addition of systemd needed options - sama7: addition of reset, camera and microphone drivers * tag 'at91-defconfig-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: configs: at91: Enable AUTOFS_FS required by systemd ARM: configs: at91: Enable options required for systemd ARM: configs: at91: sama7: enable CONFIG_RESET_CONTROLLER ARM: configs: at91: sama7: add MCHP PDMC and DMIC drivers ARM: configs: at91: sama7: Enable MTD_UBI_BLOCK ARM: configs: at91: sama7: Enable MTD_UBI_FASTMAP ARM: configs: at91: sama7: add xisc and csi2dc ARM: multi_v7_defconfig: add atmel video pipeline modules ARM: configs: at91: Remove MTD_BLOCK and use MTD_UBI_BLOCK for read only block FS Link: https://lore.kernel.org/r/20220506085425.58270-1-nicolas.ferre@microchip.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents f68ec51 + 386d050 commit a46be40

4 files changed

Lines changed: 16 additions & 2 deletions

File tree

arch/arm/configs/at91_dt_defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ CONFIG_SYSVIPC=y
44
CONFIG_NO_HZ_IDLE=y
55
CONFIG_HIGH_RES_TIMERS=y
66
CONFIG_LOG_BUF_SHIFT=14
7+
CONFIG_CGROUPS=y
78
CONFIG_BLK_DEV_INITRD=y
89
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
910
CONFIG_KALLSYMS_ALL=y
@@ -50,13 +51,13 @@ CONFIG_DEVTMPFS_MOUNT=y
5051
CONFIG_MTD=y
5152
CONFIG_MTD_TESTS=m
5253
CONFIG_MTD_CMDLINE_PARTS=y
53-
CONFIG_MTD_BLOCK=y
5454
CONFIG_MTD_DATAFLASH=y
5555
CONFIG_MTD_RAW_NAND=y
5656
CONFIG_MTD_NAND_ATMEL=y
5757
CONFIG_MTD_SPI_NOR=y
5858
CONFIG_MTD_UBI=y
5959
CONFIG_MTD_UBI_FASTMAP=y
60+
CONFIG_MTD_UBI_BLOCK=y
6061
CONFIG_BLK_DEV_LOOP=y
6162
CONFIG_BLK_DEV_RAM=y
6263
CONFIG_BLK_DEV_RAM_COUNT=4
@@ -205,6 +206,7 @@ CONFIG_PWM_ATMEL=y
205206
CONFIG_PWM_ATMEL_HLCDC_PWM=y
206207
CONFIG_PWM_ATMEL_TCB=y
207208
CONFIG_EXT4_FS=y
209+
CONFIG_AUTOFS_FS=m
208210
CONFIG_FANOTIFY=y
209211
CONFIG_VFAT_FS=y
210212
CONFIG_TMPFS=y

arch/arm/configs/multi_v7_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,10 @@ CONFIG_VIDEO_S5P_MIPI_CSIS=m
663663
CONFIG_VIDEO_EXYNOS_FIMC_LITE=m
664664
CONFIG_VIDEO_EXYNOS4_FIMC_IS=m
665665
CONFIG_VIDEO_RCAR_VIN=m
666+
CONFIG_VIDEO_ATMEL_ISC=m
667+
CONFIG_VIDEO_ATMEL_XISC=m
666668
CONFIG_VIDEO_ATMEL_ISI=m
669+
CONFIG_VIDEO_MICROCHIP_CSI2DC=m
667670
CONFIG_V4L_MEM2MEM_DRIVERS=y
668671
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
669672
CONFIG_VIDEO_SAMSUNG_S5P_MFC=m

arch/arm/configs/sama5_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ CONFIG_DEVTMPFS_MOUNT=y
5757
CONFIG_MTD=y
5858
CONFIG_MTD_TESTS=m
5959
CONFIG_MTD_CMDLINE_PARTS=y
60-
CONFIG_MTD_BLOCK=y
6160
CONFIG_MTD_CFI=y
6261
CONFIG_MTD_RAW_NAND=y
6362
CONFIG_MTD_NAND_ATMEL=y
6463
CONFIG_MTD_SPI_NOR=y
6564
CONFIG_MTD_UBI=y
6665
CONFIG_MTD_UBI_FASTMAP=y
66+
CONFIG_MTD_UBI_BLOCK=y
6767
CONFIG_BLK_DEV_LOOP=y
6868
CONFIG_BLK_DEV_RAM=y
6969
CONFIG_BLK_DEV_RAM_COUNT=4
@@ -222,6 +222,7 @@ CONFIG_PWM_ATMEL_HLCDC_PWM=y
222222
CONFIG_PWM_ATMEL_TCB=y
223223
CONFIG_EXT4_FS=y
224224
CONFIG_FANOTIFY=y
225+
CONFIG_AUTOFS_FS=m
225226
CONFIG_VFAT_FS=y
226227
CONFIG_TMPFS=y
227228
CONFIG_UBIFS_FS=y

arch/arm/configs/sama7_defconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ CONFIG_MTD_NAND_ATMEL=y
9494
# CONFIG_MTD_NAND_ECC_SW_HAMMING is not set
9595
CONFIG_MTD_SPI_NOR=y
9696
CONFIG_MTD_UBI=y
97+
CONFIG_MTD_UBI_FASTMAP=y
98+
CONFIG_MTD_UBI_BLOCK=y
9799
CONFIG_BLK_DEV_LOOP=y
98100
CONFIG_BLK_DEV_RAM=y
99101
CONFIG_BLK_DEV_RAM_COUNT=1
@@ -138,6 +140,8 @@ CONFIG_MEDIA_SUPPORT_FILTER=y
138140
CONFIG_MEDIA_CAMERA_SUPPORT=y
139141
CONFIG_MEDIA_PLATFORM_SUPPORT=y
140142
CONFIG_V4L_PLATFORM_DRIVERS=y
143+
CONFIG_VIDEO_ATMEL_XISC=y
144+
CONFIG_VIDEO_MICROCHIP_CSI2DC=y
141145
CONFIG_VIDEO_IMX219=m
142146
CONFIG_VIDEO_IMX274=m
143147
CONFIG_VIDEO_OV5647=m
@@ -149,6 +153,8 @@ CONFIG_SND_SOC_MIKROE_PROTO=m
149153
CONFIG_SND_MCHP_SOC_I2S_MCC=y
150154
CONFIG_SND_MCHP_SOC_SPDIFTX=y
151155
CONFIG_SND_MCHP_SOC_SPDIFRX=y
156+
CONFIG_SND_MCHP_SOC_PDMC=y
157+
CONFIG_SND_SOC_DMIC=y
152158
CONFIG_SND_SOC_PCM5102A=y
153159
CONFIG_SND_SOC_SPDIF=y
154160
CONFIG_SND_SIMPLE_CARD=y
@@ -190,9 +196,11 @@ CONFIG_AT91_SAMA5D2_ADC=y
190196
CONFIG_PWM=y
191197
CONFIG_PWM_ATMEL=y
192198
CONFIG_MCHP_EIC=y
199+
CONFIG_RESET_CONTROLLER=y
193200
CONFIG_EXT2_FS=y
194201
CONFIG_EXT3_FS=y
195202
CONFIG_FANOTIFY=y
203+
CONFIG_AUTOFS_FS=m
196204
CONFIG_VFAT_FS=y
197205
CONFIG_TMPFS=y
198206
CONFIG_UBIFS_FS=y

0 commit comments

Comments
 (0)