Commit ad79935d authored by Keguang Zhang's avatar Keguang Zhang Committed by Thomas Bogendoerfer
Browse files

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: default avatarKeguang Zhang <keguang.zhang@gmail.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 2d18f234

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -17017,6 +17017,7 @@ L: linux-mips@vger.kernel.org 
S:	Maintained

F:	Documentation/devicetree/bindings/*/loongson,ls1*.yaml

F:	arch/mips/boot/dts/loongson/loongson1*

F:	arch/mips/configs/loongson1_defconfig

F:	arch/mips/loongson32/

F:	drivers/*/*loongson1*

F:	drivers/mtd/nand/raw/loongson1-nand-controller.c

arch/mips/configs/loongson1b_defconfig→arch/mips/configs/loongson1_defconfig

+77 −17
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_KERNEL_XZ=y

CONFIG_SYSVIPC=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y
@@ -12,15 +11,16 @@ CONFIG_NAMESPACES=y 
CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_EXPERT=y

CONFIG_PERF_EVENTS=y

# CONFIG_COMPAT_BRK is not set

CONFIG_MACH_LOONGSON32=y

# CONFIG_SECCOMP is not set

# CONFIG_SUSPEND is not set

# CONFIG_SECCOMP is not set

# CONFIG_GCC_PLUGINS is not set

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -31,6 +31,7 @@ CONFIG_SYN_COOKIES=y 
# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

# CONFIG_ETHTOOL_NETLINK is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set
@@ -38,32 +39,75 @@ CONFIG_MTD=y 
CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_RAW_NAND=y

CONFIG_MTD_NAND_LOONGSON1=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_SCSI=m

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=m

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_ALACRITECH is not set

# CONFIG_NET_VENDOR_AMAZON is not set

# CONFIG_NET_VENDOR_AQUANTIA is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_ASIX is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CADENCE is not set

# CONFIG_NET_VENDOR_CAVIUM is not set

# CONFIG_NET_VENDOR_CORTINA is not set

# CONFIG_NET_VENDOR_DAVICOM is not set

# CONFIG_NET_VENDOR_ENGLEDER is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_FUNGIBLE is not set

# CONFIG_NET_VENDOR_GOOGLE is not set

# CONFIG_NET_VENDOR_HISILICON is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_LITEX is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_META is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICROCHIP is not set

# CONFIG_NET_VENDOR_MICROSEMI is not set

# CONFIG_NET_VENDOR_MICROSOFT is not set

# CONFIG_NET_VENDOR_NI is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_PENSANDO is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SOLARFLARE is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_SOCIONEXT is not set

CONFIG_STMMAC_ETH=y

# CONFIG_DWMAC_GENERIC is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_NET_VENDOR_VERTEXCOM is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WANGXUN is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_NET_VENDOR_XILINX is not set

CONFIG_DAVICOM_PHY=y

CONFIG_REALTEK_PHY=y

# CONFIG_USB_NET_DRIVERS is not set

# CONFIG_WLAN is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_VT_CONSOLE is not set

CONFIG_VT_HW_CONSOLE_BINDING=y

CONFIG_LEGACY_PTY_COUNT=8

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_HW_RANDOM is not set

# CONFIG_PTP_1588_CLOCK is not set

CONFIG_GPIOLIB=y

CONFIG_GPIO_LOONGSON1=y

# CONFIG_HWMON is not set
@@ -71,7 +115,15 @@ CONFIG_WATCHDOG=y 
CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_WATCHDOG_SYSFS=y

CONFIG_LOONGSON1_WDT=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_SOUND=y

CONFIG_SND=y

# CONFIG_SND_SUPPORT_OLD_API is not set

# CONFIG_SND_DRIVERS is not set

# CONFIG_SND_MIPS is not set

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=y

CONFIG_SND_LOONGSON1_AC97=y

CONFIG_SND_SIMPLE_CARD=y

CONFIG_HID_GENERIC=m

CONFIG_USB_HID=m

CONFIG_USB=y
@@ -86,17 +138,20 @@ CONFIG_NEW_LEDS=y 
CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_MTD=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_LOONGSON1=y

# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_LOONGSON=y

CONFIG_DMADEVICES=y

CONFIG_LOONGSON1_APB_DMA=y

# CONFIG_VIRTIO_MENU is not set

# CONFIG_VHOST_MENU is not set

# CONFIG_MIPS_PLATFORM_DEVICES is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT3_FS=y

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

# CONFIG_NVMEM is not set

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

# CONFIG_DNOTIFY is not set

CONFIG_VFAT_FS=y

CONFIG_PROC_KCORE=y
@@ -105,16 +160,21 @@ CONFIG_TMPFS_POSIX_ACL=y 
CONFIG_UBIFS_FS=y

CONFIG_UBIFS_FS_ADVANCED_COMPR=y

CONFIG_UBIFS_ATIME_SUPPORT=y

# CONFIG_UBIFS_FS_SECURITY is not set

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=m

CONFIG_NLS_ISO8859_1=m

# CONFIG_CRYPTO_ECHAINIV is not set

# CONFIG_CRYPTO_HW is not set

# CONFIG_XZ_DEC_X86 is not set

# CONFIG_XZ_DEC_POWERPC is not set

# CONFIG_XZ_DEC_ARM is not set

# CONFIG_XZ_DEC_ARMTHUMB is not set

# CONFIG_XZ_DEC_ARM64 is not set

# CONFIG_XZ_DEC_SPARC is not set

# CONFIG_XZ_DEC_RISCV is not set

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_FS=y

# CONFIG_DEBUG_MISC is not set

CONFIG_MAGIC_SYSRQ=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_PREEMPT is not set

# CONFIG_FTRACE is not set

# CONFIG_EARLY_PRINTK is not set

arch/mips/configs/loongson1c_defconfig

deleted100644 → 0
+0 −121
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_KERNEL_XZ=y

CONFIG_SYSVIPC=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_NAMESPACES=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_EXPERT=y

CONFIG_PERF_EVENTS=y

# CONFIG_COMPAT_BRK is not set

CONFIG_MACH_LOONGSON32=y

CONFIG_LOONGSON1_LS1C=y

# CONFIG_SECCOMP is not set

# CONFIG_SUSPEND is not set

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_SYN_COOKIES=y

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_RAW_NAND=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_SCSI=m

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=m

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

CONFIG_STMMAC_ETH=y

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_WLAN is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_VT_HW_CONSOLE_BINDING=y

CONFIG_LEGACY_PTY_COUNT=8

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_GPIOLIB=y

CONFIG_GPIO_LOONGSON1=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_WATCHDOG_SYSFS=y

CONFIG_LOONGSON1_WDT=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_HID_GENERIC=m

CONFIG_USB_HID=m

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_EHCI_HCD=y

# CONFIG_USB_EHCI_TT_NEWSCHED is not set

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_STORAGE=m

CONFIG_USB_SERIAL=m

CONFIG_USB_SERIAL_PL2303=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_LOONGSON1=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT3_FS=y

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

# CONFIG_DNOTIFY is not set

CONFIG_VFAT_FS=y

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_UBIFS_FS=y

CONFIG_UBIFS_FS_ADVANCED_COMPR=y

CONFIG_UBIFS_ATIME_SUPPORT=y

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=m

CONFIG_NLS_ISO8859_1=m

# CONFIG_CRYPTO_ECHAINIV is not set

# CONFIG_CRYPTO_HW is not set

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_FS=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_PREEMPT is not set

# CONFIG_FTRACE is not set

# CONFIG_EARLY_PRINTK is not set