Skip to content

Commit 8d41453

Browse files
ziswilergclement
authored andcommitted
ARM: mvebu_v7_defconfig: rebuild default configuration
Run "make mvebu_v7_defconfig; make savedefconfig" to rebuild mvebu_v7_defconfig This re-ordered the following configuration options: CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_CRYPTO_DEV_MARVELL_CESA=y And dropped the following nowadays obsolete configuration options: CONFIG_ZBOOT_ROM_TEXT=0x0 (default now anyway since commit 39c3e30 ("ARM: 8984/1: Kconfig: set default ZBOOT_ROM_TEXT/BSS value to 0x0")) CONFIG_ZBOOT_ROM_BSS=0x0 (ditto) CONFIG_MTD_M25P80=y (got integrated into MTD_SPI_NOR) Signed-off-by: Marcel Ziswiler <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Signed-off-by: Gregory CLEMENT <[email protected]>
1 parent a4ce461 commit 8d41453

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

arch/arm/configs/mvebu_v7_defconfig

Lines changed: 7 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
@@ -51,7 +49,6 @@ CONFIG_MTD_CFI_AMDSTD=y
5149
CONFIG_MTD_CFI_STAA=y
5250
CONFIG_MTD_PHYSMAP=y
5351
CONFIG_MTD_PHYSMAP_OF=y
54-
CONFIG_MTD_M25P80=y
5552
CONFIG_MTD_RAW_NAND=y
5653
CONFIG_MTD_NAND_MARVELL=y
5754
CONFIG_MTD_SPI_NOR=y
@@ -147,10 +144,10 @@ CONFIG_NLS_CODEPAGE_850=y
147144
CONFIG_NLS_ISO8859_1=y
148145
CONFIG_NLS_ISO8859_2=y
149146
CONFIG_NLS_UTF8=y
147+
CONFIG_CRYPTO_DEV_MARVELL_CESA=y
150148
CONFIG_PRINTK_TIME=y
149+
# CONFIG_DEBUG_BUGVERBOSE is not set
151150
CONFIG_DEBUG_INFO=y
152151
CONFIG_MAGIC_SYSRQ=y
153152
# CONFIG_SCHED_DEBUG is not set
154-
# CONFIG_DEBUG_BUGVERBOSE is not set
155153
CONFIG_DEBUG_USER=y
156-
CONFIG_CRYPTO_DEV_MARVELL_CESA=y

0 commit comments

Comments
 (0)