Skip to contentSkip to conversation

ARM: defconfig cleanup

PATCH In review Arnd Bergmann 9 participants 25 messages Aug 18, 2022 – Aug 29, 2022

Subsystems (17)
Arm (32-bit) USB Arm i.MX and Layerscape Arm Samsung Exynos +13 more subsystems
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

cover ARM: defconfig cleanup

From: Arnd Bergmann <[email protected]>

I have continued the cleanup of the multi_*_defconfig files, and reordered the other files according to the 'make savedefconfig' output as before.

I would like to queue these up for 6.1, though the last two should probably be considered bugfixes and merged for 6.0.

Since a third of the defconfig files are for machines that are now marked as unused, I skipped those files. There are still a few things that get removed by 'make savedefconfig' as they now get selected by some driver:

-CONFIG_SERIAL_BCM63XX=y
-CONFIG_SND_AUDIO_GRAPH_CARD=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_TEGRA20_APB_DMA=y

I think for those we should follow up with patches to remove the 'select' statements.

Arnd

Cc Russell King <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc Alexandre Belloni <[email protected]>
Cc Claudiu Beznea <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Alim Akhtar <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Pengutronix Kernel Team <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP Linux Team <[email protected]>
Cc Vladimir Zapolskiy <[email protected]>
Cc Liviu Dudau <[email protected]>
Cc Sudeep Holla <[email protected]>
Cc Lorenzo Pieralisi <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Gregory Clement <[email protected]>
Cc Sebastian Hesselbarth <[email protected]>
Cc Aaro Koskinen <[email protected]>
Cc Janusz Krzysztofik <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Magnus Damm <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Qin Jian <[email protected]>
Cc Maxime Coquelin <[email protected]>
Cc Alexandre Torgue <[email protected]>
Cc Chen-Yu Tsai <[email protected]>
Cc Jernej Skrabec <[email protected]>
Cc Samuel Holland <[email protected]>
Cc Thierry Reding <[email protected]>
Cc Jonathan Hunter <[email protected]>
Cc Bin Liu <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Tudor Ambarus <[email protected]>
Cc Mark Brown <[email protected]>
Cc Linus Walleij <[email protected]>
Cc "Łukasz Stelmach" <[email protected]>
Cc Laurent Pinchart <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc Vladimir Oltean <[email protected]>
Cc Richard Cochran <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Shannon Nelson <[email protected]>
Cc Peter Chen <[email protected]>
Cc Stefan Wahren <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]

Arnd Bergmann (11):
ARM: defconfig: reorder defconfig files
ARM: defconfig: clean up multi_v4t and multi_v5 configs
ARM: defconfig: drop CONFIG_NET_VENDOR_ASIX=y
ARM: defconfig: drop CONFIG_SERIAL_OMAP references
ARM: defconfig: drop CONFIG_DRM_RCAR_LVDS
ARM: defconfig: drop CONFIG_PTP_1588_CLOCK=y
ARM: defconfig: drop CONFIG_SND_SOC_FSL_SAI
ARM: defconfig: drop CONFIG_USB_FSL_USB2
ARM: defconfig: drop CONFIG_MICROCHIP_PIT64B
ARM: defconfig: fix CONFIG_SND_SOC_AC97_CODEC name
musb: fix USB_MUSB_TUSB6010 dependency

 arch/arm/configs/at91_dt_defconfig   |  2 +-
 arch/arm/configs/dove_defconfig      |  2 +-
 arch/arm/configs/exynos_defconfig    |  2 +-
 arch/arm/configs/imx_v6_v7_defconfig |  2 +-
 arch/arm/configs/keystone_defconfig  |  7 +++----
 arch/arm/configs/lpc18xx_defconfig   |  2 +-
 arch/arm/configs/mmp2_defconfig      |  2 +-
 arch/arm/configs/mps2_defconfig      |  2 +-
 arch/arm/configs/multi_v4t_defconfig |  2 --
 arch/arm/configs/multi_v5_defconfig  |  3 +--
 arch/arm/configs/multi_v7_defconfig  | 22 +++++++---------------
 arch/arm/configs/mvebu_v5_defconfig  |  2 +-
 arch/arm/configs/mxs_defconfig       |  4 ++--
 arch/arm/configs/omap1_defconfig     |  2 +-
 arch/arm/configs/omap2plus_defconfig |  7 ++-----
 arch/arm/configs/orion5x_defconfig   |  2 +-
 arch/arm/configs/pxa168_defconfig    |  2 +-
 arch/arm/configs/pxa910_defconfig    |  2 +-
 arch/arm/configs/pxa_defconfig       |  2 +-
 arch/arm/configs/s3c6400_defconfig   |  2 +-
 arch/arm/configs/s5pv210_defconfig   |  2 +-
 arch/arm/configs/sama5_defconfig     |  6 +++---
 arch/arm/configs/sama7_defconfig     |  4 ++--
 arch/arm/configs/shmobile_defconfig  |  2 +-
 arch/arm/configs/socfpga_defconfig   |  6 +++---
 arch/arm/configs/sp7021_defconfig    |  2 +-
 arch/arm/configs/spear13xx_defconfig |  2 +-
 arch/arm/configs/spear3xx_defconfig  |  2 +-
 arch/arm/configs/spear6xx_defconfig  |  2 +-
 arch/arm/configs/stm32_defconfig     |  2 +-
 arch/arm/configs/sunxi_defconfig     |  2 +-
 arch/arm/configs/tegra_defconfig     |  2 +-
 arch/arm/configs/vexpress_defconfig  |  2 +-
 drivers/usb/musb/Kconfig             |  2 +-
 34 files changed, 48 insertions(+), 63 deletions(-)
Signature · 1 line
2.29.2
author
#1 lore raw

PATCH 1/11 ARM: defconfig: reorder defconfig files

From: Arnd Bergmann <[email protected]>

The debug-info and can subystem options have moved around in the 'savedefconfig' output, so fix these up to reduce the clutter from the savedefconfig command.

Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/configs/at91_dt_defconfig   |  2 +-
 arch/arm/configs/dove_defconfig      |  2 +-
 arch/arm/configs/exynos_defconfig    |  2 +-
 arch/arm/configs/imx_v6_v7_defconfig |  2 +-
 arch/arm/configs/keystone_defconfig  |  6 +++---
 arch/arm/configs/lpc18xx_defconfig   |  2 +-
 arch/arm/configs/mmp2_defconfig      |  2 +-
 arch/arm/configs/mps2_defconfig      |  2 +-
 arch/arm/configs/multi_v5_defconfig  |  2 +-
 arch/arm/configs/multi_v7_defconfig  | 12 ++++++------
 arch/arm/configs/mvebu_v5_defconfig  |  2 +-
 arch/arm/configs/mxs_defconfig       |  4 ++--
 arch/arm/configs/omap1_defconfig     |  2 +-
 arch/arm/configs/omap2plus_defconfig |  4 ++--
 arch/arm/configs/orion5x_defconfig   |  2 +-
 arch/arm/configs/pxa168_defconfig    |  2 +-
 arch/arm/configs/pxa910_defconfig    |  2 +-
 arch/arm/configs/pxa_defconfig       |  2 +-
 arch/arm/configs/s3c6400_defconfig   |  2 +-
 arch/arm/configs/s5pv210_defconfig   |  2 +-
 arch/arm/configs/sama5_defconfig     |  6 +++---
 arch/arm/configs/sama7_defconfig     |  4 ++--
 arch/arm/configs/shmobile_defconfig  |  2 +-
 arch/arm/configs/socfpga_defconfig   |  6 +++---
 arch/arm/configs/sp7021_defconfig    |  2 +-
 arch/arm/configs/spear13xx_defconfig |  2 +-
 arch/arm/configs/spear3xx_defconfig  |  2 +-
 arch/arm/configs/spear6xx_defconfig  |  2 +-
 arch/arm/configs/stm32_defconfig     |  2 +-
 arch/arm/configs/sunxi_defconfig     |  2 +-
 arch/arm/configs/tegra_defconfig     |  2 +-
 arch/arm/configs/vexpress_defconfig  |  2 +-
 32 files changed, 46 insertions(+), 46 deletions(-)
