ARM: defconfig: gemini: Update defconfig

Commit Message

Linus Walleij April 12, 2021, 1:47 p.m. UTC

Update the Gemini defconfig: some moved options, added som
WLAN drivers existing on the supported platforms and enabled
the drivetemp sensor which is used on the NAS devices.

Signed-off-by: Linus Walleij <[e-mail]>
---
ARM SoC folks: apply this wherever defconfigs go.
---
 arch/arm/configs/gemini_defconfig | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

Comments

Arnd Bergmann April 13, 2021, 9:17 a.m. UTC | #1

On Mon, Apr 12, 2021 at 3:47 PM Linus Walleij <[e-mail]> wrote:
>
> Update the Gemini defconfig: some moved options, added som
> WLAN drivers existing on the supported platforms and enabled
> the drivetemp sensor which is used on the NAS devices.
>
> Signed-off-by: Linus Walleij <[e-mail]>

I don't like patches that mix functional changes with what comes down
to whitespace. Can you resend this one as a series?

At the minimum, make one patch that adds BFQ, DRIVETEMP
and WLAN changes and another one that moves options
around that change after 'savedefconfig'.

For the CONFIG_ENABLE_MUST_CHECK removal, can you
send a patch that removes this line from all defconfig files at once?

      Arnd

Patch

diff --git a/arch/arm/configs/gemini_defconfig b/arch/arm/configs/gemini_defconfig
index d2d5f1cf815f..4d5409689e68 100644
--- a/arch/arm/configs/gemini_defconfig
+++ b/arch/arm/configs/gemini_defconfig
@@ -16,6 +16,7 @@  CONFIG_CMDLINE="console=ttyS0,115200n8"
 CONFIG_KEXEC=y
 CONFIG_PM=y
 CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
 CONFIG_BINFMT_MISC=y
 CONFIG_CMA=y
 CONFIG_NET=y
@@ -51,9 +52,27 @@  CONFIG_NETDEVICES=y
 CONFIG_TUN=y
 CONFIG_NET_DSA_REALTEK_SMI=y
 CONFIG_GEMINI_ETHERNET=y
+CONFIG_MARVELL_PHY=y
 CONFIG_MDIO_BITBANG=y
 CONFIG_MDIO_GPIO=y
-CONFIG_MARVELL_PHY=y
+# CONFIG_USB_NET_DRIVERS is not set
+# CONFIG_WLAN_VENDOR_ADMTEK is not set
+# CONFIG_WLAN_VENDOR_ATH is not set
+# CONFIG_WLAN_VENDOR_ATMEL is not set
+# CONFIG_WLAN_VENDOR_BROADCOM is not set
+# CONFIG_WLAN_VENDOR_CISCO is not set
+# CONFIG_WLAN_VENDOR_INTEL is not set
+# CONFIG_WLAN_VENDOR_INTERSIL is not set
+# CONFIG_WLAN_VENDOR_MARVELL is not set
+# CONFIG_WLAN_VENDOR_MEDIATEK is not set
+CONFIG_RT2X00=y
+CONFIG_RT61PCI=y
+CONFIG_RT2800PCI=y
+# CONFIG_WLAN_VENDOR_REALTEK is not set
+# CONFIG_WLAN_VENDOR_RSI is not set
+# CONFIG_WLAN_VENDOR_ST is not set
+# CONFIG_WLAN_VENDOR_TI is not set
+# CONFIG_WLAN_VENDOR_ZYDAS is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
@@ -67,6 +86,7 @@  CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_I2C_GPIO=y
 CONFIG_SPI=y
 CONFIG_SPI_GPIO=y
+CONFIG_SENSORS_DRIVETEMP=y
 CONFIG_SENSORS_GPIO_FAN=y
 CONFIG_SENSORS_LM75=y
 CONFIG_THERMAL=y
@@ -98,5 +118,4 @@  CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_ROMFS_FS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
-# CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_DEBUG_FS=y