From nobody Wed Dec 31 01:30:54 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AB13C4167B for ; Fri, 10 Nov 2023 01:39:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345708AbjKJBjj (ORCPT ); Thu, 9 Nov 2023 20:39:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345654AbjKJBje (ORCPT ); Thu, 9 Nov 2023 20:39:34 -0500 Received: from rcdn-iport-7.cisco.com (rcdn-iport-7.cisco.com [173.37.86.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0F3844BC; Thu, 9 Nov 2023 17:39:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=37012; q=dns/txt; s=iport; t=1699580371; x=1700789971; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vJBa01mKyZaFU95wqbINxHeiLhIt/IfgiGWPZq5C14s=; b=P/tG3jiVE4G6FNGqXZ7C0e+f0G0u9slTGbdSkJx5DbTd448gc6OhMUkt adWcr/DT/65IrZgb3M15XoM9xLp16W16ho/AwK4JQBh/nHWA/GtASYMJn wxmm7JjwS6om0vY/Sydyd2ENgWRVteHs+la61NlKrN1klhJ2cMnb8LyrY g=; X-CSE-ConnectionGUID: rcrZ8nhaTFCvv7RVNa6Ynw== X-CSE-MsgGUID: wLhxpbV3R5C6+zcUb+RAUQ== X-IronPort-AV: E=Sophos;i="6.03,291,1694736000"; d="scan'208";a="134585027" Received: from rcdn-core-4.cisco.com ([173.37.93.155]) by rcdn-iport-7.cisco.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2023 01:38:28 +0000 Received: from goliath.lan ([10.25.128.169]) by rcdn-core-4.cisco.com (8.15.2/8.15.2) with ESMTP id 3AA1cHVK011466; Fri, 10 Nov 2023 01:38:27 GMT From: Daniel Walker To: Will Deacon , Christophe Leroy , Rob Herring , Daniel Gimpelevich , Andrew Morton , Pratyush Brahma , Tomas Mudrunka , Sean Anderson , x86@kernel.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Thomas Bogendoerfer Cc: xe-linux-external@cisco.com, Ruslan Ruslichenko , Ruslan Bilovol , linux-kernel@vger.kernel.org Subject: [PATCH 4/8] CMDLINE: mips: convert to generic builtin command line Date: Thu, 9 Nov 2023 17:38:08 -0800 Message-Id: <20231110013817.2378507-5-danielwa@cisco.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231110013817.2378507-1-danielwa@cisco.com> References: <20231110013817.2378507-1-danielwa@cisco.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Auto-Response-Suppress: DR, OOF, AutoReply X-Outbound-SMTP-Client: 10.25.128.169, [10.25.128.169] X-Outbound-Node: rcdn-core-4.cisco.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This updates the mips code to use the CONFIG_GENERIC_CMDLINE option. This deletes the option for MIPS_CMDLINE_BUILTIN_EXTEND and replaces the functionality with generic code. Of note, the pic32 has some strange handling of the current built in command line. It was converted to use the static variant which can't be updated after compilation. It should eventually be updated to use to append and prepend symbols. This includes a scripted mass convert of the config files to use the new generic cmdline. There is a bit of a trim effect here. It would seems that some of the config haven't been trimmed in a while. The script used is as follows, if [[ -z "$1" || -z "$2" ]]; then echo "Two arguments are needed." exit 1 fi mkdir $1 cp $2 $1/.config sed -i 's/CONFIG_CMDLINE=3D/CONFIG_CMDLINE_BOOL=3Dy\nCONFIG_CMDLINE_PREPEND= =3D/g' $1/.config make ARCH=3D$1 O=3D$1 olddefconfig make ARCH=3D$1 O=3D$1 savedefconfig cp $1/defconfig $2 rm -Rf $1 Cc: xe-linux-external@cisco.com Signed-off-by: Ruslan Ruslichenko Signed-off-by: Ruslan Bilovol Signed-off-by: Daniel Walker --- arch/mips/Kconfig | 4 +- arch/mips/Kconfig.debug | 44 ------- arch/mips/configs/ar7_defconfig | 12 +- arch/mips/configs/bcm47xx_defconfig | 10 +- arch/mips/configs/bcm63xx_defconfig | 21 ++-- arch/mips/configs/bmips_be_defconfig | 17 ++- arch/mips/configs/bmips_stb_defconfig | 139 ++++++++-------------- arch/mips/configs/ci20_defconfig | 8 +- arch/mips/configs/cu1000-neo_defconfig | 19 ++- arch/mips/configs/cu1830-neo_defconfig | 19 ++- arch/mips/configs/generic_defconfig | 15 +-- arch/mips/configs/gpr_defconfig | 33 ++--- arch/mips/configs/loongson3_defconfig | 29 ++--- arch/mips/include/asm/setup.h | 2 + arch/mips/kernel/relocate.c | 17 ++- arch/mips/kernel/setup.c | 36 +----- arch/mips/pic32/pic32mzda/early_console.c | 2 +- arch/mips/pic32/pic32mzda/init.c | 3 +- 18 files changed, 144 insertions(+), 286 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index bc8421859006..65fd3decc6b1 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -31,6 +31,7 @@ config MIPS select CPU_NO_EFFICIENT_FFS if (TARGET_ISA_REV < 1) select CPU_PM if CPU_IDLE select GENERIC_ATOMIC64 if !64BIT + select GENERIC_CMDLINE select GENERIC_CMOS_UPDATE select GENERIC_CPU_AUTOPROBE select GENERIC_GETTIMEOFDAY @@ -2989,9 +2990,6 @@ choice config MIPS_CMDLINE_FROM_BOOTLOADER bool "Bootloader kernel arguments if available" =20 - config MIPS_CMDLINE_BUILTIN_EXTEND - depends on CMDLINE_BOOL - bool "Extend builtin kernel arguments with bootloader arguments" endchoice =20 endmenu diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug index f4ae7900fcd3..f9da53d4ebd2 100644 --- a/arch/mips/Kconfig.debug +++ b/arch/mips/Kconfig.debug @@ -26,50 +26,6 @@ config EARLY_PRINTK_8250 config USE_GENERIC_EARLY_PRINTK_8250 bool =20 -config CMDLINE_BOOL - bool "Built-in kernel command line" - help - For most systems, it is firmware or second stage bootloader that - by default specifies the kernel command line options. However, - it might be necessary or advantageous to either override the - default kernel command line or add a few extra options to it. - For such cases, this option allows you to hardcode your own - command line options directly into the kernel. For that, you - should choose 'Y' here, and fill in the extra boot arguments - in CONFIG_CMDLINE. - - The built-in options will be concatenated to the default command - line if CMDLINE_OVERRIDE is set to 'N'. Otherwise, the default - command line will be ignored and replaced by the built-in string. - - Most MIPS systems will normally expect 'N' here and rely upon - the command line from the firmware or the second-stage bootloader. - -config CMDLINE - string "Default kernel command string" - depends on CMDLINE_BOOL - help - On some platforms, there is currently no way for the boot loader to - pass arguments to the kernel. For these platforms, and for the cases - when you want to add some extra options to the command line or ignore - the default command line, you can supply some command-line options at - build time by entering them here. In other cases you can specify - kernel args so that you don't have to set them up in board prom - initialization routines. - - For more information, see the CMDLINE_BOOL and CMDLINE_OVERRIDE - options. - -config CMDLINE_OVERRIDE - bool "Built-in command line overrides firmware arguments" - depends on CMDLINE_BOOL - help - By setting this option to 'Y' you will have your kernel ignore - command line arguments from firmware or second stage bootloader. - Instead, the built-in command line will be used exclusively. - - Normally, you will choose 'N' here. - config SB1XXX_CORELIS bool "Corelis Debugger" depends on SIBYTE_SB1xxx_SOC diff --git a/arch/mips/configs/ar7_defconfig b/arch/mips/configs/ar7_defcon= fig index 329c60aa570a..0dff0795705e 100644 --- a/arch/mips/configs/ar7_defconfig +++ b/arch/mips/configs/ar7_defconfig @@ -9,17 +9,18 @@ CONFIG_BLK_DEV_INITRD=3Dy CONFIG_EXPERT=3Dy # CONFIG_ELF_CORE is not set # CONFIG_KALLSYMS is not set -# CONFIG_VM_EVENT_COUNTERS is not set -# CONFIG_COMPAT_BRK is not set +CONFIG_KEXEC=3Dy +CONFIG_CMDLINE_BOOL=3Dy +CONFIG_CMDLINE_PREPEND=3D"rootfstype=3Dsquashfs,jffs2" CONFIG_AR7=3Dy CONFIG_HZ_100=3Dy -CONFIG_KEXEC=3Dy # CONFIG_SECCOMP is not set CONFIG_MODULES=3Dy CONFIG_MODULE_UNLOAD=3Dy -# CONFIG_BLK_DEV_BSG is not set CONFIG_PARTITION_ADVANCED=3Dy CONFIG_BSD_DISKLABEL=3Dy +# CONFIG_COMPAT_BRK is not set +# CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=3Dy CONFIG_PACKET=3Dy CONFIG_UNIX=3Dy @@ -39,7 +40,6 @@ CONFIG_TCP_CONG_WESTWOOD=3Dy # CONFIG_TCP_CONG_HTCP is not set # CONFIG_IPV6 is not set CONFIG_NETFILTER=3Dy -# CONFIG_BRIDGE_NETFILTER is not set CONFIG_NF_CONNTRACK=3Dm CONFIG_NF_CONNTRACK_MARK=3Dy CONFIG_NF_CONNTRACK_FTP=3Dm @@ -115,5 +115,3 @@ CONFIG_SQUASHFS=3Dy # CONFIG_CRYPTO_HW is not set CONFIG_STRIP_ASM_SYMS=3Dy CONFIG_DEBUG_FS=3Dy -CONFIG_CMDLINE_BOOL=3Dy -CONFIG_CMDLINE=3D"rootfstype=3Dsquashfs,jffs2" diff --git a/arch/mips/configs/bcm47xx_defconfig b/arch/mips/configs/bcm47x= x_defconfig index 6a68a96d13f8..26e2134f83af 100644 --- a/arch/mips/configs/bcm47xx_defconfig +++ b/arch/mips/configs/bcm47xx_defconfig @@ -3,8 +3,9 @@ CONFIG_HIGH_RES_TIMERS=3Dy CONFIG_BLK_DEV_INITRD=3Dy CONFIG_CC_OPTIMIZE_FOR_SIZE=3Dy CONFIG_EXPERT=3Dy +CONFIG_CMDLINE_BOOL=3Dy +CONFIG_CMDLINE_PREPEND=3D"console=3DttyS0,115200" CONFIG_BCM47XX=3Dy -CONFIG_PCI=3Dy # CONFIG_SUSPEND is not set CONFIG_MODULES=3Dy CONFIG_MODULE_UNLOAD=3Dy @@ -31,6 +32,7 @@ CONFIG_NET_SCH_FQ_CODEL=3Dy CONFIG_HAMRADIO=3Dy CONFIG_CFG80211=3Dy CONFIG_MAC80211=3Dy +CONFIG_PCI=3Dy CONFIG_MTD=3Dy CONFIG_MTD_BCM47XX_PARTS=3Dy CONFIG_MTD_BLOCK=3Dy @@ -67,14 +69,10 @@ CONFIG_BCMA_DRIVER_GMAC_CMN=3Dy CONFIG_USB=3Dy CONFIG_USB_HCD_BCMA=3Dy CONFIG_USB_HCD_SSB=3Dy -CONFIG_LEDS_TRIGGER_TIMER=3Dy -CONFIG_LEDS_TRIGGER_DEFAULT_ON=3Dy CONFIG_CRC32_SARWATE=3Dy CONFIG_PRINTK_TIME=3Dy CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=3Dy CONFIG_DEBUG_INFO_REDUCED=3Dy CONFIG_STRIP_ASM_SYMS=3Dy -CONFIG_DEBUG_FS=3Dy CONFIG_MAGIC_SYSRQ=3Dy -CONFIG_CMDLINE_BOOL=3Dy -CONFIG_CMDLINE=3D"console=3DttyS0,115200" +CONFIG_DEBUG_FS=3Dy diff --git a/arch/mips/configs/bcm63xx_defconfig b/arch/mips/configs/bcm63x= x_defconfig index 34d0ca638ef0..0a73fd34063f 100644 --- a/arch/mips/configs/bcm63xx_defconfig +++ b/arch/mips/configs/bcm63xx_defconfig @@ -1,5 +1,4 @@ # CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set CONFIG_NO_HZ=3Dy CONFIG_EXPERT=3Dy # CONFIG_FUTEX is not set @@ -9,18 +8,16 @@ CONFIG_EXPERT=3Dy # CONFIG_EVENTFD is not set # CONFIG_SHMEM is not set # CONFIG_AIO is not set -# CONFIG_VM_EVENT_COUNTERS is not set -# CONFIG_SLUB_DEBUG is not set +CONFIG_CMDLINE_BOOL=3Dy +CONFIG_CMDLINE_PREPEND=3D"console=3DttyS0,115200" CONFIG_BCM63XX=3Dy CONFIG_BCM63XX_CPU_6338=3Dy CONFIG_BCM63XX_CPU_6345=3Dy CONFIG_BCM63XX_CPU_6348=3Dy CONFIG_BCM63XX_CPU_6358=3Dy # CONFIG_SECCOMP is not set -CONFIG_PCI=3Dy -CONFIG_PCCARD=3Dy -CONFIG_PCMCIA_BCM63XX=3Dy -# CONFIG_BLK_DEV_BSG is not set +# CONFIG_SWAP is not set +# CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=3Dy CONFIG_UNIX=3Dy CONFIG_INET=3Dy @@ -29,6 +26,10 @@ CONFIG_INET=3Dy CONFIG_CFG80211=3Dy CONFIG_NL80211_TESTMODE=3Dy CONFIG_MAC80211=3Dy +CONFIG_PCI=3Dy +# CONFIG_VGA_ARB is not set +CONFIG_PCCARD=3Dy +CONFIG_PCMCIA_BCM63XX=3Dy # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_MTD=3Dy @@ -47,11 +48,8 @@ CONFIG_B43=3Dy # CONFIG_SERIO is not set # CONFIG_VT is not set # CONFIG_UNIX98_PTYS is not set -CONFIG_SERIAL_BCM63XX=3Dy -CONFIG_SERIAL_BCM63XX_CONSOLE=3Dy # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set -# CONFIG_VGA_ARB is not set CONFIG_USB=3Dy CONFIG_USB_EHCI_HCD=3Dy # CONFIG_USB_EHCI_TT_NEWSCHED is not set @@ -62,5 +60,4 @@ CONFIG_PROC_KCORE=3Dy # CONFIG_NETWORK_FILESYSTEMS is not set # CONFIG_CRYPTO_HW is not set CONFIG_MAGIC_SYSRQ=3Dy -CONFIG_CMDLINE_BOOL=3Dy -CONFIG_CMDLINE=3D"console=3DttyS0,115200" +# CONFIG_SLUB_DEBUG is not set diff --git a/arch/mips/configs/bmips_be_defconfig b/arch/mips/configs/bmips= _be_defconfig index daef132d000b..0b2b7685330f 100644 --- a/arch/mips/configs/bmips_be_defconfig +++ b/arch/mips/configs/bmips_be_defconfig @@ -1,17 +1,17 @@ # CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set CONFIG_NO_HZ=3Dy CONFIG_BLK_DEV_INITRD=3Dy CONFIG_EXPERT=3Dy -# CONFIG_VM_EVENT_COUNTERS is not set -# CONFIG_SLUB_DEBUG is not set +CONFIG_CMDLINE_BOOL=3Dy +CONFIG_CMDLINE_PREPEND=3D"earlycon" CONFIG_BMIPS_GENERIC=3Dy CONFIG_HIGHMEM=3Dy CONFIG_SMP=3Dy CONFIG_NR_CPUS=3D4 -# CONFIG_SECCOMP is not set CONFIG_MIPS_O32_FP64_SUPPORT=3Dy -# CONFIG_BLK_DEV_BSG is not set +# CONFIG_SECCOMP is not set +# CONFIG_SWAP is not set +# CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=3Dy CONFIG_PACKET=3Dy CONFIG_PACKET_DIAG=3Dy @@ -34,6 +34,7 @@ CONFIG_MTD_PHYSMAP=3Dy # CONFIG_BLK_DEV is not set CONFIG_SCSI=3Dy CONFIG_BLK_DEV_SD=3Dy +# CONFIG_BLK_DEV_BSG is not set # CONFIG_SCSI_LOWLEVEL is not set CONFIG_NETDEVICES=3Dy CONFIG_BCMGENET=3Dy @@ -41,7 +42,6 @@ CONFIG_USB_USBNET=3Dy # CONFIG_INPUT is not set # CONFIG_SERIO is not set # CONFIG_VT is not set -CONFIG_SERIAL_BCM63XX=3Dy CONFIG_SERIAL_BCM63XX_CONSOLE=3Dy # CONFIG_HW_RANDOM is not set CONFIG_POWER_RESET=3Dy @@ -70,7 +70,6 @@ CONFIG_NLS_ASCII=3Dy CONFIG_NLS_ISO8859_1=3Dy # CONFIG_CRYPTO_HW is not set CONFIG_PRINTK_TIME=3Dy -CONFIG_DEBUG_FS=3Dy CONFIG_MAGIC_SYSRQ=3Dy -CONFIG_CMDLINE_BOOL=3Dy -CONFIG_CMDLINE=3D"earlycon" +CONFIG_DEBUG_FS=3Dy +# CONFIG_SLUB_DEBUG is not set diff --git a/arch/mips/configs/bmips_stb_defconfig b/arch/mips/configs/bmip= s_stb_defconfig index cd0dc37c3d84..4f96a1da7610 100644 --- a/arch/mips/configs/bmips_stb_defconfig +++ b/arch/mips/configs/bmips_stb_defconfig @@ -1,59 +1,44 @@ # CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set +CONFIG_SYSVIPC=3Dy CONFIG_NO_HZ=3Dy -CONFIG_HZ=3D1000 +CONFIG_HIGH_RES_TIMERS=3Dy +CONFIG_CGROUPS=3Dy CONFIG_BLK_DEV_INITRD=3Dy +# CONFIG_RD_GZIP is not set +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_LZO is not set +# CONFIG_RD_LZ4 is not set CONFIG_EXPERT=3Dy -# CONFIG_VM_EVENT_COUNTERS is not set -# CONFIG_SLUB_DEBUG is not set +CONFIG_CMDLINE_BOOL=3Dy +CONFIG_CMDLINE_PREPEND=3D"earlycon" CONFIG_BMIPS_GENERIC=3Dy CONFIG_CPU_LITTLE_ENDIAN=3Dy CONFIG_HIGHMEM=3Dy -CONFIG_HIGH_RES_TIMERS=3Dy CONFIG_SMP=3Dy CONFIG_NR_CPUS=3D4 -# CONFIG_SECCOMP is not set CONFIG_MIPS_O32_FP64_SUPPORT=3Dy -# CONFIG_RD_GZIP is not set -# CONFIG_RD_BZIP2 is not set -# CONFIG_RD_LZMA is not set -CONFIG_RD_XZ=3Dy -# CONFIG_RD_LZO is not set -# CONFIG_RD_LZ4 is not set -CONFIG_PCI=3Dy -CONFIG_PCI_MSI=3Dy -CONFIG_PCIEASPM_POWERSAVE=3Dy -CONFIG_PCIEPORTBUS=3Dy -CONFIG_PCIE_BRCMSTB=3Dy +CONFIG_MIPS_CMDLINE_DTB_EXTEND=3Dy +CONFIG_PM_DEBUG=3Dy CONFIG_CPU_FREQ=3Dy CONFIG_CPU_FREQ_STAT=3Dy -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=3Dy -CONFIG_CPU_FREQ_GOV_PERFORMANCE=3Dy CONFIG_CPU_FREQ_GOV_POWERSAVE=3Dy CONFIG_CPU_FREQ_GOV_USERSPACE=3Dy CONFIG_CPU_FREQ_GOV_ONDEMAND=3Dy CONFIG_CPU_FREQ_GOV_CONSERVATIVE=3Dy CONFIG_BMIPS_CPUFREQ=3Dy -# CONFIG_BLK_DEV_BSG is not set +# CONFIG_SECCOMP is not set +CONFIG_MODULES=3Dy +CONFIG_MODULE_FORCE_LOAD=3Dy +CONFIG_MODULE_UNLOAD=3Dy +CONFIG_MODVERSIONS=3Dy +# CONFIG_SWAP is not set +# CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=3Dy CONFIG_PACKET=3Dy CONFIG_PACKET_DIAG=3Dy CONFIG_UNIX=3Dy CONFIG_INET=3Dy -# CONFIG_INET_DIAG is not set -CONFIG_CFG80211=3Dy -CONFIG_NL80211_TESTMODE=3Dy -CONFIG_WIRELESS=3Dy -CONFIG_MAC80211=3Dy -CONFIG_DEVTMPFS=3Dy -CONFIG_DEVTMPFS_MOUNT=3Dy -# CONFIG_STANDALONE is not set -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_BRCMSTB_GISB_ARB=3Dy -CONFIG_MODULES=3Dy -CONFIG_MODULE_FORCE_LOAD=3Dy -CONFIG_MODULE_UNLOAD=3Dy -CONFIG_MODVERSIONS=3Dy CONFIG_IP_MULTICAST=3Dy CONFIG_IP_PNP=3Dy CONFIG_IP_PNP_DHCP=3Dy @@ -62,25 +47,32 @@ CONFIG_IP_PNP_RARP=3Dy CONFIG_IP_MROUTE=3Dy CONFIG_IP_PIMSM_V1=3Dy CONFIG_IP_PIMSM_V2=3Dy -CONFIG_INET_UDP_DIAG=3Dy +# CONFIG_INET_DIAG is not set CONFIG_TCP_CONG_ADVANCED=3Dy CONFIG_TCP_CONG_BIC=3Dy # CONFIG_TCP_CONG_WESTWOOD is not set # CONFIG_TCP_CONG_HTCP is not set # CONFIG_IPV6 is not set -CONFIG_IP_NF_IPTABLES=3Dy -CONFIG_IP_NF_FILTER=3Dy CONFIG_NETFILTER=3Dy -CONFIG_NETFILTER_XTABLES=3Dy -CONFIG_BRIDGE=3Dy CONFIG_BRIDGE_NETFILTER=3Dm +CONFIG_IP_NF_IPTABLES=3Dy +CONFIG_IP_NF_FILTER=3Dy CONFIG_BRIDGE_NF_EBTABLES=3Dm CONFIG_BRIDGE_EBT_BROUTE=3Dm +CONFIG_BRIDGE=3Dy CONFIG_NET_DSA=3Dy -CONFIG_NET_SWITCHDEV=3Dy -CONFIG_DMA_CMA=3Dy -CONFIG_CMA_ALIGNMENT=3D12 -CONFIG_SPI=3Dy +CONFIG_VLAN_8021Q=3Dy +CONFIG_CFG80211=3Dy +CONFIG_NL80211_TESTMODE=3Dy +CONFIG_MAC80211=3Dy +CONFIG_PCI=3Dy +CONFIG_PCIEPORTBUS=3Dy +CONFIG_PCIEASPM_POWERSAVE=3Dy +CONFIG_PCI_MSI=3Dy +CONFIG_DEVTMPFS=3Dy +CONFIG_DEVTMPFS_MOUNT=3Dy +# CONFIG_STANDALONE is not set +# CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_MTD=3Dy CONFIG_MTD_CMDLINE_PARTS=3Dy CONFIG_MTD_BLOCK=3Dy @@ -91,22 +83,21 @@ CONFIG_MTD_CFI_AMDSTD=3Dy CONFIG_MTD_CFI_STAA=3Dy CONFIG_MTD_ROM=3Dy CONFIG_MTD_ABSENT=3Dy -CONFIG_MTD_PHYSMAP_OF=3Dy +CONFIG_MTD_RAW_NAND=3Dy CONFIG_MTD_NAND_BRCMNAND=3Dy CONFIG_MTD_SPI_NOR=3Dy # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set CONFIG_MTD_UBI=3Dy CONFIG_MTD_UBI_GLUEBI=3Dy -CONFIG_BLK_DEV_LOOP=3Dy -CONFIG_BLK_DEV_RAM=3Dy -CONFIG_BLK_DEV_RAM_SIZE=3D8192 # CONFIG_BLK_DEV is not set -CONFIG_SCSI=3Dy CONFIG_BLK_DEV_SD=3Dy CONFIG_CHR_DEV_SG=3Dy +# CONFIG_BLK_DEV_BSG is not set # CONFIG_SCSI_LOWLEVEL is not set +CONFIG_ATA=3Dy +CONFIG_SATA_AHCI_PLATFORM=3Dy +CONFIG_AHCI_BRCM=3Dy CONFIG_NETDEVICES=3Dy -CONFIG_VLAN_8021Q=3Dy CONFIG_MACVLAN=3Dy CONFIG_BCMGENET=3Dy CONFIG_USB_USBNET=3Dy @@ -116,15 +107,16 @@ CONFIG_INPUT_EVDEV=3Dy CONFIG_INPUT_MISC=3Dy CONFIG_INPUT_UINPUT=3Dy # CONFIG_SERIO is not set -CONFIG_VT=3Dy CONFIG_VT_HW_CONSOLE_BINDING=3Dy CONFIG_SERIAL_8250=3Dy # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_CONSOLE=3Dy CONFIG_SERIAL_OF_PLATFORM=3Dy # CONFIG_HW_RANDOM is not set +CONFIG_SPI=3Dy +CONFIG_GPIOLIB=3Dy +CONFIG_GPIO_SYSFS=3Dy CONFIG_POWER_RESET=3Dy -CONFIG_POWER_RESET_BRCMSTB=3Dy CONFIG_POWER_RESET_SYSCON=3Dy CONFIG_POWER_SUPPLY=3Dy # CONFIG_HWMON is not set @@ -135,21 +127,18 @@ CONFIG_USB_EHCI_HCD_PLATFORM=3Dy CONFIG_USB_OHCI_HCD=3Dy CONFIG_USB_OHCI_HCD_PLATFORM=3Dy CONFIG_USB_STORAGE=3Dy -CONFIG_SOC_BRCMSTB=3Dy CONFIG_MMC=3Dy CONFIG_MMC_BLOCK_MINORS=3D16 CONFIG_MMC_SDHCI=3Dy CONFIG_MMC_SDHCI_PLTFM=3Dy +CONFIG_SOC_BRCMSTB=3Dy +CONFIG_PHY_BRCM_SATA=3Dy CONFIG_EXT4_FS=3Dy CONFIG_EXT4_FS_POSIX_ACL=3Dy CONFIG_EXT4_FS_SECURITY=3Dy -# CONFIG_DNOTIFY is not set -CONFIG_PROC_KCORE=3Dy -CONFIG_CIFS=3Dy CONFIG_JBD2_DEBUG=3Dy +# CONFIG_DNOTIFY is not set CONFIG_FUSE_FS=3Dy -CONFIG_FHANDLE=3Dy -CONFIG_CGROUPS=3Dy CONFIG_CUSE=3Dy CONFIG_ISO9660_FS=3Dy CONFIG_JOLIET=3Dy @@ -157,6 +146,7 @@ CONFIG_ZISOFS=3Dy CONFIG_UDF_FS=3Dy CONFIG_MSDOS_FS=3Dy CONFIG_VFAT_FS=3Dy +CONFIG_PROC_KCORE=3Dy CONFIG_TMPFS=3Dy CONFIG_JFFS2_FS=3Dy CONFIG_UBIFS_FS=3Dy @@ -169,42 +159,17 @@ CONFIG_NFS_V4=3Dy CONFIG_NFS_V4_1=3Dy CONFIG_NFS_V4_2=3Dy CONFIG_ROOT_NFS=3Dy +CONFIG_CIFS=3Dy CONFIG_NLS_CODEPAGE_437=3Dy CONFIG_NLS_ISO8859_1=3Dy +# CONFIG_CRYPTO_HW is not set CONFIG_PRINTK_TIME=3Dy CONFIG_DYNAMIC_DEBUG=3Dy -# CONFIG_DEBUG_INFO is not set -# CONFIG_DEBUG_INFO_REDUCED is not set -CONFIG_DEBUG_FS=3Dy CONFIG_MAGIC_SYSRQ=3Dy -CONFIG_LOCKUP_DETECTOR=3Dy -CONFIG_DEBUG_USER=3Dy -CONFIG_CMDLINE_BOOL=3Dy -CONFIG_CMDLINE=3D"earlycon" -# CONFIG_MIPS_CMDLINE_FROM_DTB is not set -CONFIG_MIPS_CMDLINE_DTB_EXTEND=3Dy -# CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER is not set -# CONFIG_CRYPTO_HW is not set -CONFIG_FW_CFE=3Dy -CONFIG_ATA=3Dy -CONFIG_SATA_AHCI_PLATFORM=3Dy -CONFIG_GENERIC_PHY=3Dy -CONFIG_GPIOLIB=3Dy -CONFIG_GPIO_SYSFS=3Dy -CONFIG_PHY_BRCM_USB=3Dy -CONFIG_PHY_BRCM_SATA=3Dy -CONFIG_PM_DEBUG=3Dy -CONFIG_SYSVIPC=3Dy -CONFIG_FUNCTION_GRAPH_TRACER=3Dy -CONFIG_DYNAMIC_FTRACE=3Dy -CONFIG_FUNCTION_TRACER=3Dy +# CONFIG_SLUB_DEBUG is not set CONFIG_FUNCTION_PROFILER=3Dy +CONFIG_STACK_TRACER=3Dy CONFIG_IRQSOFF_TRACER=3Dy CONFIG_SCHED_TRACER=3Dy -CONFIG_BLK_DEV_IO_TRACE=3Dy CONFIG_FTRACE_SYSCALLS=3Dy -CONFIG_TRACER_SNAPSHOT=3Dy -CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=3Dy -CONFIG_STACK_TRACER=3Dy -CONFIG_AHCI_BRCM=3Dy -CONFIG_MTD_RAW_NAND=3Dy +CONFIG_BLK_DEV_IO_TRACE=3Dy diff --git a/arch/mips/configs/ci20_defconfig b/arch/mips/configs/ci20_defc= onfig index cdf2a782dee1..87d34b903f04 100644 --- a/arch/mips/configs/ci20_defconfig +++ b/arch/mips/configs/ci20_defconfig @@ -17,8 +17,10 @@ CONFIG_CGROUP_CPUACCT=3Dy CONFIG_NAMESPACES=3Dy CONFIG_USER_NS=3Dy CONFIG_CC_OPTIMIZE_FOR_SIZE=3Dy -CONFIG_KALLSYMS_ALL=3Dy CONFIG_EXPERT=3Dy +CONFIG_KALLSYMS_ALL=3Dy +CONFIG_CMDLINE_BOOL=3Dy +CONFIG_CMDLINE_PREPEND=3D"earlycon console=3DttyS4,115200 clk_ignore_unuse= d" CONFIG_MACH_INGENIC_SOC=3Dy CONFIG_JZ4780_CI20=3Dy CONFIG_HIGHMEM=3Dy @@ -126,7 +128,6 @@ CONFIG_DRM_INGENIC=3Dm CONFIG_DRM_INGENIC_DW_HDMI=3Dm CONFIG_FB=3Dy # CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=3Dy CONFIG_USB=3Dy CONFIG_USB_STORAGE=3Dy CONFIG_USB_DWC2=3Dy @@ -225,7 +226,4 @@ CONFIG_DEBUG_FS=3Dy CONFIG_PANIC_ON_OOPS=3Dy CONFIG_PANIC_TIMEOUT=3D10 # CONFIG_SCHED_DEBUG is not set -CONFIG_STACKTRACE=3Dy # CONFIG_FTRACE is not set -CONFIG_CMDLINE_BOOL=3Dy -CONFIG_CMDLINE=3D"earlycon console=3DttyS4,115200 clk_ignore_unused" diff --git a/arch/mips/configs/cu1000-neo_defconfig b/arch/mips/configs/cu1= 000-neo_defconfig index 19517beaf540..f5be8b992a0c 100644 --- a/arch/mips/configs/cu1000-neo_defconfig +++ b/arch/mips/configs/cu1000-neo_defconfig @@ -14,20 +14,22 @@ CONFIG_CGROUP_CPUACCT=3Dy CONFIG_NAMESPACES=3Dy CONFIG_USER_NS=3Dy CONFIG_CC_OPTIMIZE_FOR_SIZE=3Dy -CONFIG_KALLSYMS_ALL=3Dy CONFIG_EXPERT=3Dy -# CONFIG_VM_EVENT_COUNTERS is not set -# CONFIG_COMPAT_BRK is not set +CONFIG_KALLSYMS_ALL=3Dy +CONFIG_CMDLINE_BOOL=3Dy +CONFIG_CMDLINE_PREPEND=3D"earlycon clk_ignore_unused" CONFIG_MACH_INGENIC_SOC=3Dy CONFIG_X1000_CU1000_NEO=3Dy CONFIG_HIGHMEM=3Dy CONFIG_HZ_100=3Dy -# CONFIG_SECCOMP is not set # CONFIG_SUSPEND is not set +# CONFIG_SECCOMP is not set CONFIG_MODULES=3Dy # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_COMPAT_BRK is not set # CONFIG_COMPACTION is not set CONFIG_CMA=3Dy +# CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=3Dy CONFIG_PACKET=3Dy CONFIG_UNIX=3Dy @@ -66,7 +68,6 @@ CONFIG_SENSORS_ADS7828=3Dm CONFIG_WATCHDOG=3Dy CONFIG_JZ4740_WDT=3Dy # CONFIG_VGA_CONSOLE is not set -# CONFIG_HID is not set CONFIG_USB=3Dy CONFIG_USB_STORAGE=3Dy CONFIG_USB_DWC2=3Dy @@ -86,7 +87,6 @@ CONFIG_DMA_JZ4780=3Dy # CONFIG_INGENIC_TIMER is not set CONFIG_INGENIC_SYSOST=3Dy # CONFIG_IOMMU_SUPPORT is not set -CONFIG_JZ4770_PHY=3Dy CONFIG_EXT4_FS=3Dy # CONFIG_DNOTIFY is not set CONFIG_AUTOFS_FS=3Dy @@ -97,15 +97,14 @@ CONFIG_PROC_KCORE=3Dy CONFIG_TMPFS=3Dy CONFIG_CONFIGFS_FS=3Dy CONFIG_NFS_FS=3Dy -CONFIG_NLS=3Dy CONFIG_NLS_CODEPAGE_437=3Dy CONFIG_NLS_CODEPAGE_936=3Dy CONFIG_NLS_CODEPAGE_950=3Dy CONFIG_NLS_ASCII=3Dy CONFIG_NLS_ISO8859_1=3Dy CONFIG_NLS_UTF8=3Dy -CONFIG_CRYPTO_ECHAINIV=3Dy CONFIG_CRYPTO_AES=3Dy +CONFIG_CRYPTO_ECHAINIV=3Dy CONFIG_CRYPTO_DEFLATE=3Dy CONFIG_CRYPTO_LZO=3Dy CONFIG_PRINTK_TIME=3Dy @@ -119,8 +118,4 @@ CONFIG_DEBUG_FS=3Dy CONFIG_PANIC_ON_OOPS=3Dy CONFIG_PANIC_TIMEOUT=3D10 # CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_STACKTRACE=3Dy # CONFIG_FTRACE is not set -CONFIG_CMDLINE_BOOL=3Dy -CONFIG_CMDLINE=3D"earlycon clk_ignore_unused" diff --git a/arch/mips/configs/cu1830-neo_defconfig b/arch/mips/configs/cu1= 830-neo_defconfig index b403e67ab105..b02d32f19604 100644 --- a/arch/mips/configs/cu1830-neo_defconfig +++ b/arch/mips/configs/cu1830-neo_defconfig @@ -14,20 +14,22 @@ CONFIG_CGROUP_CPUACCT=3Dy CONFIG_NAMESPACES=3Dy CONFIG_USER_NS=3Dy CONFIG_CC_OPTIMIZE_FOR_SIZE=3Dy -CONFIG_KALLSYMS_ALL=3Dy CONFIG_EXPERT=3Dy -# CONFIG_VM_EVENT_COUNTERS is not set -# CONFIG_COMPAT_BRK is not set +CONFIG_KALLSYMS_ALL=3Dy +CONFIG_CMDLINE_BOOL=3Dy +CONFIG_CMDLINE_PREPEND=3D"earlycon clk_ignore_unused" CONFIG_MACH_INGENIC_SOC=3Dy CONFIG_X1830_CU1830_NEO=3Dy CONFIG_HIGHMEM=3Dy CONFIG_HZ_100=3Dy -# CONFIG_SECCOMP is not set # CONFIG_SUSPEND is not set +# CONFIG_SECCOMP is not set CONFIG_MODULES=3Dy # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_COMPAT_BRK is not set # CONFIG_COMPACTION is not set CONFIG_CMA=3Dy +# CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=3Dy CONFIG_PACKET=3Dy CONFIG_UNIX=3Dy @@ -69,7 +71,6 @@ CONFIG_SENSORS_ADS7828=3Dm CONFIG_WATCHDOG=3Dy CONFIG_JZ4740_WDT=3Dy # CONFIG_VGA_CONSOLE is not set -# CONFIG_HID is not set CONFIG_USB=3Dy CONFIG_USB_STORAGE=3Dy CONFIG_USB_DWC2=3Dy @@ -89,7 +90,6 @@ CONFIG_DMA_JZ4780=3Dy # CONFIG_INGENIC_TIMER is not set CONFIG_INGENIC_SYSOST=3Dy # CONFIG_IOMMU_SUPPORT is not set -CONFIG_JZ4770_PHY=3Dy CONFIG_EXT4_FS=3Dy # CONFIG_DNOTIFY is not set CONFIG_AUTOFS_FS=3Dy @@ -100,15 +100,14 @@ CONFIG_PROC_KCORE=3Dy CONFIG_TMPFS=3Dy CONFIG_CONFIGFS_FS=3Dy CONFIG_NFS_FS=3Dy -CONFIG_NLS=3Dy CONFIG_NLS_CODEPAGE_437=3Dy CONFIG_NLS_CODEPAGE_936=3Dy CONFIG_NLS_CODEPAGE_950=3Dy CONFIG_NLS_ASCII=3Dy CONFIG_NLS_ISO8859_1=3Dy CONFIG_NLS_UTF8=3Dy -CONFIG_CRYPTO_ECHAINIV=3Dy CONFIG_CRYPTO_AES=3Dy +CONFIG_CRYPTO_ECHAINIV=3Dy CONFIG_CRYPTO_DEFLATE=3Dy CONFIG_CRYPTO_LZO=3Dy CONFIG_PRINTK_TIME=3Dy @@ -122,8 +121,4 @@ CONFIG_DEBUG_FS=3Dy CONFIG_PANIC_ON_OOPS=3Dy CONFIG_PANIC_TIMEOUT=3D10 # CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_STACKTRACE=3Dy # CONFIG_FTRACE is not set -CONFIG_CMDLINE_BOOL=3Dy -CONFIG_CMDLINE=3D"earlycon clk_ignore_unused" diff --git a/arch/mips/configs/generic_defconfig b/arch/mips/configs/generi= c_defconfig index 071e2205c7ed..53eddba32478 100644 --- a/arch/mips/configs/generic_defconfig +++ b/arch/mips/configs/generic_defconfig @@ -1,5 +1,6 @@ CONFIG_SYSVIPC=3Dy CONFIG_NO_HZ_IDLE=3Dy +CONFIG_BPF_SYSCALL=3Dy CONFIG_IKCONFIG=3Dy CONFIG_IKCONFIG_PROC=3Dy CONFIG_MEMCG=3Dy @@ -15,11 +16,9 @@ CONFIG_NAMESPACES=3Dy CONFIG_USER_NS=3Dy CONFIG_SCHED_AUTOGROUP=3Dy CONFIG_BLK_DEV_INITRD=3Dy -CONFIG_BPF_SYSCALL=3Dy -CONFIG_USERFAULTFD=3Dy CONFIG_EXPERT=3Dy -# CONFIG_SLUB_DEBUG is not set -# CONFIG_COMPAT_BRK is not set +CONFIG_CMDLINE_BOOL=3Dy +CONFIG_CMDLINE_PREPEND=3D"earlycon" CONFIG_CPU_LITTLE_ENDIAN=3Dy CONFIG_MIPS_CPS=3Dy CONFIG_HIGHMEM=3Dy @@ -29,6 +28,8 @@ CONFIG_JUMP_LABEL=3Dy CONFIG_MODULES=3Dy CONFIG_MODULE_UNLOAD=3Dy CONFIG_TRIM_UNUSED_KSYMS=3Dy +# CONFIG_COMPAT_BRK is not set +CONFIG_USERFAULTFD=3Dy CONFIG_NET=3Dy CONFIG_PACKET=3Dy CONFIG_UNIX=3Dy @@ -44,14 +45,11 @@ CONFIG_HW_RANDOM=3Dy # CONFIG_HWMON is not set CONFIG_MFD_SYSCON=3Dy CONFIG_HID_A4TECH=3Dy -CONFIG_HID_APPLE=3Dy CONFIG_HID_BELKIN=3Dy CONFIG_HID_CHERRY=3Dy -CONFIG_HID_CHICONY=3Dy CONFIG_HID_CYPRESS=3Dy CONFIG_HID_EZKEY=3Dy CONFIG_HID_KENSINGTON=3Dy -CONFIG_HID_LOGITECH=3Dy CONFIG_HID_MICROSOFT=3Dy CONFIG_HID_MONTEREY=3Dy # CONFIG_MIPS_PLATFORM_DEVICES is not set @@ -85,7 +83,6 @@ CONFIG_PRINTK_TIME=3Dy CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=3Dy CONFIG_DEBUG_INFO_REDUCED=3Dy CONFIG_DEBUG_FS=3Dy +# CONFIG_SLUB_DEBUG is not set # CONFIG_SCHED_DEBUG is not set # CONFIG_FTRACE is not set -CONFIG_CMDLINE_BOOL=3Dy -CONFIG_CMDLINE=3D"earlycon" diff --git a/arch/mips/configs/gpr_defconfig b/arch/mips/configs/gpr_defcon= fig index 92fc0edbac47..5c070a81a26d 100644 --- a/arch/mips/configs/gpr_defconfig +++ b/arch/mips/configs/gpr_defconfig @@ -9,9 +9,10 @@ CONFIG_RELAY=3Dy CONFIG_BLK_DEV_INITRD=3Dy CONFIG_EXPERT=3Dy CONFIG_PROFILING=3Dy +CONFIG_CMDLINE_BOOL=3Dy +CONFIG_CMDLINE_PREPEND=3D"console=3DttyS0,115200 root=3D/dev/nfs rw ip=3Da= uto" CONFIG_MIPS_ALCHEMY=3Dy CONFIG_MIPS_GPR=3Dy -CONFIG_PCI=3Dy CONFIG_MODULES=3Dy CONFIG_MODULE_UNLOAD=3Dy CONFIG_PARTITION_ADVANCED=3Dy @@ -45,7 +46,6 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=3Dm CONFIG_NETFILTER_XT_MATCH_MAC=3Dm CONFIG_NETFILTER_XT_MATCH_MARK=3Dm CONFIG_NETFILTER_XT_MATCH_MULTIPORT=3Dm -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=3Dm CONFIG_NETFILTER_XT_MATCH_PKTTYPE=3Dm CONFIG_NETFILTER_XT_MATCH_QUOTA=3Dm CONFIG_NETFILTER_XT_MATCH_REALM=3Dm @@ -102,27 +102,21 @@ CONFIG_IPDDP_ENCAP=3Dy CONFIG_X25=3Dm CONFIG_LAPB=3Dm CONFIG_NET_SCHED=3Dy -CONFIG_NET_SCH_CBQ=3Dm CONFIG_NET_SCH_HTB=3Dm CONFIG_NET_SCH_HFSC=3Dm -CONFIG_NET_SCH_ATM=3Dm CONFIG_NET_SCH_PRIO=3Dm CONFIG_NET_SCH_RED=3Dm CONFIG_NET_SCH_SFQ=3Dm CONFIG_NET_SCH_TEQL=3Dm CONFIG_NET_SCH_TBF=3Dm CONFIG_NET_SCH_GRED=3Dm -CONFIG_NET_SCH_DSMARK=3Dm CONFIG_NET_SCH_NETEM=3Dm CONFIG_NET_SCH_INGRESS=3Dm CONFIG_NET_CLS_BASIC=3Dm -CONFIG_NET_CLS_TCINDEX=3Dm CONFIG_NET_CLS_ROUTE4=3Dm CONFIG_NET_CLS_FW=3Dm CONFIG_NET_CLS_U32=3Dm CONFIG_CLS_U32_MARK=3Dy -CONFIG_NET_CLS_RSVP=3Dm -CONFIG_NET_CLS_RSVP6=3Dm CONFIG_NET_EMATCH=3Dy CONFIG_NET_EMATCH_CMP=3Dm CONFIG_NET_EMATCH_NBYTE=3Dm @@ -145,6 +139,8 @@ CONFIG_BAYCOM_SER_HDX=3Dm CONFIG_YAM=3Dm CONFIG_CFG80211=3Dy CONFIG_MAC80211=3Dy +CONFIG_PCI=3Dy +# CONFIG_VGA_ARB is not set CONFIG_MTD=3Dy CONFIG_MTD_BLOCK=3Dy CONFIG_MTD_CFI=3Dy @@ -232,8 +228,6 @@ CONFIG_WATCHDOG=3Dy CONFIG_WATCHDOG_NOWAYOUT=3Dy CONFIG_SSB=3Dm CONFIG_SSB_DRIVER_PCICORE=3Dy -# CONFIG_VGA_ARB is not set -# CONFIG_LCD_CLASS_DEVICE is not set CONFIG_BACKLIGHT_CLASS_DEVICE=3Dy # CONFIG_VGA_CONSOLE is not set CONFIG_USB_HID=3Dm @@ -250,10 +244,6 @@ CONFIG_USB_STORAGE=3Dm CONFIG_USB_SERIAL=3Dy CONFIG_USB_SERIAL_GENERIC=3Dy CONFIG_USB_SERIAL_SIERRAWIRELESS=3Dy -CONFIG_LEDS_GPIO=3Dy -CONFIG_LEDS_TRIGGER_TIMER=3Dy -CONFIG_LEDS_TRIGGER_HEARTBEAT=3Dy -CONFIG_LEDS_TRIGGER_DEFAULT_ON=3Dy # CONFIG_DNOTIFY is not set # CONFIG_INOTIFY_USER is not set CONFIG_ISO9660_FS=3Dm @@ -275,20 +265,15 @@ CONFIG_NLS_CODEPAGE_850=3Dy CONFIG_NLS_ISO8859_1=3Dy CONFIG_CRYPTO_AUTHENC=3Dm CONFIG_CRYPTO_TEST=3Dm -CONFIG_CRYPTO_PCBC=3Dm -CONFIG_CRYPTO_MD4=3Dm -CONFIG_CRYPTO_MICHAEL_MIC=3Dm -CONFIG_CRYPTO_SHA512=3Dm -CONFIG_CRYPTO_WP512=3Dm -CONFIG_CRYPTO_ANUBIS=3Dm CONFIG_CRYPTO_BLOWFISH=3Dm CONFIG_CRYPTO_CAST5=3Dm CONFIG_CRYPTO_CAST6=3Dm -CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_SERPENT=3Dm -CONFIG_CRYPTO_TEA=3Dm CONFIG_CRYPTO_TWOFISH=3Dm +CONFIG_CRYPTO_PCBC=3Dm +CONFIG_CRYPTO_MD4=3Dm +CONFIG_CRYPTO_MICHAEL_MIC=3Dm +CONFIG_CRYPTO_SHA512=3Dm +CONFIG_CRYPTO_WP512=3Dm CONFIG_CRYPTO_DEFLATE=3Dm CONFIG_MAGIC_SYSRQ=3Dy -CONFIG_CMDLINE_BOOL=3Dy -CONFIG_CMDLINE=3D"console=3DttyS0,115200 root=3D/dev/nfs rw ip=3Dauto" diff --git a/arch/mips/configs/loongson3_defconfig b/arch/mips/configs/loon= gson3_defconfig index 07839a4b397e..aca4797b5bb6 100644 --- a/arch/mips/configs/loongson3_defconfig +++ b/arch/mips/configs/loongson3_defconfig @@ -5,6 +5,8 @@ CONFIG_POSIX_MQUEUE=3Dy CONFIG_AUDIT=3Dy CONFIG_NO_HZ=3Dy CONFIG_HIGH_RES_TIMERS=3Dy +CONFIG_BPF_SYSCALL=3Dy +CONFIG_BPF_JIT=3Dy CONFIG_PREEMPT=3Dy CONFIG_BSD_PROCESS_ACCT=3Dy CONFIG_BSD_PROCESS_ACCT_V3=3Dy @@ -22,18 +24,18 @@ CONFIG_CGROUP_CPUACCT=3Dy CONFIG_NAMESPACES=3Dy CONFIG_USER_NS=3Dy CONFIG_SCHED_AUTOGROUP=3Dy -CONFIG_SYSFS_DEPRECATED=3Dy CONFIG_RELAY=3Dy CONFIG_BLK_DEV_INITRD=3Dy -CONFIG_BPF_SYSCALL=3Dy CONFIG_EXPERT=3Dy CONFIG_PERF_EVENTS=3Dy +CONFIG_KEXEC=3Dy +CONFIG_CMDLINE_BOOL=3Dy +CONFIG_CMDLINE_PREPEND=3D"ieee754=3Drelaxed" CONFIG_MACH_LOONGSON64=3Dy CONFIG_CPU_HAS_MSA=3Dy CONFIG_NUMA=3Dy CONFIG_NR_CPUS=3D16 CONFIG_HZ_256=3Dy -CONFIG_KEXEC=3Dy CONFIG_MIPS32_O32=3Dy CONFIG_MIPS32_N32=3Dy CONFIG_VIRTUALIZATION=3Dy @@ -47,15 +49,12 @@ CONFIG_MODVERSIONS=3Dy CONFIG_PARTITION_ADVANCED=3Dy CONFIG_MQ_IOSCHED_DEADLINE=3Dm CONFIG_IOSCHED_BFQ=3Dy -CONFIG_BFQ_GROUP_IOSCHED=3Dy CONFIG_BINFMT_MISC=3Dm CONFIG_KSM=3Dy CONFIG_NET=3Dy CONFIG_PACKET=3Dy -CONFIG_UNIX=3Dy CONFIG_XFRM_USER=3Dy CONFIG_NET_KEY=3Dy -CONFIG_INET=3Dy CONFIG_IP_MULTICAST=3Dy CONFIG_IP_ADVANCED_ROUTER=3Dy CONFIG_IP_MULTIPLE_TABLES=3Dy @@ -128,7 +127,6 @@ CONFIG_L2TP=3Dm CONFIG_BRIDGE=3Dm CONFIG_VSOCKETS=3Dm CONFIG_VIRTIO_VSOCKETS=3Dm -CONFIG_BPF_JIT=3Dy CONFIG_CFG80211=3Dm CONFIG_CFG80211_WEXT=3Dy CONFIG_MAC80211=3Dm @@ -196,7 +194,6 @@ CONFIG_VIRTIO_NET=3Dm # CONFIG_NET_VENDOR_ARC is not set # CONFIG_NET_VENDOR_ATHEROS is not set # CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_BROCADE is not set # CONFIG_NET_VENDOR_CHELSIO is not set # CONFIG_NET_VENDOR_CIRRUS is not set # CONFIG_NET_VENDOR_CISCO is not set @@ -216,6 +213,7 @@ CONFIG_IXGBE=3Dy # CONFIG_NET_VENDOR_NVIDIA is not set # CONFIG_NET_VENDOR_OKI is not set # CONFIG_NET_VENDOR_QLOGIC is not set +# CONFIG_NET_VENDOR_BROCADE is not set # CONFIG_NET_VENDOR_RDC is not set CONFIG_8139CP=3Dm CONFIG_8139TOO=3Dm @@ -276,15 +274,14 @@ CONFIG_MEDIA_SUPPORT=3Dm CONFIG_MEDIA_USB_SUPPORT=3Dy CONFIG_USB_VIDEO_CLASS=3Dm CONFIG_DRM=3Dy +CONFIG_DRM_RADEON=3Dm CONFIG_DRM_AMDGPU=3Dm CONFIG_DRM_AMDGPU_SI=3Dy CONFIG_DRM_AMDGPU_CIK=3Dy CONFIG_DRM_AMDGPU_USERPTR=3Dy CONFIG_DRM_AMD_ACP=3Dy -CONFIG_DRM_AMD_DC=3Dy CONFIG_DRM_AMD_DC_SI=3Dy CONFIG_DRM_AST=3Dm -CONFIG_DRM_RADEON=3Dm CONFIG_DRM_QXL=3Dy CONFIG_DRM_VIRTIO_GPU=3Dy CONFIG_FB=3Dy @@ -292,7 +289,6 @@ CONFIG_FB_RADEON=3Dy CONFIG_LCD_CLASS_DEVICE=3Dy CONFIG_LCD_PLATFORM=3Dm # CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=3Dy CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=3Dy CONFIG_LOGO=3Dy CONFIG_SOUND=3Dy @@ -350,7 +346,6 @@ CONFIG_EXT3_FS_SECURITY=3Dy CONFIG_XFS_FS=3Dy CONFIG_XFS_POSIX_ACL=3Dy CONFIG_QUOTA=3Dy -# CONFIG_PRINT_QUOTA_WARNING is not set CONFIG_QFMT_V1=3Dm CONFIG_QFMT_V2=3Dm CONFIG_AUTOFS_FS=3Dy @@ -390,24 +385,20 @@ CONFIG_SECURITY_NETWORK=3Dy CONFIG_SECURITY_PATH=3Dy CONFIG_SECURITY_SELINUX=3Dy CONFIG_SECURITY_SELINUX_BOOTPARAM=3Dy -CONFIG_SECURITY_SELINUX_DISABLE=3Dy CONFIG_DEFAULT_SECURITY_DAC=3Dy -CONFIG_CRYPTO_HMAC=3Dy -CONFIG_CRYPTO_MD5=3Dy -CONFIG_CRYPTO_WP512=3Dm CONFIG_CRYPTO_BLOWFISH=3Dm CONFIG_CRYPTO_CAST5=3Dm CONFIG_CRYPTO_CAST6=3Dm CONFIG_CRYPTO_SERPENT=3Dm CONFIG_CRYPTO_TWOFISH=3Dm +CONFIG_CRYPTO_HMAC=3Dy +CONFIG_CRYPTO_MD5=3Dy +CONFIG_CRYPTO_WP512=3Dm CONFIG_CRYPTO_DEFLATE=3Dm CONFIG_PRINTK_TIME=3Dy CONFIG_STRIP_ASM_SYMS=3Dy CONFIG_MAGIC_SYSRQ=3Dy CONFIG_DEBUG_FS=3Dy # CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_PREEMPT is not set CONFIG_FUNCTION_TRACER=3Dy CONFIG_FTRACE_SYSCALLS=3Dy -CONFIG_CMDLINE_BOOL=3Dy -CONFIG_CMDLINE=3D"ieee754=3Drelaxed" diff --git a/arch/mips/include/asm/setup.h b/arch/mips/include/asm/setup.h index 8c56b862fd9c..798bc3c68080 100644 --- a/arch/mips/include/asm/setup.h +++ b/arch/mips/include/asm/setup.h @@ -5,6 +5,7 @@ #include #include =20 +#ifndef __ASSEMBLY__ extern void prom_putchar(char); extern void setup_early_printk(void); =20 @@ -27,5 +28,6 @@ extern unsigned long ebase; extern unsigned int hwrena; extern void per_cpu_trap_init(bool); extern void cpu_cache_init(void); +#endif =20 #endif /* __SETUP_H */ diff --git a/arch/mips/kernel/relocate.c b/arch/mips/kernel/relocate.c index 58fc8d089402..089d67c476ae 100644 --- a/arch/mips/kernel/relocate.c +++ b/arch/mips/kernel/relocate.c @@ -23,6 +23,7 @@ #include #include #include +#include =20 #define RELOCATED(x) ((void *)((long)x + offset)) =20 @@ -247,16 +248,26 @@ static inline __init bool kaslr_disabled(void) char *str; =20 #if defined(CONFIG_CMDLINE_BOOL) - const char *builtin_cmdline =3D CONFIG_CMDLINE; + char *builtin_cmdline =3D CMDLINE_PREPEND; =20 str =3D strstr(builtin_cmdline, "nokaslr"); if (str =3D=3D builtin_cmdline || (str > builtin_cmdline && *(str - 1) =3D=3D ' ')) return true; #endif - str =3D strstr(arcs_cmdline, "nokaslr"); - if (str =3D=3D arcs_cmdline || (str > arcs_cmdline && *(str - 1) =3D=3D '= ')) + if (!IS_ENABLED(CONFIG_CMDLINE_OVERRIDE)) { + str =3D strstr(arcs_cmdline, "nokaslr"); + if (str =3D=3D arcs_cmdline || (str > arcs_cmdline && *(str - 1) =3D=3D = ' ')) + return true; + } + +#if defined(CONFIG_CMDLINE_BOOL) + builtin_cmdline =3D CMDLINE_APPEND; + str =3D strstr(builtin_cmdline, "nokaslr"); + if (str =3D=3D builtin_cmdline || + (str > builtin_cmdline && *(str - 1) =3D=3D ' ')) return true; +#endif =20 return false; } diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index cb871eb784a7..38e0e19b9c0d 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -70,12 +71,6 @@ EXPORT_SYMBOL(mips_machtype); static char __initdata command_line[COMMAND_LINE_SIZE]; char __initdata arcs_cmdline[COMMAND_LINE_SIZE]; =20 -#ifdef CONFIG_CMDLINE_BOOL -static const char builtin_cmdline[] __initconst =3D CONFIG_CMDLINE; -#else -static const char builtin_cmdline[] __initconst =3D ""; -#endif - /* * mips_io_port_base is the begin of the address space to which x86 style * I/O ports are mapped. @@ -561,27 +556,7 @@ static void __init bootcmdline_init(void) { bool dt_bootargs =3D false; =20 - /* - * If CMDLINE_OVERRIDE is enabled then initializing the command line is - * trivial - we simply use the built-in command line unconditionally & - * unmodified. - */ - if (IS_ENABLED(CONFIG_CMDLINE_OVERRIDE)) { - strscpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); - return; - } - - /* - * If the user specified a built-in command line & - * MIPS_CMDLINE_BUILTIN_EXTEND, then the built-in command line is - * prepended to arguments from the bootloader or DT so we'll copy them - * to the start of boot_command_line here. Otherwise, empty - * boot_command_line to undo anything early_init_dt_scan_chosen() did. - */ - if (IS_ENABLED(CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND)) - strscpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); - else - boot_command_line[0] =3D 0; + boot_command_line[0] =3D 0; =20 #ifdef CONFIG_OF_EARLY_FLATTREE /* @@ -604,12 +579,9 @@ static void __init bootcmdline_init(void) bootcmdline_append(arcs_cmdline, COMMAND_LINE_SIZE); =20 /* - * If the user specified a built-in command line & we didn't already - * prepend it, we append it to boot_command_line here. + * Use the generic system for builtin prepend and append. */ - if (IS_ENABLED(CONFIG_CMDLINE_BOOL) && - !IS_ENABLED(CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND)) - bootcmdline_append(builtin_cmdline, COMMAND_LINE_SIZE); + cmdline_add_builtin(boot_command_line); } =20 /* diff --git a/arch/mips/pic32/pic32mzda/early_console.c b/arch/mips/pic32/pi= c32mzda/early_console.c index 3cd1b408fa1c..f14bc1846706 100644 --- a/arch/mips/pic32/pic32mzda/early_console.c +++ b/arch/mips/pic32/pic32mzda/early_console.c @@ -76,7 +76,7 @@ static char * __init pic32_getcmdline(void) * command line setup if using CONFIG_CMDLINE_BOOL. */ #ifdef CONFIG_CMDLINE_OVERRIDE - return CONFIG_CMDLINE; + return CMDLINE_STATIC_PREPEND " " CMDLINE_STATIC_APPEND; #else return fw_getcmdline(); #endif diff --git a/arch/mips/pic32/pic32mzda/init.c b/arch/mips/pic32/pic32mzda/i= nit.c index 53b227a9074c..ba2524255857 100644 --- a/arch/mips/pic32/pic32mzda/init.c +++ b/arch/mips/pic32/pic32mzda/init.c @@ -9,6 +9,7 @@ #include #include #include +#include =20 #include #include @@ -41,7 +42,7 @@ void __init plat_mem_setup(void) pr_info(" boot_command_line: %s\n", boot_command_line); pr_info(" arcs_cmdline : %s\n", arcs_cmdline); #ifdef CONFIG_CMDLINE_BOOL - pr_info(" builtin_cmdline : %s\n", CONFIG_CMDLINE); + pr_info(" builtin_cmdline : %s\n", CMDLINE_STATIC_PREPEND " " CMDLINE_ST= ATIC_APPEND); #endif if (dtb !=3D __dtb_start) strscpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE); --=20 2.39.2