arch/arm/configs/at91_dt_defconfig +1 -1
index da90ce9cd42e..5cc72266eaff 100644
@@ -40,7 +40,6 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_DIAG is not set
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_CAN=y
-CONFIG_CAN_AT91=y
 CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_DEVTMPFS=y

@@ -81,6 +80,7 @@ CONFIG_DM9000=y
 # CONFIG_NET_VENDOR_STMICRO is not set
 CONFIG_DAVICOM_PHY=y
 CONFIG_MICREL_PHY=y
+CONFIG_CAN_AT91=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_SDIO=m
 CONFIG_LIBERTAS_SPI=m
arch/arm/configs/dove_defconfig +1 -1
index 16ed5c110e8d..a9aa6458d46c 100644
@@ -116,7 +116,6 @@ CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_2=y
 CONFIG_NLS_UTF8=y
 CONFIG_TIMER_STATS=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_PCBC=m

@@ -136,6 +135,7 @@ CONFIG_CRC_CCITT=y
 CONFIG_LIBCRC32C=y
 CONFIG_PRINTK_TIME=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 # CONFIG_SCHED_DEBUG is not set
arch/arm/configs/exynos_defconfig +1 -1
index 1ce74f46e114..e3c99d40ffbc 100644
@@ -374,8 +374,8 @@ CONFIG_FONTS=y
 CONFIG_FONT_7x14=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
arch/arm/configs/imx_v6_v7_defconfig +1 -1
index 01012537a9b9..f692463da019 100644
@@ -65,7 +65,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_NETFILTER=y
 CONFIG_CAN=y
-CONFIG_CAN_FLEXCAN=y
 CONFIG_BT=y
 CONFIG_BT_BNEP=m
 CONFIG_BT_HCIUART=y

@@ -136,6 +135,7 @@ CONFIG_SMSC911X=y
 # CONFIG_NET_VENDOR_STMICRO is not set
 CONFIG_MICREL_PHY=y
 CONFIG_AT803X_PHY=y
+CONFIG_CAN_FLEXCAN=y
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=y
arch/arm/configs/keystone_defconfig +3 -3
index 68b89b90ca29..97f958d55019 100644
@@ -109,8 +109,6 @@ CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP_SCTP=y
 CONFIG_VLAN_8021Q=y
 CONFIG_CAN=m
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_DEVTMPFS=y

@@ -137,6 +135,8 @@ CONFIG_TI_KEYSTONE_NETCP_ETHSS=y
 CONFIG_MARVELL_PHY=y
 CONFIG_MICREL_PHY=y
 CONFIG_DP83867_PHY=y
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_GPIO_DECODER=m

@@ -224,7 +224,6 @@ CONFIG_NFSD=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_CRYPTO_USER=y
 CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_CBC=y

@@ -236,5 +235,6 @@ CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_DMA_CMA=y
 CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_SHIRQ=y
 CONFIG_DEBUG_USER=y
arch/arm/configs/lpc18xx_defconfig +1 -1
index 142c1700f450..56eae6a0a311 100644
@@ -150,9 +150,9 @@ CONFIG_JFFS2_FS=y
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC7=y
 CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 # CONFIG_SLUB_DEBUG is not set
arch/arm/configs/mmp2_defconfig +1 -1
index 4d39c615117b..7984640e994e 100644
@@ -73,10 +73,10 @@ CONFIG_ROOT_NFS=y
 CONFIG_CRC_CCITT=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_DYNAMIC_DEBUG is not set
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
arch/arm/configs/mps2_defconfig +1 -1
index 700568474549..3ed73f184d83 100644
@@ -94,9 +94,9 @@ CONFIG_NFS_V4_2=y
 CONFIG_ROOT_NFS=y
 CONFIG_NLS=y
 CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_FS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_SCHED_DEBUG is not set
arch/arm/configs/multi_v5_defconfig +1 -1
index e0be0e0023f3..5f3ed81228b0 100644
@@ -290,8 +290,8 @@ CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_DEV_MARVELL_CESA=y
 CONFIG_CRC_CCITT=y
 CONFIG_LIBCRC32C=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 # CONFIG_SCHED_DEBUG is not set
arch/arm/configs/multi_v7_defconfig +6 -6
index 12b35008571f..7ac539231a90 100644
@@ -167,12 +167,6 @@ CONFIG_NET_DSA=m
 CONFIG_QRTR=m
 CONFIG_QRTR_SMD=m
 CONFIG_CAN=y
-CONFIG_CAN_AT91=m
-CONFIG_CAN_FLEXCAN=m
-CONFIG_CAN_SUN4I=y
-CONFIG_CAN_XILINXCAN=y
-CONFIG_CAN_RCAR=m
-CONFIG_CAN_MCP251X=y
 CONFIG_BT=m
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_BCM=y

@@ -300,6 +294,12 @@ CONFIG_MARVELL_PHY=y
 CONFIG_AT803X_PHY=y
 CONFIG_ROCKCHIP_PHY=y
 CONFIG_DP83867_PHY=y
+CONFIG_CAN_AT91=m
+CONFIG_CAN_FLEXCAN=m
+CONFIG_CAN_SUN4I=y
+CONFIG_CAN_XILINXCAN=y
+CONFIG_CAN_RCAR=m
+CONFIG_CAN_MCP251X=y
 CONFIG_MDIO_MSCC_MIIM=m
 CONFIG_USB_PEGASUS=y
 CONFIG_USB_RTL8152=m
arch/arm/configs/mvebu_v5_defconfig +1 -1
index ef3a33ebc29a..587685182735 100644
@@ -184,13 +184,13 @@ CONFIG_NLS_CODEPAGE_850=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_2=y
 CONFIG_NLS_UTF8=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_DEV_MARVELL_CESA=y
 CONFIG_CRC_CCITT=y
 CONFIG_LIBCRC32C=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 # CONFIG_SCHED_DEBUG is not set
arch/arm/configs/mxs_defconfig +2 -2
index 155553ee06f4..6fbe93375998 100644
@@ -38,7 +38,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
 CONFIG_CAN=m
-CONFIG_CAN_FLEXCAN=m
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y

@@ -62,6 +61,7 @@ CONFIG_ICPLUS_PHY=y
 CONFIG_MICREL_PHY=y
 CONFIG_REALTEK_PHY=y
 CONFIG_SMSC_PHY=y
+CONFIG_CAN_FLEXCAN=m
 CONFIG_USB_USBNET=y
 CONFIG_USB_NET_SMSC95XX=y
 # CONFIG_WLAN is not set

@@ -163,8 +163,8 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CRC7=m
 CONFIG_FONTS=y
 CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_FRAME_WARN=2048
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
arch/arm/configs/omap1_defconfig +1 -1
index 54a9f50122af..28a5354bf801 100644
@@ -218,7 +218,6 @@ CONFIG_NLS_KOI8_R=y
 CONFIG_NLS_UTF8=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_SECURITY=y
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_PCBC=y

@@ -232,6 +231,7 @@ CONFIG_FONT_8x16=y
 CONFIG_FONT_6x11=y
 CONFIG_FONT_MINI_4x6=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_SPINLOCK=y
 CONFIG_DEBUG_MUTEXES=y
arch/arm/configs/omap2plus_defconfig +2 -2
index 99d015cf8919..e273365838cb 100644
@@ -249,8 +249,6 @@ CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_NET_SWITCHDEV=y
 CONFIG_CAN=m
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y

@@ -350,6 +348,8 @@ CONFIG_AT803X_PHY=y
 CONFIG_SMSC_PHY=y
 CONFIG_DP83848_PHY=y
 CONFIG_DP83867_PHY=y
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_DEFLATE=m
arch/arm/configs/orion5x_defconfig +1 -1
index 1311d9583fcc..22fde5ce5cf6 100644
@@ -138,9 +138,9 @@ CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_DEV_MARVELL_CESA=y
 CONFIG_CRC_T10DIF=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_SLUB_DEBUG is not set
 CONFIG_LATENCYTOP=y
 # CONFIG_FTRACE is not set
