Skip to content

Commit ad79935

Browse files
kelvincheungtsbogend
authored andcommitted
MIPS: configs: Consolidate Loongson1 defconfigs
Unify loongson{1b,1c}_defconfig into a single loongson1_defconfig. Enable the following options by default: - CONFIG_SERIAL_OF_PLATFORM - CONFIG_RTC_DRV_LOONGSON - CONFIG_LOONGSON1_APB_DMA - CONFIG_MTD_NAND_LOONGSON1 - CONFIG_SND_LOONGSON1_AC97 Also disable unnecessary options. Signed-off-by: Keguang Zhang <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent 2d18f23 commit ad79935

File tree

3 files changed

+78
-138
lines changed

3 files changed

+78
-138
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17017,6 +17017,7 @@ L: [email protected]
1701717017
S: Maintained
1701817018
F: Documentation/devicetree/bindings/*/loongson,ls1*.yaml
1701917019
F: arch/mips/boot/dts/loongson/loongson1*
17020+
F: arch/mips/configs/loongson1_defconfig
1702017021
F: arch/mips/loongson32/
1702117022
F: drivers/*/*loongson1*
1702217023
F: drivers/mtd/nand/raw/loongson1-nand-controller.c
Lines changed: 77 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# CONFIG_LOCALVERSION_AUTO is not set
22
CONFIG_KERNEL_XZ=y
33
CONFIG_SYSVIPC=y
4-
CONFIG_HIGH_RES_TIMERS=y
54
CONFIG_PREEMPT=y
65
CONFIG_BSD_PROCESS_ACCT=y
76
CONFIG_BSD_PROCESS_ACCT_V3=y
@@ -12,15 +11,16 @@ CONFIG_NAMESPACES=y
1211
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1312
CONFIG_EXPERT=y
1413
CONFIG_PERF_EVENTS=y
15-
# CONFIG_COMPAT_BRK is not set
1614
CONFIG_MACH_LOONGSON32=y
17-
# CONFIG_SECCOMP is not set
1815
# CONFIG_SUSPEND is not set
16+
# CONFIG_SECCOMP is not set
17+
# CONFIG_GCC_PLUGINS is not set
1918
CONFIG_MODULES=y
2019
CONFIG_MODULE_UNLOAD=y
2120
CONFIG_MODVERSIONS=y
22-
# CONFIG_BLK_DEV_BSG is not set
21+
# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set
2322
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
23+
# CONFIG_COMPAT_BRK is not set
2424
CONFIG_NET=y
2525
CONFIG_PACKET=y
2626
CONFIG_UNIX=y
@@ -31,47 +31,99 @@ CONFIG_SYN_COOKIES=y
3131
# CONFIG_INET_DIAG is not set
3232
# CONFIG_IPV6 is not set
3333
# CONFIG_WIRELESS is not set
34+
# CONFIG_ETHTOOL_NETLINK is not set
3435
CONFIG_DEVTMPFS=y
3536
CONFIG_DEVTMPFS_MOUNT=y
3637
# CONFIG_STANDALONE is not set
3738
CONFIG_MTD=y
3839
CONFIG_MTD_CMDLINE_PARTS=y
3940
CONFIG_MTD_BLOCK=y
4041
CONFIG_MTD_RAW_NAND=y
42+
CONFIG_MTD_NAND_LOONGSON1=y
4143
CONFIG_MTD_UBI=y
4244
CONFIG_BLK_DEV_LOOP=y
4345
CONFIG_SCSI=m
4446
# CONFIG_SCSI_PROC_FS is not set
4547
CONFIG_BLK_DEV_SD=m
48+
# CONFIG_BLK_DEV_BSG is not set
4649
# CONFIG_SCSI_LOWLEVEL is not set
4750
CONFIG_NETDEVICES=y
51+
# CONFIG_NET_VENDOR_ALACRITECH is not set
52+
# CONFIG_NET_VENDOR_AMAZON is not set
53+
# CONFIG_NET_VENDOR_AQUANTIA is not set
54+
# CONFIG_NET_VENDOR_ARC is not set
55+
# CONFIG_NET_VENDOR_ASIX is not set
4856
# CONFIG_NET_VENDOR_BROADCOM is not set
57+
# CONFIG_NET_VENDOR_CADENCE is not set
58+
# CONFIG_NET_VENDOR_CAVIUM is not set
59+
# CONFIG_NET_VENDOR_CORTINA is not set
60+
# CONFIG_NET_VENDOR_DAVICOM is not set
61+
# CONFIG_NET_VENDOR_ENGLEDER is not set
62+
# CONFIG_NET_VENDOR_EZCHIP is not set
63+
# CONFIG_NET_VENDOR_FUNGIBLE is not set
64+
# CONFIG_NET_VENDOR_GOOGLE is not set
65+
# CONFIG_NET_VENDOR_HISILICON is not set
66+
# CONFIG_NET_VENDOR_HUAWEI is not set
4967
# CONFIG_NET_VENDOR_INTEL is not set
68+
# CONFIG_NET_VENDOR_LITEX is not set
5069
# CONFIG_NET_VENDOR_MARVELL is not set
70+
# CONFIG_NET_VENDOR_META is not set
5171
# CONFIG_NET_VENDOR_MICREL is not set
72+
# CONFIG_NET_VENDOR_MICROCHIP is not set
73+
# CONFIG_NET_VENDOR_MICROSEMI is not set
74+
# CONFIG_NET_VENDOR_MICROSOFT is not set
75+
# CONFIG_NET_VENDOR_NI is not set
5276
# CONFIG_NET_VENDOR_NATSEMI is not set
77+
# CONFIG_NET_VENDOR_NETRONOME is not set
78+
# CONFIG_NET_VENDOR_PENSANDO is not set
79+
# CONFIG_NET_VENDOR_QUALCOMM is not set
80+
# CONFIG_NET_VENDOR_RENESAS is not set
81+
# CONFIG_NET_VENDOR_ROCKER is not set
82+
# CONFIG_NET_VENDOR_SAMSUNG is not set
5383
# CONFIG_NET_VENDOR_SEEQ is not set
84+
# CONFIG_NET_VENDOR_SOLARFLARE is not set
5485
# CONFIG_NET_VENDOR_SMSC is not set
86+
# CONFIG_NET_VENDOR_SOCIONEXT is not set
5587
CONFIG_STMMAC_ETH=y
88+
# CONFIG_DWMAC_GENERIC is not set
89+
# CONFIG_NET_VENDOR_SYNOPSYS is not set
90+
# CONFIG_NET_VENDOR_VERTEXCOM is not set
91+
# CONFIG_NET_VENDOR_VIA is not set
92+
# CONFIG_NET_VENDOR_WANGXUN is not set
5693
# CONFIG_NET_VENDOR_WIZNET is not set
94+
# CONFIG_NET_VENDOR_XILINX is not set
95+
CONFIG_DAVICOM_PHY=y
96+
CONFIG_REALTEK_PHY=y
97+
# CONFIG_USB_NET_DRIVERS is not set
5798
# CONFIG_WLAN is not set
5899
CONFIG_INPUT_EVDEV=y
59100
# CONFIG_INPUT_KEYBOARD is not set
60101
# CONFIG_INPUT_MOUSE is not set
61102
# CONFIG_SERIO is not set
103+
# CONFIG_VT_CONSOLE is not set
62104
CONFIG_VT_HW_CONSOLE_BINDING=y
63105
CONFIG_LEGACY_PTY_COUNT=8
64106
CONFIG_SERIAL_8250=y
65107
CONFIG_SERIAL_8250_CONSOLE=y
108+
CONFIG_SERIAL_OF_PLATFORM=y
66109
# CONFIG_HW_RANDOM is not set
110+
# CONFIG_PTP_1588_CLOCK is not set
67111
CONFIG_GPIOLIB=y
68112
CONFIG_GPIO_LOONGSON1=y
69113
# CONFIG_HWMON is not set
70114
CONFIG_WATCHDOG=y
71115
CONFIG_WATCHDOG_NOWAYOUT=y
72116
CONFIG_WATCHDOG_SYSFS=y
73117
CONFIG_LOONGSON1_WDT=y
74-
# CONFIG_VGA_CONSOLE is not set
118+
CONFIG_SOUND=y
119+
CONFIG_SND=y
120+
# CONFIG_SND_SUPPORT_OLD_API is not set
121+
# CONFIG_SND_DRIVERS is not set
122+
# CONFIG_SND_MIPS is not set
123+
# CONFIG_SND_USB is not set
124+
CONFIG_SND_SOC=y
125+
CONFIG_SND_LOONGSON1_AC97=y
126+
CONFIG_SND_SIMPLE_CARD=y
75127
CONFIG_HID_GENERIC=m
76128
CONFIG_USB_HID=m
77129
CONFIG_USB=y
@@ -86,17 +138,20 @@ CONFIG_NEW_LEDS=y
86138
CONFIG_LEDS_CLASS=y
87139
CONFIG_LEDS_GPIO=y
88140
CONFIG_LEDS_TRIGGERS=y
141+
CONFIG_LEDS_TRIGGER_MTD=y
89142
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
90143
CONFIG_RTC_CLASS=y
91-
CONFIG_RTC_DRV_LOONGSON1=y
144+
# CONFIG_RTC_NVMEM is not set
145+
CONFIG_RTC_DRV_LOONGSON=y
146+
CONFIG_DMADEVICES=y
147+
CONFIG_LOONGSON1_APB_DMA=y
148+
# CONFIG_VIRTIO_MENU is not set
149+
# CONFIG_VHOST_MENU is not set
150+
# CONFIG_MIPS_PLATFORM_DEVICES is not set
92151
# CONFIG_IOMMU_SUPPORT is not set
93-
CONFIG_EXT2_FS=y
94-
CONFIG_EXT2_FS_XATTR=y
95-
CONFIG_EXT2_FS_POSIX_ACL=y
96-
CONFIG_EXT2_FS_SECURITY=y
97-
CONFIG_EXT3_FS=y
98-
CONFIG_EXT3_FS_POSIX_ACL=y
99-
CONFIG_EXT3_FS_SECURITY=y
152+
# CONFIG_NVMEM is not set
153+
CONFIG_EXT4_FS=y
154+
CONFIG_EXT4_FS_POSIX_ACL=y
100155
# CONFIG_DNOTIFY is not set
101156
CONFIG_VFAT_FS=y
102157
CONFIG_PROC_KCORE=y
@@ -105,16 +160,21 @@ CONFIG_TMPFS_POSIX_ACL=y
105160
CONFIG_UBIFS_FS=y
106161
CONFIG_UBIFS_FS_ADVANCED_COMPR=y
107162
CONFIG_UBIFS_ATIME_SUPPORT=y
163+
# CONFIG_UBIFS_FS_SECURITY is not set
108164
CONFIG_NFS_FS=y
109165
CONFIG_ROOT_NFS=y
110166
CONFIG_NLS_CODEPAGE_437=m
111167
CONFIG_NLS_ISO8859_1=m
112-
# CONFIG_CRYPTO_ECHAINIV is not set
113168
# 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
114176
CONFIG_DYNAMIC_DEBUG=y
115-
CONFIG_DEBUG_FS=y
177+
# CONFIG_DEBUG_MISC is not set
116178
CONFIG_MAGIC_SYSRQ=y
117-
# CONFIG_SCHED_DEBUG is not set
118-
# CONFIG_DEBUG_PREEMPT is not set
119179
# CONFIG_FTRACE is not set
120180
# CONFIG_EARLY_PRINTK is not set

arch/mips/configs/loongson1c_defconfig

Lines changed: 0 additions & 121 deletions
This file was deleted.

0 commit comments

Comments
 (0)