Skip to content

Commit eb6ac26

Browse files
kelvincheungtsbogend
authored andcommitted
mips: configs: loongson1: Update defconfig
Update loongson1_defconfig to reflect recent Kconfig changes: - Replace CONFIG_MTD_NAND_LOONGSON1 with CONFIG_MTD_NAND_LOONGSON, since commit 7a1e3a4 ("mtd: rawnand: loongson1: Rename the prefix from ls1x to loongson"). - Enable CONFIG_ETHTOOL_NETLINK, since commit 9ff2aa4 ("net: ethtool: mm: extract stmmac verification logic into common library") makes STMMAC_ETH depend on it. In addition: - Enable CONFIG_JUMP_LABEL to allow optimized static branch handling. - Disable unnecessary options. - Enable CONFIG_TEST_DHRY as a module. Fixes: 7a1e3a4 ("mtd: rawnand: loongson1: Rename the prefix from ls1x to loongson") Fixes: 9ff2aa4 ("net: ethtool: mm: extract stmmac verification logic into common library") Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
1 parent c8610c0 commit eb6ac26

1 file changed

Lines changed: 7 additions & 9 deletions

File tree

arch/mips/configs/loongson1_defconfig

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ CONFIG_EXPERT=y
1313
CONFIG_PERF_EVENTS=y
1414
CONFIG_MACH_LOONGSON32=y
1515
# CONFIG_SUSPEND is not set
16+
CONFIG_JUMP_LABEL=y
1617
# CONFIG_SECCOMP is not set
1718
# CONFIG_GCC_PLUGINS is not set
1819
CONFIG_MODULES=y
@@ -30,16 +31,16 @@ CONFIG_IP_PNP_DHCP=y
3031
CONFIG_SYN_COOKIES=y
3132
# CONFIG_INET_DIAG is not set
3233
# CONFIG_IPV6 is not set
34+
# CONFIG_BQL is not set
3335
# CONFIG_WIRELESS is not set
34-
# CONFIG_ETHTOOL_NETLINK is not set
3536
CONFIG_DEVTMPFS=y
3637
CONFIG_DEVTMPFS_MOUNT=y
3738
# CONFIG_STANDALONE is not set
3839
CONFIG_MTD=y
3940
CONFIG_MTD_CMDLINE_PARTS=y
4041
CONFIG_MTD_BLOCK=y
4142
CONFIG_MTD_RAW_NAND=y
42-
CONFIG_MTD_NAND_LOONGSON1=y
43+
CONFIG_MTD_NAND_LOONGSON=y
4344
CONFIG_MTD_UBI=y
4445
CONFIG_BLK_DEV_LOOP=y
4546
CONFIG_SCSI=m
@@ -72,6 +73,7 @@ CONFIG_NETDEVICES=y
7273
# CONFIG_NET_VENDOR_MICROCHIP is not set
7374
# CONFIG_NET_VENDOR_MICROSEMI is not set
7475
# CONFIG_NET_VENDOR_MICROSOFT is not set
76+
# CONFIG_NET_VENDOR_MUCSE is not set
7577
# CONFIG_NET_VENDOR_NI is not set
7678
# CONFIG_NET_VENDOR_NATSEMI is not set
7779
# CONFIG_NET_VENDOR_NETRONOME is not set
@@ -166,15 +168,11 @@ CONFIG_ROOT_NFS=y
166168
CONFIG_NLS_CODEPAGE_437=m
167169
CONFIG_NLS_ISO8859_1=m
168170
# CONFIG_CRYPTO_HW is not set
169-
# CONFIG_XZ_DEC_X86 is not set
170-
# CONFIG_XZ_DEC_POWERPC is not set
171-
# CONFIG_XZ_DEC_ARM is not set
172-
# CONFIG_XZ_DEC_ARMTHUMB is not set
173-
# CONFIG_XZ_DEC_ARM64 is not set
174-
# CONFIG_XZ_DEC_SPARC is not set
175-
# CONFIG_XZ_DEC_RISCV is not set
176171
CONFIG_DYNAMIC_DEBUG=y
177172
# CONFIG_DEBUG_MISC is not set
178173
CONFIG_MAGIC_SYSRQ=y
174+
# CONFIG_SLUB_DEBUG is not set
175+
# CONFIG_RCU_TRACE is not set
179176
# CONFIG_FTRACE is not set
180177
# CONFIG_EARLY_PRINTK is not set
178+
CONFIG_TEST_DHRY=m

0 commit comments

Comments
 (0)