arch/arm/configs/pxa168_defconfig +1 -1
index 70d327895ccf..e4a004260c2e 100644
@@ -50,9 +50,9 @@ CONFIG_ROOT_NFS=y
 CONFIG_CRC_CCITT=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
arch/arm/configs/pxa910_defconfig +1 -1
index 5072bde71508..7adf90df6795 100644
@@ -58,9 +58,9 @@ CONFIG_ROOT_NFS=y
 CONFIG_CRC_CCITT=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
 CONFIG_DEBUG_MMP_UART2=y
arch/arm/configs/pxa_defconfig +1 -1
index 104a45722799..95c03ee20d28 100644
@@ -646,7 +646,6 @@ CONFIG_NLS_ASCII=m
 CONFIG_NLS_ISO8859_1=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_UTF8=m
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_TIMER_STATS=y
 CONFIG_SECURITY=y
 CONFIG_CRYPTO_MANAGER=y

@@ -682,6 +681,7 @@ CONFIG_FONT_6x11=y
 CONFIG_FONT_MINI_4x6=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_FRAME_WARN=0
 CONFIG_STRIP_ASM_SYMS=y
 CONFIG_MAGIC_SYSRQ=y
arch/arm/configs/s3c6400_defconfig +1 -1
index 4f04f583c738..93258d5b57ff 100644
@@ -62,8 +62,8 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_CRAMFS=y
 CONFIG_ROMFS_FS=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_SPINLOCK=y
arch/arm/configs/s5pv210_defconfig +1 -1
index 789e900a8a08..ab9fec22a825 100644
@@ -115,8 +115,8 @@ CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
 CONFIG_CRC_CCITT=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_RT_MUTEXES=y
arch/arm/configs/sama5_defconfig +3 -3
index 3a6a4851ef26..877bbe7b777e 100644
@@ -43,9 +43,6 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_NET_DSA=m
 CONFIG_VLAN_8021Q=m
 CONFIG_CAN=y
-CONFIG_CAN_AT91=y
-CONFIG_CAN_M_CAN=y
-CONFIG_CAN_M_CAN_PLATFORM=y
 CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_MAC80211_LEDS=y

@@ -90,6 +87,9 @@ CONFIG_MACB=y
 # CONFIG_NET_VENDOR_STMICRO is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 CONFIG_MICREL_PHY=y
+CONFIG_CAN_AT91=y
+CONFIG_CAN_M_CAN=y
+CONFIG_CAN_M_CAN_PLATFORM=y
 CONFIG_USB_LAN78XX=m
 CONFIG_LIBERTAS_THINFIRM=m
 CONFIG_LIBERTAS_THINFIRM_USB=m
arch/arm/configs/sama7_defconfig +2 -2
index 0384030d8b25..8803536854c6 100644
@@ -59,8 +59,6 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_NET_DSA=m
 CONFIG_VLAN_8021Q=m
 CONFIG_CAN=y
-CONFIG_CAN_M_CAN=y
-CONFIG_CAN_M_CAN_PLATFORM=y
 CONFIG_BT=y
 CONFIG_BT_RFCOMM=y
 CONFIG_BT_RFCOMM_TTY=y

@@ -107,6 +105,8 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
 CONFIG_MACB=y
 CONFIG_MICREL_PHY=y
+CONFIG_CAN_M_CAN=y
+CONFIG_CAN_M_CAN_PLATFORM=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
arch/arm/configs/shmobile_defconfig +1 -1
index a29bebb3742e..fa3b0031a72b 100644
@@ -33,7 +33,6 @@ CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_CAN=y
-CONFIG_CAN_RCAR=y
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_RCAR_GEN2=y

@@ -57,6 +56,7 @@ CONFIG_RAVB=y
 CONFIG_SMSC911X=y
 CONFIG_MICREL_PHY=y
 CONFIG_SMSC_PHY=y
+CONFIG_CAN_RCAR=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
arch/arm/configs/socfpga_defconfig +3 -3
index d91ae3f0d698..70739e09d0f4 100644
@@ -33,9 +33,6 @@ CONFIG_NETWORK_PHY_TIMESTAMPING=y
 CONFIG_VLAN_8021Q=y
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_CAN=y
-CONFIG_CAN_C_CAN=y
-CONFIG_CAN_C_CAN_PLATFORM=y
-CONFIG_CAN_DEBUG_DEVICES=y
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_PCIE_ALTERA=y

@@ -70,6 +67,9 @@ CONFIG_IXGBE=m
 CONFIG_STMMAC_ETH=y
 CONFIG_MARVELL_PHY=y
 CONFIG_MICREL_PHY=y
+CONFIG_CAN_C_CAN=y
+CONFIG_CAN_C_CAN_PLATFORM=y
+CONFIG_CAN_DEBUG_DEVICES=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_STMPE=y
arch/arm/configs/sp7021_defconfig +1 -1
index 703b9aaa40f0..aa7dfd670db5 100644
@@ -13,7 +13,6 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_RD_LZ4 is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_PERF_EVENTS=y
-CONFIG_SLAB=y
 CONFIG_ARCH_SUNPLUS=y
 # CONFIG_VDSO is not set
 CONFIG_SMP=y

@@ -25,6 +24,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_SLAB=y
 CONFIG_UEVENT_HELPER=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
arch/arm/configs/spear13xx_defconfig +1 -1
index 0227dd566c28..bfde0c86cdc5 100644
@@ -98,7 +98,7 @@ CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=m
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
arch/arm/configs/spear3xx_defconfig +1 -1
index 254d970a4011..a96ed5cf778e 100644
@@ -78,7 +78,7 @@ CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=m
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
arch/arm/configs/spear6xx_defconfig +1 -1
index 2809c4eb77e7..3d631b1f3cfa 100644
@@ -67,7 +67,7 @@ CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=m
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
arch/arm/configs/stm32_defconfig +1 -1
index 1f5446cda8b6..dc1a32f50b7e 100644
@@ -74,9 +74,9 @@ CONFIG_NLS=y
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC7=y
 CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_SCHED_DEBUG is not set
arch/arm/configs/sunxi_defconfig +1 -1
index 3d14827e0a31..06e91ee422fd 100644
@@ -26,7 +26,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
 CONFIG_CAN=y
-CONFIG_CAN_SUN4I=y
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y

@@ -52,6 +51,7 @@ CONFIG_STMMAC_ETH=y
 # CONFIG_NET_VENDOR_WIZNET is not set
 CONFIG_MICREL_PHY=y
 CONFIG_REALTEK_PHY=y
+CONFIG_CAN_SUN4I=y
 # CONFIG_WLAN is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_SUN4I_LRADC=y
arch/arm/configs/tegra_defconfig +1 -1
index 71400af6cef4..9c270e3cb9d9 100644
@@ -54,7 +54,6 @@ CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_TUNNEL=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_CAN=y
-CONFIG_CAN_MCP251X=y
 CONFIG_BT=y
 CONFIG_BT_RFCOMM=y
 CONFIG_BT_BNEP=y

@@ -99,6 +98,7 @@ CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
 CONFIG_IGB=y
 CONFIG_R8169=y
+CONFIG_CAN_MCP251X=y
 CONFIG_USB_PEGASUS=y
 CONFIG_USB_USBNET=y
 CONFIG_USB_NET_SMSC75XX=y
arch/arm/configs/vexpress_defconfig +1 -1
index 4e3a0133e4d3..ac3fd7523698 100644
@@ -133,8 +133,8 @@ CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 # CONFIG_CRYPTO_HW is not set
 CONFIG_DMA_CMA=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_SCHED_DEBUG is not set
Signature · 1 line
2.29.2
Reviewed-by on v1 1/11
#2 lore raw

Re: [PATCH 01/11] ARM: defconfig: reorder defconfig files

Quoted 11 lines · Arnd Bergmann

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

From: Arnd Bergmann <[email protected]>

The debug-info and can subystem options have moved around in the 'savedefconfig' output, so fix these up to reduce the clutter from the savedefconfig command.

Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/configs/at91_dt_defconfig   |  2 +-

[ ... ]

Quoted 2 lines
 arch/arm/configs/sama5_defconfig     |  6 +++---
 arch/arm/configs/sama7_defconfig     |  4 ++--

