Skip to content

Commit a307ca9

Browse files
committed
Merge tag 'mvebu-defconfig-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/defconfigs
mvebu defconfig for 5.16 (part 1) Update defconfig and enable mtd physmap * tag 'mvebu-defconfig-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu: ARM: mvebu_v7_defconfig: rebuild default configuration ARM: mvebu_v7_defconfig: enable mtd physmap Link: https://lore.kernel.org/r/871r4mmecw.fsf@BL-laptop Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 543659b + 8d41453 commit a307ca9

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

arch/arm/configs/mvebu_v7_defconfig

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,15 @@ CONFIG_BLK_DEV_INITRD=y
55
CONFIG_EXPERT=y
66
CONFIG_PERF_EVENTS=y
77
CONFIG_SLAB=y
8-
CONFIG_MODULES=y
9-
CONFIG_MODULE_UNLOAD=y
108
CONFIG_ARCH_MVEBU=y
119
CONFIG_MACH_ARMADA_370=y
1210
CONFIG_MACH_ARMADA_375=y
1311
CONFIG_MACH_ARMADA_38X=y
1412
CONFIG_MACH_ARMADA_39X=y
1513
CONFIG_MACH_ARMADA_XP=y
1614
CONFIG_MACH_DOVE=y
17-
CONFIG_PCI=y
18-
CONFIG_PCI_MVEBU=y
1915
CONFIG_SMP=y
2016
CONFIG_HIGHMEM=y
21-
# CONFIG_COMPACTION is not set
22-
CONFIG_ZBOOT_ROM_TEXT=0x0
23-
CONFIG_ZBOOT_ROM_BSS=0x0
2417
CONFIG_ARM_APPENDED_DTB=y
2518
CONFIG_ARM_ATAG_DTB_COMPAT=y
2619
CONFIG_CPU_FREQ=y
@@ -29,6 +22,9 @@ CONFIG_CPU_IDLE=y
2922
CONFIG_ARM_MVEBU_V7_CPUIDLE=y
3023
CONFIG_VFP=y
3124
CONFIG_NEON=y
25+
CONFIG_MODULES=y
26+
CONFIG_MODULE_UNLOAD=y
27+
# CONFIG_COMPACTION is not set
3228
CONFIG_NET=y
3329
CONFIG_PACKET=y
3430
CONFIG_UNIX=y
@@ -40,6 +36,8 @@ CONFIG_BT=y
4036
CONFIG_BT_MRVL=y
4137
CONFIG_BT_MRVL_SDIO=y
4238
CONFIG_CFG80211=y
39+
CONFIG_PCI=y
40+
CONFIG_PCI_MVEBU=y
4341
CONFIG_DEVTMPFS=y
4442
CONFIG_DEVTMPFS_MOUNT=y
4543
CONFIG_MTD=y
@@ -49,8 +47,8 @@ CONFIG_MTD_CFI=y
4947
CONFIG_MTD_CFI_INTELEXT=y
5048
CONFIG_MTD_CFI_AMDSTD=y
5149
CONFIG_MTD_CFI_STAA=y
50+
CONFIG_MTD_PHYSMAP=y
5251
CONFIG_MTD_PHYSMAP_OF=y
53-
CONFIG_MTD_M25P80=y
5452
CONFIG_MTD_RAW_NAND=y
5553
CONFIG_MTD_NAND_MARVELL=y
5654
CONFIG_MTD_SPI_NOR=y
@@ -146,10 +144,10 @@ CONFIG_NLS_CODEPAGE_850=y
146144
CONFIG_NLS_ISO8859_1=y
147145
CONFIG_NLS_ISO8859_2=y
148146
CONFIG_NLS_UTF8=y
147+
CONFIG_CRYPTO_DEV_MARVELL_CESA=y
149148
CONFIG_PRINTK_TIME=y
149+
# CONFIG_DEBUG_BUGVERBOSE is not set
150150
CONFIG_DEBUG_INFO=y
151151
CONFIG_MAGIC_SYSRQ=y
152152
# CONFIG_SCHED_DEBUG is not set
153-
# CONFIG_DEBUG_BUGVERBOSE is not set
154153
CONFIG_DEBUG_USER=y
155-
CONFIG_CRYPTO_DEV_MARVELL_CESA=y

0 commit comments

Comments
 (0)