For AT91:

Reviewed-by Claudiu Beznea <[email protected]>

[ ... ]

Quoted 608 lines
 32 files changed, 46 insertions(+), 46 deletions(-)
arch/arm/configs/at91_dt_defconfig +1 -1
index da90ce9cd42e..5cc72266eaff 100644
@@ -40,7 +40,6 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_DIAG is not set
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_CAN=y
-CONFIG_CAN_AT91=y
 CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_DEVTMPFS=y

@@ -81,6 +80,7 @@ CONFIG_DM9000=y
 # CONFIG_NET_VENDOR_STMICRO is not set
 CONFIG_DAVICOM_PHY=y
 CONFIG_MICREL_PHY=y
+CONFIG_CAN_AT91=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_SDIO=m
 CONFIG_LIBERTAS_SPI=m
arch/arm/configs/dove_defconfig +1 -1
index 16ed5c110e8d..a9aa6458d46c 100644
@@ -116,7 +116,6 @@ CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_2=y
 CONFIG_NLS_UTF8=y
 CONFIG_TIMER_STATS=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_PCBC=m

@@ -136,6 +135,7 @@ CONFIG_CRC_CCITT=y
 CONFIG_LIBCRC32C=y
 CONFIG_PRINTK_TIME=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 # CONFIG_SCHED_DEBUG is not set
arch/arm/configs/exynos_defconfig +1 -1
index 1ce74f46e114..e3c99d40ffbc 100644
@@ -374,8 +374,8 @@ CONFIG_FONTS=y
 CONFIG_FONT_7x14=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
arch/arm/configs/imx_v6_v7_defconfig +1 -1
index 01012537a9b9..f692463da019 100644
@@ -65,7 +65,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_NETFILTER=y
 CONFIG_CAN=y
-CONFIG_CAN_FLEXCAN=y
 CONFIG_BT=y
 CONFIG_BT_BNEP=m
 CONFIG_BT_HCIUART=y

@@ -136,6 +135,7 @@ CONFIG_SMSC911X=y
 # CONFIG_NET_VENDOR_STMICRO is not set
 CONFIG_MICREL_PHY=y
 CONFIG_AT803X_PHY=y
+CONFIG_CAN_FLEXCAN=y
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=y
arch/arm/configs/keystone_defconfig +3 -3
index 68b89b90ca29..97f958d55019 100644
@@ -109,8 +109,6 @@ CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP_SCTP=y
 CONFIG_VLAN_8021Q=y
 CONFIG_CAN=m
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_DEVTMPFS=y

@@ -137,6 +135,8 @@ CONFIG_TI_KEYSTONE_NETCP_ETHSS=y
 CONFIG_MARVELL_PHY=y
 CONFIG_MICREL_PHY=y
 CONFIG_DP83867_PHY=y
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_GPIO_DECODER=m

@@ -224,7 +224,6 @@ CONFIG_NFSD=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_CRYPTO_USER=y
 CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_CBC=y

@@ -236,5 +235,6 @@ CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_DMA_CMA=y
 CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_SHIRQ=y
 CONFIG_DEBUG_USER=y
arch/arm/configs/lpc18xx_defconfig +1 -1
index 142c1700f450..56eae6a0a311 100644
@@ -150,9 +150,9 @@ CONFIG_JFFS2_FS=y
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC7=y
 CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 # CONFIG_SLUB_DEBUG is not set
arch/arm/configs/mmp2_defconfig +1 -1
index 4d39c615117b..7984640e994e 100644
@@ -73,10 +73,10 @@ CONFIG_ROOT_NFS=y
 CONFIG_CRC_CCITT=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_DYNAMIC_DEBUG is not set
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
arch/arm/configs/mps2_defconfig +1 -1
index 700568474549..3ed73f184d83 100644
@@ -94,9 +94,9 @@ CONFIG_NFS_V4_2=y
 CONFIG_ROOT_NFS=y
 CONFIG_NLS=y
 CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_FS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_SCHED_DEBUG is not set
arch/arm/configs/multi_v5_defconfig +1 -1
index e0be0e0023f3..5f3ed81228b0 100644
@@ -290,8 +290,8 @@ CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_DEV_MARVELL_CESA=y
 CONFIG_CRC_CCITT=y
 CONFIG_LIBCRC32C=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 # CONFIG_SCHED_DEBUG is not set
arch/arm/configs/multi_v7_defconfig +6 -6
index 12b35008571f..7ac539231a90 100644
@@ -167,12 +167,6 @@ CONFIG_NET_DSA=m
 CONFIG_QRTR=m
 CONFIG_QRTR_SMD=m
 CONFIG_CAN=y
-CONFIG_CAN_AT91=m
-CONFIG_CAN_FLEXCAN=m
-CONFIG_CAN_SUN4I=y
-CONFIG_CAN_XILINXCAN=y
-CONFIG_CAN_RCAR=m
-CONFIG_CAN_MCP251X=y
 CONFIG_BT=m
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_BCM=y

@@ -300,6 +294,12 @@ CONFIG_MARVELL_PHY=y
 CONFIG_AT803X_PHY=y
 CONFIG_ROCKCHIP_PHY=y
 CONFIG_DP83867_PHY=y
+CONFIG_CAN_AT91=m
+CONFIG_CAN_FLEXCAN=m
+CONFIG_CAN_SUN4I=y
+CONFIG_CAN_XILINXCAN=y
+CONFIG_CAN_RCAR=m
+CONFIG_CAN_MCP251X=y
 CONFIG_MDIO_MSCC_MIIM=m
 CONFIG_USB_PEGASUS=y
 CONFIG_USB_RTL8152=m
arch/arm/configs/mvebu_v5_defconfig +1 -1
index ef3a33ebc29a..587685182735 100644
@@ -184,13 +184,13 @@ CONFIG_NLS_CODEPAGE_850=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_2=y
 CONFIG_NLS_UTF8=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_DEV_MARVELL_CESA=y
 CONFIG_CRC_CCITT=y
 CONFIG_LIBCRC32C=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 # CONFIG_SCHED_DEBUG is not set
arch/arm/configs/mxs_defconfig +2 -2
index 155553ee06f4..6fbe93375998 100644
@@ -38,7 +38,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
 CONFIG_CAN=m
-CONFIG_CAN_FLEXCAN=m
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y

@@ -62,6 +61,7 @@ CONFIG_ICPLUS_PHY=y
 CONFIG_MICREL_PHY=y
 CONFIG_REALTEK_PHY=y
 CONFIG_SMSC_PHY=y
+CONFIG_CAN_FLEXCAN=m
 CONFIG_USB_USBNET=y
 CONFIG_USB_NET_SMSC95XX=y
 # CONFIG_WLAN is not set

@@ -163,8 +163,8 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CRC7=m
 CONFIG_FONTS=y
 CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_FRAME_WARN=2048
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
arch/arm/configs/omap1_defconfig +1 -1
index 54a9f50122af..28a5354bf801 100644
@@ -218,7 +218,6 @@ CONFIG_NLS_KOI8_R=y
 CONFIG_NLS_UTF8=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_SECURITY=y
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_PCBC=y

@@ -232,6 +231,7 @@ CONFIG_FONT_8x16=y
 CONFIG_FONT_6x11=y
 CONFIG_FONT_MINI_4x6=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_SPINLOCK=y
 CONFIG_DEBUG_MUTEXES=y
arch/arm/configs/omap2plus_defconfig +2 -2
index 99d015cf8919..e273365838cb 100644
@@ -249,8 +249,6 @@ CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_NET_SWITCHDEV=y
 CONFIG_CAN=m
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y

@@ -350,6 +348,8 @@ CONFIG_AT803X_PHY=y
 CONFIG_SMSC_PHY=y
 CONFIG_DP83848_PHY=y
 CONFIG_DP83867_PHY=y
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_DEFLATE=m
arch/arm/configs/orion5x_defconfig +1 -1
index 1311d9583fcc..22fde5ce5cf6 100644
@@ -138,9 +138,9 @@ CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_DEV_MARVELL_CESA=y
 CONFIG_CRC_T10DIF=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_SLUB_DEBUG is not set
 CONFIG_LATENCYTOP=y
 # CONFIG_FTRACE is not set
arch/arm/configs/pxa168_defconfig +1 -1
index 70d327895ccf..e4a004260c2e 100644
@@ -50,9 +50,9 @@ CONFIG_ROOT_NFS=y
 CONFIG_CRC_CCITT=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
arch/arm/configs/pxa910_defconfig +1 -1
index 5072bde71508..7adf90df6795 100644
@@ -58,9 +58,9 @@ CONFIG_ROOT_NFS=y
 CONFIG_CRC_CCITT=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
 CONFIG_DEBUG_MMP_UART2=y
arch/arm/configs/pxa_defconfig +1 -1
index 104a45722799..95c03ee20d28 100644
@@ -646,7 +646,6 @@ CONFIG_NLS_ASCII=m
 CONFIG_NLS_ISO8859_1=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_UTF8=m
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_TIMER_STATS=y
 CONFIG_SECURITY=y
 CONFIG_CRYPTO_MANAGER=y

@@ -682,6 +681,7 @@ CONFIG_FONT_6x11=y
 CONFIG_FONT_MINI_4x6=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_FRAME_WARN=0
 CONFIG_STRIP_ASM_SYMS=y
 CONFIG_MAGIC_SYSRQ=y
arch/arm/configs/s3c6400_defconfig +1 -1
index 4f04f583c738..93258d5b57ff 100644
@@ -62,8 +62,8 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_CRAMFS=y
 CONFIG_ROMFS_FS=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_SPINLOCK=y
arch/arm/configs/s5pv210_defconfig +1 -1
index 789e900a8a08..ab9fec22a825 100644
@@ -115,8 +115,8 @@ CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
 CONFIG_CRC_CCITT=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_RT_MUTEXES=y
arch/arm/configs/sama5_defconfig +3 -3
index 3a6a4851ef26..877bbe7b777e 100644
@@ -43,9 +43,6 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_NET_DSA=m
 CONFIG_VLAN_8021Q=m
 CONFIG_CAN=y
-CONFIG_CAN_AT91=y
-CONFIG_CAN_M_CAN=y
-CONFIG_CAN_M_CAN_PLATFORM=y
 CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_MAC80211_LEDS=y

@@ -90,6 +87,9 @@ CONFIG_MACB=y
 # CONFIG_NET_VENDOR_STMICRO is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 CONFIG_MICREL_PHY=y
+CONFIG_CAN_AT91=y
+CONFIG_CAN_M_CAN=y
+CONFIG_CAN_M_CAN_PLATFORM=y
 CONFIG_USB_LAN78XX=m
 CONFIG_LIBERTAS_THINFIRM=m
 CONFIG_LIBERTAS_THINFIRM_USB=m
arch/arm/configs/sama7_defconfig +2 -2
index 0384030d8b25..8803536854c6 100644
@@ -59,8 +59,6 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_NET_DSA=m
 CONFIG_VLAN_8021Q=m
 CONFIG_CAN=y
-CONFIG_CAN_M_CAN=y
-CONFIG_CAN_M_CAN_PLATFORM=y
 CONFIG_BT=y
 CONFIG_BT_RFCOMM=y
 CONFIG_BT_RFCOMM_TTY=y

@@ -107,6 +105,8 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
 CONFIG_MACB=y
 CONFIG_MICREL_PHY=y
+CONFIG_CAN_M_CAN=y
+CONFIG_CAN_M_CAN_PLATFORM=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
arch/arm/configs/shmobile_defconfig +1 -1
index a29bebb3742e..fa3b0031a72b 100644
@@ -33,7 +33,6 @@ CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_CAN=y
-CONFIG_CAN_RCAR=y
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_RCAR_GEN2=y

@@ -57,6 +56,7 @@ CONFIG_RAVB=y
 CONFIG_SMSC911X=y
 CONFIG_MICREL_PHY=y
 CONFIG_SMSC_PHY=y
+CONFIG_CAN_RCAR=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
arch/arm/configs/socfpga_defconfig +3 -3
index d91ae3f0d698..70739e09d0f4 100644
@@ -33,9 +33,6 @@ CONFIG_NETWORK_PHY_TIMESTAMPING=y
 CONFIG_VLAN_8021Q=y
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_CAN=y
-CONFIG_CAN_C_CAN=y
-CONFIG_CAN_C_CAN_PLATFORM=y
-CONFIG_CAN_DEBUG_DEVICES=y
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_PCIE_ALTERA=y

@@ -70,6 +67,9 @@ CONFIG_IXGBE=m
 CONFIG_STMMAC_ETH=y
 CONFIG_MARVELL_PHY=y
 CONFIG_MICREL_PHY=y
+CONFIG_CAN_C_CAN=y
+CONFIG_CAN_C_CAN_PLATFORM=y
+CONFIG_CAN_DEBUG_DEVICES=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_STMPE=y
arch/arm/configs/sp7021_defconfig +1 -1
index 703b9aaa40f0..aa7dfd670db5 100644
@@ -13,7 +13,6 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_RD_LZ4 is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_PERF_EVENTS=y
-CONFIG_SLAB=y
 CONFIG_ARCH_SUNPLUS=y
 # CONFIG_VDSO is not set
 CONFIG_SMP=y

@@ -25,6 +24,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_SLAB=y
 CONFIG_UEVENT_HELPER=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
arch/arm/configs/spear13xx_defconfig +1 -1
index 0227dd566c28..bfde0c86cdc5 100644
@@ -98,7 +98,7 @@ CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=m
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
arch/arm/configs/spear3xx_defconfig +1 -1
index 254d970a4011..a96ed5cf778e 100644
@@ -78,7 +78,7 @@ CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=m
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
arch/arm/configs/spear6xx_defconfig +1 -1
index 2809c4eb77e7..3d631b1f3cfa 100644
@@ -67,7 +67,7 @@ CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=m
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
arch/arm/configs/stm32_defconfig +1 -1
index 1f5446cda8b6..dc1a32f50b7e 100644
@@ -74,9 +74,9 @@ CONFIG_NLS=y
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC7=y
 CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_SCHED_DEBUG is not set
arch/arm/configs/sunxi_defconfig +1 -1
index 3d14827e0a31..06e91ee422fd 100644
@@ -26,7 +26,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
 CONFIG_CAN=y
-CONFIG_CAN_SUN4I=y
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y

@@ -52,6 +51,7 @@ CONFIG_STMMAC_ETH=y
 # CONFIG_NET_VENDOR_WIZNET is not set
 CONFIG_MICREL_PHY=y
 CONFIG_REALTEK_PHY=y
+CONFIG_CAN_SUN4I=y
 # CONFIG_WLAN is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_SUN4I_LRADC=y
arch/arm/configs/tegra_defconfig +1 -1
index 71400af6cef4..9c270e3cb9d9 100644
@@ -54,7 +54,6 @@ CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_TUNNEL=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_CAN=y
-CONFIG_CAN_MCP251X=y
 CONFIG_BT=y
 CONFIG_BT_RFCOMM=y
 CONFIG_BT_BNEP=y

@@ -99,6 +98,7 @@ CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
 CONFIG_IGB=y
 CONFIG_R8169=y
+CONFIG_CAN_MCP251X=y
 CONFIG_USB_PEGASUS=y
 CONFIG_USB_USBNET=y
 CONFIG_USB_NET_SMSC75XX=y
arch/arm/configs/vexpress_defconfig +1 -2
index 4e3a0133e4d3..ac3fd7523698 100644
@@ -133,8 +133,8 @@ CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 # CONFIG_CRYPTO_HW is not set
 CONFIG_DMA_CMA=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_SCHED_DEBUG is not set
--

2.29.2

#3 lore raw

Re: [PATCH 01/11] ARM: defconfig: reorder defconfig files

In reply to Arnd Bergmann

Hi Arnd,

Quoted 7 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

The debug-info and can subystem options have moved around in the 'savedefconfig' output, so fix these up to reduce the clutter from the savedefconfig command.

Signed-off-by Arnd Bergmann <[email protected]>

Thanks for your patch!

Quoted 11 lines
arch/arm/configs/shmobile_defconfig +0 -1
@@ -33,7 +33,6 @@ CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_CAN=y
-CONFIG_CAN_RCAR=y
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_RCAR_GEN2=y

arch/arm/configs/shmobile_defconfig CONFIG_RAVB=y · line 62

Quoted 7 lines
arch/arm/configs/shmobile_defconfig +1 -0
@@ -57,6 +56,7 @@ CONFIG_RAVB=y
 CONFIG_SMSC911X=y
 CONFIG_MICREL_PHY=y
 CONFIG_SMSC_PHY=y
+CONFIG_CAN_RCAR=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set

This may cause conflicts with the usual refresh I plan to do for v6.0-rc1, which will be very similar to
https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git/commit/?id=517d634d376042ab797d9feeb94236ad4cb03396
So it may be better to drop this part.

However, that decision is up to you, as you will have to handle the conflict when merging renesas-arm-defconfig-for-v6.0-tag1 later ;-) But sfr might complain before...

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

author
#4 lore raw

Re: [PATCH 01/11] ARM: defconfig: reorder defconfig files

Quoted 9 lines · Geert Uytterhoeven

This may cause conflicts with the usual refresh I plan to do for v6.0-rc1, which will be very similar to
https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git/commit/?id=517d634d376042ab797d9feeb94236ad4cb03396
So it may be better to drop this part.

However, that decision is up to you, as you will have to handle the conflict when merging renesas-arm-defconfig-for-v6.0-tag1 later ;-) But sfr might complain before...

I'm not too worried here, if you just do the 'savedefconfig' step, you should get
the same change and the mergetool will figure it out. In case there is a nasty context conflict, you could just send that part early so I can resolve it.

Arnd

maintainer Acked-by on v1 1/11
#5 lore raw

Re: [PATCH 01/11] ARM: defconfig: reorder defconfig files

In reply to Arnd Bergmann

Dne četrtek, 18. avgust 2022 ob 15:55:22 CEST je Arnd Bergmann napisal(a):

Quoted 30 lines

From: Arnd Bergmann <[email protected]>

The debug-info and can subystem options have moved around in the 'savedefconfig' output, so fix these up to reduce the clutter from the savedefconfig command.

Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/configs/at91_dt_defconfig   |  2 +-
 arch/arm/configs/dove_defconfig      |  2 +-
 arch/arm/configs/exynos_defconfig    |  2 +-
 arch/arm/configs/imx_v6_v7_defconfig |  2 +-
 arch/arm/configs/keystone_defconfig  |  6 +++---
 arch/arm/configs/lpc18xx_defconfig   |  2 +-
 arch/arm/configs/mmp2_defconfig      |  2 +-
 arch/arm/configs/mps2_defconfig      |  2 +-
 arch/arm/configs/multi_v5_defconfig  |  2 +-
 arch/arm/configs/multi_v7_defconfig  | 12 ++++++------
 arch/arm/configs/mvebu_v5_defconfig  |  2 +-
 arch/arm/configs/mxs_defconfig       |  4 ++--
 arch/arm/configs/omap1_defconfig     |  2 +-
 arch/arm/configs/omap2plus_defconfig |  4 ++--
 arch/arm/configs/orion5x_defconfig   |  2 +-
 arch/arm/configs/pxa168_defconfig    |  2 +-
 arch/arm/configs/pxa910_defconfig    |  2 +-
 arch/arm/configs/pxa_defconfig       |  2 +-
 arch/arm/configs/s3c6400_defconfig   |  2 +-
 arch/arm/configs/s5pv210_defconfig   |  2 +-
 arch/arm/configs/sama5_defconfig     |  6 +++---
 arch/arm/configs/sama7_defconfig     |  4 ++--
Quoted 8 lines
 arch/arm/configs/shmobile_defconfig  |  2 +-
 arch/arm/configs/socfpga_defconfig   |  6 +++---
 arch/arm/configs/sp7021_defconfig    |  2 +-
 arch/arm/configs/spear13xx_defconfig |  2 +-
 arch/arm/configs/spear3xx_defconfig  |  2 +-
 arch/arm/configs/spear6xx_defconfig  |  2 +-
 arch/arm/configs/stm32_defconfig     |  2 +-
 arch/arm/configs/sunxi_defconfig     |  2 +-

For sunxi:

Acked-by Jernej Skrabec <[email protected]>

Best regards,
Jernej

author
#6 lore raw

PATCH 2/11 ARM: defconfig: clean up multi_v4t and multi_v5 configs

In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>

Integrator now selects the regulators and versatile selects the reset driver, so the correspondig options can be dropped from the defconfig files.

Fixes d2854bbe5f5c ("ARM: integrator: Add some Kconfig selections")
Fixes 1c6e288da6cc ("ARM: versatile: move restart to the device tree")
Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/configs/multi_v4t_defconfig | 2 --
 arch/arm/configs/multi_v5_defconfig  | 1 -
 2 files changed, 3 deletions(-)
arch/arm/configs/multi_v4t_defconfig +0 -2
index 6c3e45b71ab5..e2fd822f741a 100644
@@ -71,8 +71,6 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 CONFIG_WATCHDOG=y
 CONFIG_GPIO_WATCHDOG=y
 CONFIG_AT91RM9200_WATCHDOG=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_GPIO=y
 CONFIG_FB=y
 CONFIG_FB_CLPS711X=y
arch/arm/configs/multi_v5_defconfig +0 -1
index 5f3ed81228b0..a65f32a78885 100644
@@ -149,7 +149,6 @@ CONFIG_SPI_SUN6I=y
 CONFIG_GPIO_ASPEED=m
 CONFIG_GPIO_ASPEED_SGPIO=y
 CONFIG_GPIO_MXC=y
-CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_QNAP=y
 CONFIG_SENSORS_ADT7475=y
Signature · 1 line
2.29.2
author
#7 lore raw

PATCH 3/11 ARM: defconfig: drop CONFIG_NET_VENDOR_ASIX=y

From: Arnd Bergmann <[email protected]>

This option is 'default y' and has always been this way, the line was added in error.

Fixes dfe21dcabac0 ("ARM: defconfig: Enable ax88796c driver for Exynos boards")
Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/configs/multi_v7_defconfig | 1 -
 1 file changed, 1 deletion(-)
arch/arm/configs/multi_v7_defconfig +0 -1
index 7ac539231a90..ecf743b3409d 100644
@@ -254,7 +254,6 @@ CONFIG_SATA_HIGHBANK=y
 CONFIG_SATA_MV=y
 CONFIG_SATA_RCAR=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_VENDOR_ASIX=y
 CONFIG_VIRTIO_NET=y
 CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_MDIO_DRIVER=m
Signature · 1 line
2.29.2
author
#8 lore raw

PATCH 4/11 ARM: defconfig: drop CONFIG_SERIAL_OMAP references

In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>

This driver is mutually exclusive with the new 8250_OMAP driver, so 'make defconfig' turns it off already. Drop the reference now.

Fixes 077e1cde78c3 ("ARM: omap2plus_defconfig: Enable 8250_OMAP")
Fixes f98d45145e6a ("ARM: multi_v7_defconfig: Enable 8250-omap serial driver and use it by default")
Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/configs/multi_v7_defconfig  | 2 --
 arch/arm/configs/omap2plus_defconfig | 2 --
 2 files changed, 4 deletions(-)
arch/arm/configs/multi_v7_defconfig +0 -2
index ecf743b3409d..4cfe795981c8 100644
@@ -377,8 +377,6 @@ CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_SERIAL_VT8500=y
 CONFIG_SERIAL_VT8500_CONSOLE=y
-CONFIG_SERIAL_OMAP=y
-CONFIG_SERIAL_OMAP_CONSOLE=y
 CONFIG_SERIAL_BCM63XX=y
 CONFIG_SERIAL_BCM63XX_CONSOLE=y
 CONFIG_SERIAL_XILINX_PS_UART=y
arch/arm/configs/omap2plus_defconfig +0 -2
index e273365838cb..89cda0877c52 100644
@@ -419,8 +419,6 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_OMAP=y
 CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_OMAP=y
-CONFIG_SERIAL_OMAP_CONSOLE=y
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_SPI=y
Signature · 1 line
2.29.2
maintainer Acked-by on v1 4/11
#9 lore raw

Re: [PATCH 04/11] ARM: defconfig: drop CONFIG_SERIAL_OMAP references

Quoted 5 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

This driver is mutually exclusive with the new 8250_OMAP driver, so 'make defconfig' turns it off already. Drop the reference now.

Acked-by Tony Lindgren <[email protected]>
author
#10 lore raw

PATCH 5/11 ARM: defconfig: drop CONFIG_DRM_RCAR_LVDS

In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>

This is now a hidden symbol, so just drop the defconfig line.

Fixes 42d95d1b3a9c ("drm/rcar: stop using 'imply' for dependencies")
Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/configs/multi_v7_defconfig | 1 -
 1 file changed, 1 deletion(-)
arch/arm/configs/multi_v7_defconfig +0 -1
index 4cfe795981c8..b3669cf855b3 100644
@@ -713,7 +713,6 @@ CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_DRM_ATMEL_HLCDC=m
 CONFIG_DRM_RCAR_DU=m
-CONFIG_DRM_RCAR_LVDS=y
 CONFIG_DRM_SUN4I=m
 CONFIG_DRM_MSM=m
 CONFIG_DRM_FSL_DCU=m
Signature · 1 line
2.29.2
author
#11 lore raw

PATCH 6/11 ARM: defconfig: drop CONFIG_PTP_1588_CLOCK=y

In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>

PTP support is now enabled by default for configurations with ethernet support, so drop the redundant entries in defconfig files.

Fixes e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies")
Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/configs/keystone_defconfig  | 1 -
 arch/arm/configs/multi_v7_defconfig  | 1 -
 arch/arm/configs/omap2plus_defconfig | 1 -
 3 files changed, 3 deletions(-)
arch/arm/configs/keystone_defconfig +0 -1
index 97f958d55019..4a5b9adbf2a1 100644
@@ -152,7 +152,6 @@ CONFIG_SPI=y
 CONFIG_SPI_CADENCE_QUADSPI=y
 CONFIG_SPI_DAVINCI=y
 CONFIG_SPI_SPIDEV=y
-CONFIG_PTP_1588_CLOCK=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
arch/arm/configs/multi_v7_defconfig +0 -1
index b3669cf855b3..a523591798cb 100644
@@ -462,7 +462,6 @@ CONFIG_SPI_TEGRA20_SLINK=y
 CONFIG_SPI_XILINX=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_SPMI=y
-CONFIG_PTP_1588_CLOCK=y
 CONFIG_PINCTRL_AS3722=y
 CONFIG_PINCTRL_MICROCHIP_SGPIO=y
 CONFIG_PINCTRL_OCELOT=y
arch/arm/configs/omap2plus_defconfig +0 -1
index 89cda0877c52..39c89576ab2b 100644
@@ -428,7 +428,6 @@ CONFIG_SPI_TI_QSPI=m
 CONFIG_HSI=m
 CONFIG_OMAP_SSI=m
 CONFIG_SSI_PROTOCOL=m
-CONFIG_PTP_1588_CLOCK=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
Signature · 1 line
2.29.2
author
#13 lore raw

PATCH 7/11 ARM: defconfig: drop CONFIG_SND_SOC_FSL_SAI

In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>

This is selected by CONFIG_SND_SOC_FSL_ASOC_CARD=m, so the extra line is redundant.

Fixes 212e3b6b8734 ("ARM: configs: Enable more audio support for i.MX")
Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/configs/multi_v7_defconfig | 1 -
 1 file changed, 1 deletion(-)
arch/arm/configs/multi_v7_defconfig +0 -1
index a523591798cb..7af627a816ec 100644
@@ -778,7 +778,6 @@ CONFIG_SND_ATMEL_SOC_I2S=m
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_IMX_SOC=m
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
-CONFIG_SND_SOC_FSL_SAI=m
 CONFIG_SND_PXA_SOC_SSP=m
 CONFIG_SND_MMP_SOC_SSPA=m
 CONFIG_SND_PXA910_SOC=m
Signature · 1 line
2.29.2
author
#14 lore raw

PATCH 8/11 ARM: defconfig: drop CONFIG_USB_FSL_USB2

In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>

USB_FSL_USB2 is no longer available for Arm platforms and was replaced by the chipidea driver.

Fixes a390bef7db1f ("usb: gadget: fsl_mxc_udc: Remove the driver")
Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/configs/multi_v7_defconfig | 1 -
 1 file changed, 1 deletion(-)
arch/arm/configs/multi_v7_defconfig +0 -1
index 7af627a816ec..1cb293adecb1 100644
@@ -869,7 +869,6 @@ CONFIG_USB_GPIO_VBUS=y
 CONFIG_USB_ISP1301=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_FSL_USB2=y
 CONFIG_USB_RENESAS_USBHS_UDC=m
 CONFIG_USB_ASPEED_VHUB=m
 CONFIG_USB_CONFIGFS=m
Signature · 1 line
2.29.2
maintainer Acked-by on v1 8/11
#15 lore raw

Re: [PATCH 08/11] ARM: defconfig: drop CONFIG_USB_FSL_USB2

Quoted 26 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

USB_FSL_USB2 is no longer available for Arm platforms and was replaced by the chipidea driver.

Fixes a390bef7db1f ("usb: gadget: fsl_mxc_udc: Remove the driver")
Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/configs/multi_v7_defconfig | 1 -
 1 file changed, 1 deletion(-)
arch/arm/configs/multi_v7_defconfig +0 -1
index 7af627a816ec..1cb293adecb1 100644
@@ -869,7 +869,6 @@ CONFIG_USB_GPIO_VBUS=y
 CONFIG_USB_ISP1301=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_FSL_USB2=y
 CONFIG_USB_RENESAS_USBHS_UDC=m
 CONFIG_USB_ASPEED_VHUB=m
 CONFIG_USB_CONFIGFS=m
Signature · 1 line
2.29.2
Acked-by Greg Kroah-Hartman <[email protected]>
author
#16 lore raw

PATCH 9/11 ARM: defconfig: drop CONFIG_MICROCHIP_PIT64B

In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>

This is now default-enabled when CONFIG_SOC_SAMA7 is used, so the defconfig entry can be dropped.

Fixes f611af4c3bfa ("ARM: at91: Kconfig: implement PIT64B selection")
Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/configs/multi_v7_defconfig | 1 -
 1 file changed, 1 deletion(-)
arch/arm/configs/multi_v7_defconfig +0 -1
index 1cb293adecb1..2b564defe33e 100644
@@ -1044,7 +1044,6 @@ CONFIG_MSM_MMCC_8960=y
 CONFIG_MSM_MMCC_8974=y
 CONFIG_HWSPINLOCK=y
 CONFIG_HWSPINLOCK_QCOM=y
-CONFIG_MICROCHIP_PIT64B=y
 CONFIG_BCM2835_MBOX=y
 CONFIG_QCOM_APCS_IPC=y
 CONFIG_QCOM_IPCC=y
Signature · 1 line
2.29.2
Acked-by on v1 9/11
#17 lore raw

Re: [PATCH 09/11] ARM: defconfig: drop CONFIG_MICROCHIP_PIT64B

Quoted 9 lines · Arnd Bergmann

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

From: Arnd Bergmann <[email protected]>

This is now default-enabled when CONFIG_SOC_SAMA7 is used, so the defconfig entry can be dropped.

Fixes f611af4c3bfa ("ARM: at91: Kconfig: implement PIT64B selection")
Signed-off-by Arnd Bergmann <[email protected]>
Acked-by Claudiu Beznea <[email protected]>
Quoted 19 lines
---
 arch/arm/configs/multi_v7_defconfig | 1 -
 1 file changed, 1 deletion(-)
arch/arm/configs/multi_v7_defconfig +0 -2
index 1cb293adecb1..2b564defe33e 100644
@@ -1044,7 +1044,6 @@ CONFIG_MSM_MMCC_8960=y
 CONFIG_MSM_MMCC_8974=y
 CONFIG_HWSPINLOCK=y
 CONFIG_HWSPINLOCK_QCOM=y
-CONFIG_MICROCHIP_PIT64B=y
 CONFIG_BCM2835_MBOX=y
 CONFIG_QCOM_APCS_IPC=y
 CONFIG_QCOM_IPCC=y
--

2.29.2

author
#18 lore raw

PATCH 10/11 ARM: defconfig: fix CONFIG_SND_SOC_AC97_CODEC name

In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>

The CONFIG_SND_SOC_AC97 symbol was recently enabled but does not actually exist. From the patch description, I assume that this was meant to be CONFIG_SND_SOC_AC97_CODEC, which is used in imx_v6_v7_defconfig.

Fixes 2cc1cd26e913 ("ARM: configs: Enable ASoC AC'97 glue")
Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/configs/multi_v7_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/configs/multi_v7_defconfig +1 -1
index 2b564defe33e..af79b21e2000 100644
@@ -814,7 +814,7 @@ CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
 CONFIG_SND_SOC_TEGRA_ALC5632=m
 CONFIG_SND_SOC_TEGRA_MAX98090=m
 CONFIG_SND_SOC_DAVINCI_MCASP=m
-CONFIG_SND_SOC_AC97=m
+CONFIG_SND_SOC_AC97_CODEC=m
 CONFIG_SND_SOC_AK4642=m
 CONFIG_SND_SOC_CPCAP=m
 CONFIG_SND_SOC_CS42L51_I2C=m
Signature · 1 line
2.29.2
author
#19 lore raw

PATCH 11/11 musb: fix USB_MUSB_TUSB6010 dependency

In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>

Turning on NOP_USB_XCEIV as builtin broke the TUSB6010 driver because of an older issue with the depencency.

It is not necessary to forbid NOP_USB_XCEIV=y in combination with USB_MUSB_HDRC=m, but only the reverse, which causes the link failure from the original Kconfig change.

Use the correct dependency to still allow NOP_USB_XCEIV=n or NOP_USB_XCEIV=y but forbid NOP_USB_XCEIV=m when USB_MUSB_HDRC=m to fix the multi_v7_defconfig for tusb.

Fixes ab37a7a890c1 ("ARM: multi_v7_defconfig: Make NOP_USB_XCEIV driver built-in")
Fixes c0442479652b ("usb: musb: Fix randconfig build issues for Kconfig options")
Signed-off-by Arnd Bergmann <[email protected]>
---
 drivers/usb/musb/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/musb/Kconfig +1 -1
index f906dfd360d3..6c8f7763e75e 100644
@@ -86,7 +86,7 @@ config USB_MUSB_TUSB6010
 	tristate "TUSB6010"
 	depends on HAS_IOMEM
 	depends on ARCH_OMAP2PLUS || COMPILE_TEST
-	depends on NOP_USB_XCEIV = USB_MUSB_HDRC # both built-in or both modules
+	depends on NOP_USB_XCEIV!=m || USB_MUSB_HDRC=m
 
 config USB_MUSB_OMAP2PLUS
 	tristate "OMAP2430 and onwards"
Signature · 1 line
2.29.2
maintainer Reviewed-by on v1 11/11
#20 lore raw

Re: [PATCH 11/11] musb: fix USB_MUSB_TUSB6010 dependency

Quoted 13 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

Turning on NOP_USB_XCEIV as builtin broke the TUSB6010 driver because of an older issue with the depencency.

It is not necessary to forbid NOP_USB_XCEIV=y in combination with USB_MUSB_HDRC=m, but only the reverse, which causes the link failure from the original Kconfig change.

Use the correct dependency to still allow NOP_USB_XCEIV=n or NOP_USB_XCEIV=y but forbid NOP_USB_XCEIV=m when USB_MUSB_HDRC=m to fix the multi_v7_defconfig for tusb.

Quoted 6 lines
Fixes ab37a7a890c1 ("ARM: multi_v7_defconfig: Make NOP_USB_XCEIV driver built-in")
Fixes c0442479652b ("usb: musb: Fix randconfig build issues for Kconfig options")
Signed-off-by Arnd Bergmann <[email protected]>
---
 drivers/usb/musb/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Want me to take this through my tree now? If so, I can, otherwise here's a:

Reviewed-by Greg Kroah-Hartman <[email protected]>

for your tree.

thanks,

greg k-h

author
#21 lore raw

Re: [PATCH 11/11] musb: fix USB_MUSB_TUSB6010 dependency

Quoted 15 lines · Greg Kroah-Hartman
Quoted 13 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

Turning on NOP_USB_XCEIV as builtin broke the TUSB6010 driver because of an older issue with the depencency.

It is not necessary to forbid NOP_USB_XCEIV=y in combination with USB_MUSB_HDRC=m, but only the reverse, which causes the link failure from the original Kconfig change.

Use the correct dependency to still allow NOP_USB_XCEIV=n or NOP_USB_XCEIV=y but forbid NOP_USB_XCEIV=m when USB_MUSB_HDRC=m to fix the multi_v7_defconfig for tusb.

Quoted 8 lines
Quoted 6 lines
Fixes ab37a7a890c1 ("ARM: multi_v7_defconfig: Make NOP_USB_XCEIV driver built-in")
Fixes c0442479652b ("usb: musb: Fix randconfig build issues for Kconfig options")
Signed-off-by Arnd Bergmann <[email protected]>
---
 drivers/usb/musb/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Want me to take this through my tree now?

Yes, please do.

Thanks,

Arnd

maintainer
#22 lore raw

Re: [PATCH 11/11] musb: fix USB_MUSB_TUSB6010 dependency

Quoted 24 lines · Arnd Bergmann
Quoted 22 lines · Greg Kroah-Hartman
Quoted 19 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

Turning on NOP_USB_XCEIV as builtin broke the TUSB6010 driver because of an older issue with the depencency.

It is not necessary to forbid NOP_USB_XCEIV=y in combination with USB_MUSB_HDRC=m, but only the reverse, which causes the link failure from the original Kconfig change.

Use the correct dependency to still allow NOP_USB_XCEIV=n or NOP_USB_XCEIV=y but forbid NOP_USB_XCEIV=m when USB_MUSB_HDRC=m to fix the multi_v7_defconfig for tusb.

Fixes ab37a7a890c1 ("ARM: multi_v7_defconfig: Make NOP_USB_XCEIV driver built-in")
Fixes c0442479652b ("usb: musb: Fix randconfig build issues for Kconfig options")
Signed-off-by Arnd Bergmann <[email protected]>
---
 drivers/usb/musb/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 3 lines
Quoted 1 line

Want me to take this through my tree now?

Yes, please do.

Now done, thanks!

Reviewed-by on v1 2/11
#23 lore raw

Re: [PATCH 02/11] ARM: defconfig: clean up multi_v4t and multi_v5 configs

In reply to Arnd Bergmann
Quoted 9 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

Integrator now selects the regulators and versatile selects the reset driver, so the correspondig options can be dropped from the defconfig files.

Fixes d2854bbe5f5c ("ARM: integrator: Add some Kconfig selections")
Fixes 1c6e288da6cc ("ARM: versatile: move restart to the device tree")
Signed-off-by Arnd Bergmann <[email protected]>
Reviewed-by Linus Walleij <[email protected]>

Yours,
Linus Walleij

#24 lore raw
In reply to Arnd Bergmann
Quoted 21 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

I have continued the cleanup of the multi_*_defconfig files, and reordered the other files according to the 'make savedefconfig' output as before.

I would like to queue these up for 6.1, though the last two should probably be considered bugfixes and merged for 6.0.

Since a third of the defconfig files are for machines that are now marked as unused, I skipped those files. There are still a few things that get removed by 'make savedefconfig' as they now get selected by some driver:

(quoted diff) +0 -5
-CONFIG_SERIAL_BCM63XX=y
-CONFIG_SND_AUDIO_GRAPH_CARD=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_TEGRA20_APB_DMA=y
Quoted 2 lines

I think for those we should follow up with patches to remove the 'select' statements.

I dropped the last patch that Greg has already picked up, and merged the rest into the arm/defconfig branch of the soc tree.

Thanks for the Acks.

Arnd