| Message ID | 20220721141325.2413920-1-arnd@kernel.org |
|---|---|
| Headers | show |
| Series | ARM: defconfig cleanups | expand |
On Thu, Jul 21, 2022 at 4:13 PM Arnd Bergmann <arnd@kernel.org> wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > A lot of Kconfig options have changed over the years, and we tend > to not do a blind 'make defconfig' to refresh the files, to ensure > we catch options that should not have gone away. > > I used some a bit of scripting to only rework the bits where an > option moved around in any of the defconfig files, without also > dropping any of the other lines, to make it clearer which options > we no longer have. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Apparently this patch got a little large and was rejected by some of the mailing lists, in case someone wonders what happened. Fortunately the contents don't actually matter here, as I'm just reordering the lines as seen in the diffstat. Arnd > --- > arch/arm/configs/am200epdkit_defconfig | 26 ++--- > arch/arm/configs/aspeed_g4_defconfig | 16 +-- > arch/arm/configs/aspeed_g5_defconfig | 16 +-- > arch/arm/configs/assabet_defconfig | 8 +- > arch/arm/configs/at91_dt_defconfig | 10 +- > arch/arm/configs/axm55xx_defconfig | 22 ++-- > arch/arm/configs/badge4_defconfig | 8 +- > arch/arm/configs/bcm2835_defconfig | 36 +++---- > arch/arm/configs/cerfcube_defconfig | 16 +-- > arch/arm/configs/clps711x_defconfig | 2 +- > arch/arm/configs/cm_x300_defconfig | 26 ++--- > arch/arm/configs/cns3420vb_defconfig | 18 ++-- > arch/arm/configs/colibri_pxa270_defconfig | 32 +++--- > arch/arm/configs/colibri_pxa300_defconfig | 10 +- > arch/arm/configs/collie_defconfig | 20 ++-- > arch/arm/configs/corgi_defconfig | 44 ++++---- > arch/arm/configs/davinci_all_defconfig | 26 ++--- > arch/arm/configs/dove_defconfig | 28 ++--- > arch/arm/configs/ep93xx_defconfig | 16 +-- > arch/arm/configs/eseries_pxa_defconfig | 26 ++--- > arch/arm/configs/exynos_defconfig | 20 ++-- > arch/arm/configs/ezx_defconfig | 72 ++++++------- > arch/arm/configs/footbridge_defconfig | 14 +-- > arch/arm/configs/h3600_defconfig | 10 +- > arch/arm/configs/h5000_defconfig | 18 ++-- > arch/arm/configs/hackkit_defconfig | 4 +- > arch/arm/configs/hisi_defconfig | 24 ++--- > arch/arm/configs/imx_v4_v5_defconfig | 8 +- > arch/arm/configs/imx_v6_v7_defconfig | 8 +- > arch/arm/configs/integrator_defconfig | 2 +- > arch/arm/configs/iop32x_defconfig | 20 ++-- > arch/arm/configs/jornada720_defconfig | 10 +- > arch/arm/configs/keystone_defconfig | 62 +++++------ > arch/arm/configs/lart_defconfig | 6 +- > arch/arm/configs/lpc18xx_defconfig | 12 +-- > arch/arm/configs/lpc32xx_defconfig | 8 +- > arch/arm/configs/lpd270_defconfig | 6 +- > arch/arm/configs/lubbock_defconfig | 10 +- > arch/arm/configs/magician_defconfig | 30 +++--- > arch/arm/configs/mainstone_defconfig | 4 +- > arch/arm/configs/milbeaut_m10v_defconfig | 6 +- > arch/arm/configs/mini2440_defconfig | 6 +- > arch/arm/configs/mmp2_defconfig | 28 ++--- > arch/arm/configs/moxart_defconfig | 18 ++-- > arch/arm/configs/mps2_defconfig | 14 +-- > arch/arm/configs/multi_v4t_defconfig | 4 +- > arch/arm/configs/multi_v5_defconfig | 12 +-- > arch/arm/configs/multi_v7_defconfig | 62 +++++------ > arch/arm/configs/mv78xx0_defconfig | 32 +++--- > arch/arm/configs/mvebu_v5_defconfig | 28 ++--- > arch/arm/configs/mvebu_v7_defconfig | 2 +- > arch/arm/configs/mxs_defconfig | 4 +- > arch/arm/configs/neponset_defconfig | 24 ++--- > arch/arm/configs/netwinder_defconfig | 10 +- > arch/arm/configs/nhk8815_defconfig | 6 +- > arch/arm/configs/omap1_defconfig | 74 ++++++------- > arch/arm/configs/omap2plus_defconfig | 16 +--
Dne četrtek, 21. julij 2022 ob 16:13:20 CEST je Arnd Bergmann napisal(a): > From: Arnd Bergmann <arnd@arndb.de> > > A lot of Kconfig options have changed over the years, and we tend > to not do a blind 'make defconfig' to refresh the files, to ensure > we catch options that should not have gone away. > > I used some a bit of scripting to only rework the bits where an > option moved around in any of the defconfig files, without also > dropping any of the other lines, to make it clearer which options > we no longer have. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/arm/configs/am200epdkit_defconfig | 26 ++--- > arch/arm/configs/aspeed_g4_defconfig | 16 +-- > arch/arm/configs/aspeed_g5_defconfig | 16 +-- > arch/arm/configs/assabet_defconfig | 8 +- > arch/arm/configs/at91_dt_defconfig | 10 +- > arch/arm/configs/axm55xx_defconfig | 22 ++-- > arch/arm/configs/badge4_defconfig | 8 +- > arch/arm/configs/bcm2835_defconfig | 36 +++---- > arch/arm/configs/cerfcube_defconfig | 16 +-- > arch/arm/configs/clps711x_defconfig | 2 +- > arch/arm/configs/cm_x300_defconfig | 26 ++--- > arch/arm/configs/cns3420vb_defconfig | 18 ++-- > arch/arm/configs/colibri_pxa270_defconfig | 32 +++--- > arch/arm/configs/colibri_pxa300_defconfig | 10 +- > arch/arm/configs/collie_defconfig | 20 ++-- > arch/arm/configs/corgi_defconfig | 44 ++++---- > arch/arm/configs/davinci_all_defconfig | 26 ++--- > arch/arm/configs/dove_defconfig | 28 ++--- > arch/arm/configs/ep93xx_defconfig | 16 +-- > arch/arm/configs/eseries_pxa_defconfig | 26 ++--- > arch/arm/configs/exynos_defconfig | 20 ++-- > arch/arm/configs/ezx_defconfig | 72 ++++++------- > arch/arm/configs/footbridge_defconfig | 14 +-- > arch/arm/configs/h3600_defconfig | 10 +- > arch/arm/configs/h5000_defconfig | 18 ++-- > arch/arm/configs/hackkit_defconfig | 4 +- > arch/arm/configs/hisi_defconfig | 24 ++--- > arch/arm/configs/imx_v4_v5_defconfig | 8 +- > arch/arm/configs/imx_v6_v7_defconfig | 8 +- > arch/arm/configs/integrator_defconfig | 2 +- > arch/arm/configs/iop32x_defconfig | 20 ++-- > arch/arm/configs/jornada720_defconfig | 10 +- > arch/arm/configs/keystone_defconfig | 62 +++++------ > arch/arm/configs/lart_defconfig | 6 +- > arch/arm/configs/lpc18xx_defconfig | 12 +-- > arch/arm/configs/lpc32xx_defconfig | 8 +- > arch/arm/configs/lpd270_defconfig | 6 +- > arch/arm/configs/lubbock_defconfig | 10 +- > arch/arm/configs/magician_defconfig | 30 +++--- > arch/arm/configs/mainstone_defconfig | 4 +- > arch/arm/configs/milbeaut_m10v_defconfig | 6 +- > arch/arm/configs/mini2440_defconfig | 6 +- > arch/arm/configs/mmp2_defconfig | 28 ++--- > arch/arm/configs/moxart_defconfig | 18 ++-- > arch/arm/configs/mps2_defconfig | 14 +-- > arch/arm/configs/multi_v4t_defconfig | 4 +- > arch/arm/configs/multi_v5_defconfig | 12 +-- > arch/arm/configs/multi_v7_defconfig | 62 +++++------ > arch/arm/configs/mv78xx0_defconfig | 32 +++--- > arch/arm/configs/mvebu_v5_defconfig | 28 ++--- > arch/arm/configs/mvebu_v7_defconfig | 2 +- > arch/arm/configs/mxs_defconfig | 4 +- > arch/arm/configs/neponset_defconfig | 24 ++--- > arch/arm/configs/netwinder_defconfig | 10 +- > arch/arm/configs/nhk8815_defconfig | 6 +- > arch/arm/configs/omap1_defconfig | 74 ++++++------- > arch/arm/configs/omap2plus_defconfig | 16 +-- > arch/arm/configs/orion5x_defconfig | 32 +++--- > arch/arm/configs/oxnas_v6_defconfig | 14 +-- > arch/arm/configs/palmz72_defconfig | 14 +-- > arch/arm/configs/pcm027_defconfig | 22 ++-- > arch/arm/configs/pleb_defconfig | 6 +- > arch/arm/configs/pxa168_defconfig | 18 ++-- > arch/arm/configs/pxa255-idp_defconfig | 10 +- > arch/arm/configs/pxa3xx_defconfig | 18 ++-- > arch/arm/configs/pxa910_defconfig | 22 ++-- > arch/arm/configs/pxa_defconfig | 126 +++++++++++----------- > arch/arm/configs/qcom_defconfig | 60 +++++------ > arch/arm/configs/realview_defconfig | 8 +- > arch/arm/configs/rpc_defconfig | 18 ++-- > arch/arm/configs/s3c2410_defconfig | 8 +- > arch/arm/configs/s3c6400_defconfig | 2 +- > arch/arm/configs/s5pv210_defconfig | 4 +- > arch/arm/configs/sama5_defconfig | 8 +- > arch/arm/configs/sama7_defconfig | 8 +- > arch/arm/configs/shannon_defconfig | 8 +- > arch/arm/configs/simpad_defconfig | 18 ++-- > arch/arm/configs/socfpga_defconfig | 4 +- > arch/arm/configs/spear13xx_defconfig | 16 +-- > arch/arm/configs/spear3xx_defconfig | 10 +- > arch/arm/configs/spear6xx_defconfig | 8 +- > arch/arm/configs/spitz_defconfig | 44 ++++---- > arch/arm/configs/stm32_defconfig | 14 +-- > arch/arm/configs/sunxi_defconfig | 2 +- For sunxi: Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com> Best regards, Jernej > arch/arm/configs/tct_hammer_defconfig | 12 +-- > arch/arm/configs/tegra_defconfig | 18 ++-- > arch/arm/configs/trizeps4_defconfig | 58 +++++----- > arch/arm/configs/u8500_defconfig | 2 +- > arch/arm/configs/versatile_defconfig | 4 +- > arch/arm/configs/vexpress_defconfig | 4 +- > arch/arm/configs/vf610m4_defconfig | 2 +- > arch/arm/configs/viper_defconfig | 28 ++--- > arch/arm/configs/vt8500_v6_v7_defconfig | 2 +- > arch/arm/configs/xcep_defconfig | 30 +++--- > arch/arm/configs/zeus_defconfig | 26 ++---
On Thu, Jul 21, 2022 at 04:13:19PM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > In the process of deprecating board files, I had to modify some defconfig > files and ran into the same problem as everyone else that a lot of > them are rather outdated. With some scripting, I managed to split out > a preparation patch that puts all lines into the expected order without > actually changing the contents. > > This helped doing the cleanup separately per Kconfig option that needed > to be addressed. I only did a small portion of the follow-up changes > to get to the point of being able to rebase my board changes on top, > but I did manage to address some bugs that have crept in. > > If there are no objections, I'd apply this set to the arm/defconfig > branch of the soc tree directly. > > Arnd > > Arnd Bergmann (6): > ARM: refresh defconfig files > ARM: defconfig: remove irda remnants > ARM: defconfig: remove stale CONFIG_ZBOOT_ROM entries > ARM: defconfig: address renamed CONFIG_DEBUG_INFO=y > ARM: defconfig: remove broken CONFIG_THUMB disables > ARM: defconfig: kill remnants of CONFIG_LEDS > [...] > arch/arm/configs/vexpress_defconfig | 8 +- For vexpress, Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Hi Arnd, On 2022-07-21 07:13, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > A lot of Kconfig options have changed over the years, and we tend > to not do a blind 'make defconfig' to refresh the files, to ensure > we catch options that should not have gone away. > > I used some a bit of scripting to only rework the bits where an > option moved around in any of the defconfig files, without also > dropping any of the other lines, to make it clearer which options > we no longer have. Resync is fine. But, it would be great if the defconfig files were kept in sync. Almost every kernel version kconfig options change which affect these files. Could we put in place a defconfig refresh per kernel version to keep them all in sync going forward? Regards, Scott
On 21/07/2022 17:33, Scott Branden wrote: > Hi Arnd, > > On 2022-07-21 07:13, Arnd Bergmann wrote: >> From: Arnd Bergmann <arnd@arndb.de> >> >> A lot of Kconfig options have changed over the years, and we tend >> to not do a blind 'make defconfig' to refresh the files, to ensure >> we catch options that should not have gone away. >> >> I used some a bit of scripting to only rework the bits where an >> option moved around in any of the defconfig files, without also >> dropping any of the other lines, to make it clearer which options >> we no longer have. > Resync is fine. But, it would be great if the defconfig files were kept > in sync. Almost every kernel version kconfig options change which affect > these files. Could we put in place a defconfig refresh per kernel > version to keep them all in sync going forward? > Not entirely, because some Kconfig changes are causing symbols to disappear. Also defconfig is expected to include user-visible options, even if savedefconfig would drop them. This is why blind savedefconfig is not acceptable. Best regards, Krzysztof
On 21/07/2022 16:13, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > A lot of Kconfig options have changed over the years, and we tend > to not do a blind 'make defconfig' to refresh the files, to ensure > we catch options that should not have gone away. > > I used some a bit of scripting to only rework the bits where an > option moved around in any of the defconfig files, without also > dropping any of the other lines, to make it clearer which options > we no longer have. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Samsung bits (s3c, s5p, exynos, mini2440, tct_hammer) look good: Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> # Samsung (I did not review the rest, though) Best regards, Krzysztof
On 21/07/2022 16:13, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > CONFIG_DEBUG_INFO is now implicitly selected if one picks one of the > explicit options that could be DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT, > DEBUG_INFO_DWARF4, DEBUG_INFO_DWARF5. > > This was actually not what I had in mind when I suggested making > it a 'choice' statement, but it's too late to change again now, > and the Kconfig logic is more sensible in the new form. > > Change any defconfig file that had CONFIG_DEBUG_INFO enabled > but did not pick DWARF4 or DWARF5 explicitly to now pick the toolchain > default. I think this should be split - into remove DEBUG_INFO (noop) and into selecting CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT (a fix). Best regards, Krzysztof
On 21/07/2022 16:13, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > A lot of Kconfig options have changed over the years, and we tend > to not do a blind 'make defconfig' to refresh the files, to ensure > we catch options that should not have gone away. > > I used some a bit of scripting to only rework the bits where an > option moved around in any of the defconfig files, without also > dropping any of the other lines, to make it clearer which options > we no longer have. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/arm/configs/am200epdkit_defconfig | 26 ++--- > arch/arm/configs/aspeed_g4_defconfig | 16 +-- > arch/arm/configs/aspeed_g5_defconfig | 16 +-- > arch/arm/configs/assabet_defconfig | 8 +- > arch/arm/configs/at91_dt_defconfig | 10 +- > arch/arm/configs/axm55xx_defconfig | 22 ++-- > arch/arm/configs/badge4_defconfig | 8 +- > arch/arm/configs/bcm2835_defconfig | 36 +++---- > arch/arm/configs/cerfcube_defconfig | 16 +-- > arch/arm/configs/clps711x_defconfig | 2 +- > arch/arm/configs/cm_x300_defconfig | 26 ++--- > arch/arm/configs/cns3420vb_defconfig | 18 ++-- > arch/arm/configs/colibri_pxa270_defconfig | 32 +++--- > arch/arm/configs/colibri_pxa300_defconfig | 10 +- > arch/arm/configs/collie_defconfig | 20 ++-- > arch/arm/configs/corgi_defconfig | 44 ++++---- > arch/arm/configs/davinci_all_defconfig | 26 ++--- > arch/arm/configs/dove_defconfig | 28 ++--- > arch/arm/configs/ep93xx_defconfig | 16 +-- > arch/arm/configs/eseries_pxa_defconfig | 26 ++--- > arch/arm/configs/exynos_defconfig | 20 ++-- > arch/arm/configs/ezx_defconfig | 72 ++++++------- > arch/arm/configs/footbridge_defconfig | 14 +-- > arch/arm/configs/h3600_defconfig | 10 +- > arch/arm/configs/h5000_defconfig | 18 ++-- > arch/arm/configs/hackkit_defconfig | 4 +- > arch/arm/configs/hisi_defconfig | 24 ++--- > arch/arm/configs/imx_v4_v5_defconfig | 8 +- > arch/arm/configs/imx_v6_v7_defconfig | 8 +- > arch/arm/configs/integrator_defconfig | 2 +- > arch/arm/configs/iop32x_defconfig | 20 ++-- > arch/arm/configs/jornada720_defconfig | 10 +- > arch/arm/configs/keystone_defconfig | 62 +++++------ > arch/arm/configs/lart_defconfig | 6 +- > arch/arm/configs/lpc18xx_defconfig | 12 +-- > arch/arm/configs/lpc32xx_defconfig | 8 +- > arch/arm/configs/lpd270_defconfig | 6 +- > arch/arm/configs/lubbock_defconfig | 10 +- > arch/arm/configs/magician_defconfig | 30 +++--- > arch/arm/configs/mainstone_defconfig | 4 +- > arch/arm/configs/milbeaut_m10v_defconfig | 6 +- > arch/arm/configs/mini2440_defconfig | 6 +- > arch/arm/configs/mmp2_defconfig | 28 ++--- > arch/arm/configs/moxart_defconfig | 18 ++-- > arch/arm/configs/mps2_defconfig | 14 +-- > arch/arm/configs/multi_v4t_defconfig | 4 +- > arch/arm/configs/multi_v5_defconfig | 12 +-- > arch/arm/configs/multi_v7_defconfig | 62 +++++------ > arch/arm/configs/mv78xx0_defconfig | 32 +++--- > arch/arm/configs/mvebu_v5_defconfig | 28 ++--- > arch/arm/configs/mvebu_v7_defconfig | 2 +- > arch/arm/configs/mxs_defconfig | 4 +- > arch/arm/configs/neponset_defconfig | 24 ++--- > arch/arm/configs/netwinder_defconfig | 10 +- > arch/arm/configs/nhk8815_defconfig | 6 +- > arch/arm/configs/omap1_defconfig | 74 ++++++------- > arch/arm/configs/omap2plus_defconfig | 16 +-- > arch/arm/configs/orion5x_defconfig | 32 +++--- > arch/arm/configs/oxnas_v6_defconfig | 14 +-- > arch/arm/configs/palmz72_defconfig | 14 +-- > arch/arm/configs/pcm027_defconfig | 22 ++-- > arch/arm/configs/pleb_defconfig | 6 +- > arch/arm/configs/pxa168_defconfig | 18 ++-- > arch/arm/configs/pxa255-idp_defconfig | 10 +- > arch/arm/configs/pxa3xx_defconfig | 18 ++-- > arch/arm/configs/pxa910_defconfig | 22 ++-- > arch/arm/configs/pxa_defconfig | 126 +++++++++++----------- > arch/arm/configs/qcom_defconfig | 60 +++++------ qcom I already did here: https://lore.kernel.org/all/20220623110535.177326-2-krzysztof.kozlowski@linaro.org/ but it seems it was missed in MAINTAINERS pattern and never made to Bjorn/Patchwork. Would be nice if it got picked up, but it seems a bit smaller than yours diff (56 vs 60). Best regards, Krzysztof
On 21/07/2022 at 16:13, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > A lot of Kconfig options have changed over the years, and we tend > to not do a blind 'make defconfig' to refresh the files, to ensure > we catch options that should not have gone away. > > I used some a bit of scripting to only rework the bits where an > option moved around in any of the defconfig files, without also > dropping any of the other lines, to make it clearer which options > we no longer have. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- [..] > arch/arm/configs/at91_dt_defconfig | 10 +- [..] > arch/arm/configs/sama5_defconfig | 8 +- > arch/arm/configs/sama7_defconfig | 8 +- [..] For at91: Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> Thanks, best regards, Nicolas
On 21/07/2022 16:13, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > In the process of deprecating board files, I had to modify some defconfig > files and ran into the same problem as everyone else that a lot of > them are rather outdated. With some scripting, I managed to split out > a preparation patch that puts all lines into the expected order without > actually changing the contents. > > This helped doing the cleanup separately per Kconfig option that needed > to be addressed. I only did a small portion of the follow-up changes > to get to the point of being able to rebase my board changes on top, > but I did manage to address some bugs that have crept in. > > If there are no objections, I'd apply this set to the arm/defconfig > branch of the soc tree directly. > > Arnd > > Arnd Bergmann (6): > ARM: refresh defconfig files > ARM: defconfig: remove irda remnants > ARM: defconfig: remove stale CONFIG_ZBOOT_ROM entries > ARM: defconfig: address renamed CONFIG_DEBUG_INFO=y > ARM: defconfig: remove broken CONFIG_THUMB disables > ARM: defconfig: kill remnants of CONFIG_LEDS > > Cc: Russell King <linux@armlinux.org.uk> > Cc: Nicolas Ferre <nicolas.ferre@microchip.com> > Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> > Cc: Claudiu Beznea <claudiu.beznea@microchip.com> > Cc: Florian Fainelli <f.fainelli@gmail.com> > Cc: Ray Jui <rjui@broadcom.com> > Cc: Scott Branden <sbranden@broadcom.com> > Cc: Alexander Shiyan <shc_work@mail.ru> > Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Cc: Alim Akhtar <alim.akhtar@samsung.com> > Cc: Shawn Guo <shawnguo@kernel.org> > Cc: Sascha Hauer <s.hauer@pengutronix.de> > Cc: Pengutronix Kernel Team <kernel@pengutronix.de> > Cc: Fabio Estevam <festevam@gmail.com> > Cc: NXP Linux Team <linux-imx@nxp.com> > Cc: Vladimir Zapolskiy <vz@mleia.com> > Cc: Taichi Sugaya <sugaya.taichi@socionext.com> > Cc: Takao Orito <orito.takao@socionext.com> > Cc: Liviu Dudau <liviu.dudau@arm.com> > Cc: Sudeep Holla <sudeep.holla@arm.com> > Cc: Lorenzo Pieralisi <lpieralisi@kernel.org> > Cc: Andrew Lunn <andrew@lunn.ch> > Cc: Gregory Clement <gregory.clement@bootlin.com> > Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > Cc: Aaro Koskinen <aaro.koskinen@iki.fi> > Cc: Janusz Krzysztofik <jmkrzyszt@gmail.com> > Cc: Tony Lindgren <tony@atomide.com> > Cc: Neil Armstrong <narmstrong@baylibre.com> > Cc: Dinh Nguyen <dinguyen@kernel.org> > Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> > Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> > Cc: Chen-Yu Tsai <wens@csie.org> > Cc: Jernej Skrabec <jernej.skrabec@gmail.com> > Cc: Samuel Holland <samuel@sholland.org> > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: Jonathan Hunter <jonathanh@nvidia.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will@kernel.org> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > Cc: linux-aspeed@lists.ozlabs.org > Cc: bcm-kernel-feedback-list@broadcom.com > Cc: linux-rpi-kernel@lists.infradead.org > Cc: linux-samsung-soc@vger.kernel.org > Cc: linux-omap@vger.kernel.org > Cc: linux-oxnas@groups.io > Cc: linux-stm32@st-md-mailman.stormreply.com > Cc: linux-sunxi@lists.linux.dev > Cc: linux-tegra@vger.kernel.org > Cc: linux-sh@vger.kernel.org > > arch/arm/configs/am200epdkit_defconfig | 28 ++--- > arch/arm/configs/aspeed_g4_defconfig | 17 ++- > arch/arm/configs/aspeed_g5_defconfig | 17 ++- > arch/arm/configs/assabet_defconfig | 19 ++- > arch/arm/configs/at91_dt_defconfig | 10 +- > arch/arm/configs/axm55xx_defconfig | 26 ++-- > arch/arm/configs/badge4_defconfig | 17 +-- > arch/arm/configs/bcm2835_defconfig | 38 +++--- > arch/arm/configs/cerfcube_defconfig | 24 ++-- > arch/arm/configs/clps711x_defconfig | 6 +- > arch/arm/configs/cm_x300_defconfig | 28 ++--- > arch/arm/configs/cns3420vb_defconfig | 20 ++-- > arch/arm/configs/colibri_pxa270_defconfig | 41 +++---- > arch/arm/configs/colibri_pxa300_defconfig | 12 +- > arch/arm/configs/collie_defconfig | 22 ++-- > arch/arm/configs/corgi_defconfig | 51 ++++---- > arch/arm/configs/davinci_all_defconfig | 28 ++--- > arch/arm/configs/dove_defconfig | 32 +++-- > arch/arm/configs/ep93xx_defconfig | 18 ++- > arch/arm/configs/eseries_pxa_defconfig | 36 ++---- > arch/arm/configs/exynos_defconfig | 24 ++-- > arch/arm/configs/ezx_defconfig | 74 ++++++------ > arch/arm/configs/footbridge_defconfig | 31 ++--- > arch/arm/configs/h3600_defconfig | 16 +-- > arch/arm/configs/h5000_defconfig | 20 ++-- > arch/arm/configs/hackkit_defconfig | 12 +- > arch/arm/configs/hisi_defconfig | 24 ++-- > arch/arm/configs/imx_v4_v5_defconfig | 10 +- > arch/arm/configs/imx_v6_v7_defconfig | 8 +- > arch/arm/configs/integrator_defconfig | 2 +- > arch/arm/configs/iop32x_defconfig | 23 ++-- > arch/arm/configs/ixp4xx_defconfig | 1 - > arch/arm/configs/jornada720_defconfig | 16 +-- > arch/arm/configs/keystone_defconfig | 64 +++++----- > arch/arm/configs/lart_defconfig | 21 ++-- > arch/arm/configs/lpc18xx_defconfig | 16 ++- > arch/arm/configs/lpc32xx_defconfig | 12 +- > arch/arm/configs/lpd270_defconfig | 11 +- > arch/arm/configs/lubbock_defconfig | 21 ++-- > arch/arm/configs/magician_defconfig | 41 +++---- > arch/arm/configs/mainstone_defconfig | 15 ++- > arch/arm/configs/milbeaut_m10v_defconfig | 6 +- > arch/arm/configs/mini2440_defconfig | 8 +- > arch/arm/configs/mmp2_defconfig | 32 +++-- > arch/arm/configs/moxart_defconfig | 20 ++-- > arch/arm/configs/mps2_defconfig | 18 ++- > arch/arm/configs/multi_v4t_defconfig | 6 +- > arch/arm/configs/multi_v5_defconfig | 14 +-- > arch/arm/configs/multi_v7_defconfig | 62 +++++----- > arch/arm/configs/mv78xx0_defconfig | 36 +++--- > arch/arm/configs/mvebu_v5_defconfig | 32 +++-- > arch/arm/configs/mvebu_v7_defconfig | 4 +- > arch/arm/configs/mxs_defconfig | 6 +- > arch/arm/configs/neponset_defconfig | 30 ++--- > arch/arm/configs/netwinder_defconfig | 18 +-- > arch/arm/configs/nhk8815_defconfig | 8 +- > arch/arm/configs/omap1_defconfig | 80 ++++++------- > arch/arm/configs/omap2plus_defconfig | 17 ++- > arch/arm/configs/orion5x_defconfig | 36 +++--- > arch/arm/configs/oxnas_v6_defconfig | 14 +-- > arch/arm/configs/palmz72_defconfig | 16 ++- > arch/arm/configs/pcm027_defconfig | 24 ++-- > arch/arm/configs/pleb_defconfig | 8 +- > arch/arm/configs/pxa168_defconfig | 22 ++-- > arch/arm/configs/pxa255-idp_defconfig | 21 ++-- > arch/arm/configs/pxa3xx_defconfig | 20 ++-- > arch/arm/configs/pxa910_defconfig | 26 ++-- > arch/arm/configs/pxa_defconfig | 140 ++++++++++------------ > arch/arm/configs/qcom_defconfig | 62 +++++----- > arch/arm/configs/realview_defconfig | 8 +- > arch/arm/configs/rpc_defconfig | 20 ++-- > arch/arm/configs/s3c2410_defconfig | 12 +- > arch/arm/configs/s3c6400_defconfig | 4 +- > arch/arm/configs/s5pv210_defconfig | 6 +- > arch/arm/configs/sama5_defconfig | 8 +- > arch/arm/configs/sama7_defconfig | 8 +- > arch/arm/configs/shannon_defconfig | 10 +- > arch/arm/configs/simpad_defconfig | 29 ++--- > arch/arm/configs/socfpga_defconfig | 8 +- > arch/arm/configs/spear13xx_defconfig | 18 +-- > arch/arm/configs/spear3xx_defconfig | 12 +- > arch/arm/configs/spear6xx_defconfig | 10 +- > arch/arm/configs/spitz_defconfig | 51 ++++---- > arch/arm/configs/stm32_defconfig | 18 ++- > arch/arm/configs/sunxi_defconfig | 2 +- > arch/arm/configs/tct_hammer_defconfig | 14 +-- > arch/arm/configs/tegra_defconfig | 20 ++-- > arch/arm/configs/trizeps4_defconfig | 66 +++++----- > arch/arm/configs/u8500_defconfig | 2 +- > arch/arm/configs/versatile_defconfig | 4 +- > arch/arm/configs/vexpress_defconfig | 8 +- > arch/arm/configs/vf610m4_defconfig | 2 +- > arch/arm/configs/viper_defconfig | 30 +++-- > arch/arm/configs/vt8500_v6_v7_defconfig | 2 +- > arch/arm/configs/xcep_defconfig | 32 +++-- > arch/arm/configs/zeus_defconfig | 28 ++--- > arch/arm64/configs/defconfig | 2 +- > arch/sh/configs/ecovec24_defconfig | 2 - > 100 files changed, 989 insertions(+), 1189 deletions(-) > For oxnas: Acked-by: Neil Armstrong <narmstrong@baylibre.com>
On Thu, Jul 21, 2022 at 5:42 PM Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > > On 21/07/2022 16:13, Arnd Bergmann wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > > > CONFIG_DEBUG_INFO is now implicitly selected if one picks one of the > > explicit options that could be DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT, > > DEBUG_INFO_DWARF4, DEBUG_INFO_DWARF5. > > > > This was actually not what I had in mind when I suggested making > > it a 'choice' statement, but it's too late to change again now, > > and the Kconfig logic is more sensible in the new form. > > > > Change any defconfig file that had CONFIG_DEBUG_INFO enabled > > but did not pick DWARF4 or DWARF5 explicitly to now pick the toolchain > > default. > > I think this should be split - into remove DEBUG_INFO (noop) and into > selecting CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT (a fix). I'd rather keep them together: while removing the DEBUG_INFO is now a NOP, keeping the two changes together explains much better why this is done and is atomically needed based on the single patch that caused the change. It's the same with the LEDS patch that replaces the CONFIG_LEDS option with CONFIG_NEW_LEDS. Arnd
On Thu, Jul 21, 2022 at 5:36 PM Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > > On 21/07/2022 17:33, Scott Branden wrote: > > Hi Arnd, > > > > On 2022-07-21 07:13, Arnd Bergmann wrote: > >> From: Arnd Bergmann <arnd@arndb.de> > >> > >> A lot of Kconfig options have changed over the years, and we tend > >> to not do a blind 'make defconfig' to refresh the files, to ensure > >> we catch options that should not have gone away. > >> > >> I used some a bit of scripting to only rework the bits where an > >> option moved around in any of the defconfig files, without also > >> dropping any of the other lines, to make it clearer which options > >> we no longer have. > > Resync is fine. But, it would be great if the defconfig files were kept > > in sync. Almost every kernel version kconfig options change which affect > > these files. Could we put in place a defconfig refresh per kernel > > version to keep them all in sync going forward? > > > > Not entirely, because some Kconfig changes are causing symbols to > disappear. Also defconfig is expected to include user-visible options, > even if savedefconfig would drop them. > > This is why blind savedefconfig is not acceptable. Right. I mostly scripted the changes to move the options around, but had to do a few files manually so I can't fully automate this, and the removed options always need manual inspection. There are still around 400 lines in the defconfig files that go away after a savedefconfig, and it's a lot of work to go through those. I might do a few more of these, but if anyone wants to help, these are the most common lines that get dropped, sorted by frequency: 34 -# CONFIG_VGA_CONSOLE is not set 32 -CONFIG_NET_ETHERNET=y 26 -CONFIG_NFS_V3=y 22 -# CONFIG_CRYPTO_ANSI_CPRNG is not set 20 -CONFIG_PM=y 18 -CONFIG_FPE_NWFPE=y 18 -# CONFIG_INET_XFRM_MODE_TUNNEL is not set 18 -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 18 -# CONFIG_INET_XFRM_MODE_BEET is not set 15 -CONFIG_SYSFS_DEPRECATED_V2=y 15 -CONFIG_DEBUG_KERNEL=y 15 -# CONFIG_BLK_DEV_BSG is not set 14 -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 14 -# CONFIG_INPUT_MOUSEDEV is not set 12 -CONFIG_LEDS=y 12 -CONFIG_AEABI=y 11 -CONFIG_NET_PCMCIA=y 11 -CONFIG_GPIO_SYSFS=y 10 -# CONFIG_ENABLE_MUST_CHECK is not set 9 -CONFIG_LEDS_CPU=y 9 -# CONFIG_EXT3_FS_XATTR is not set 8 -CONFIG_CRYPTO_SHA512=m 8 -CONFIG_BINFMT_AOUT=y 8 -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 7 -CONFIG_SND_PCM_OSS=m 7 -CONFIG_SND_MIXER_OSS=m 7 -CONFIG_SMB_FS=m 7 -CONFIG_MTD_M25P80=y 6 -CONFIG_NET_PCI=y 6 -CONFIG_CRYPTO_ECB=m 5 -CONFIG_SECCOMP=y 5 -CONFIG_MEDIA_CAMERA_SUPPORT=y 5 -CONFIG_IPV6=y 5 -CONFIG_CRYPTO_TEA=m 5 -CONFIG_CRYPTO_SHA256=m 5 -CONFIG_CRYPTO_KHAZAD=m 5 -CONFIG_CRYPTO_ARC4=m 5 -CONFIG_BACKLIGHT_PWM=y 5 -# CONFIG_NET_CADENCE is not set The majority of these lines are options that no longer exist and are not needed, or things that dropped off because they get selected by something else. The interesting ones we need to catch are the ones that should be enabled but are either renamed to something else or gained a dependency that now also needs to be turned on. Arnd
Arnd Bergmann <arnd@kernel.org> writes: > From: Arnd Bergmann <arnd@arndb.de> > > In the process of deprecating board files, I had to modify some defconfig > files and ran into the same problem as everyone else that a lot of > them are rather outdated. With some scripting, I managed to split out > a preparation patch that puts all lines into the expected order without > actually changing the contents. > > This helped doing the cleanup separately per Kconfig option that needed > to be addressed. I only did a small portion of the follow-up changes > to get to the point of being able to rebase my board changes on top, > but I did manage to address some bugs that have crept in. > > If there are no objections, I'd apply this set to the arm/defconfig > branch of the soc tree directly. For mvebu related SoCs (orion5x, dove, mv78xx0, ...) Acked-by: Gregory CLEMENT <gregory.clement@bootlin.com> Thanks, Gregory > > Arnd > > Arnd Bergmann (6): > ARM: refresh defconfig files > ARM: defconfig: remove irda remnants > ARM: defconfig: remove stale CONFIG_ZBOOT_ROM entries > ARM: defconfig: address renamed CONFIG_DEBUG_INFO=y > ARM: defconfig: remove broken CONFIG_THUMB disables > ARM: defconfig: kill remnants of CONFIG_LEDS > > Cc: Russell King <linux@armlinux.org.uk> > Cc: Nicolas Ferre <nicolas.ferre@microchip.com> > Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> > Cc: Claudiu Beznea <claudiu.beznea@microchip.com> > Cc: Florian Fainelli <f.fainelli@gmail.com> > Cc: Ray Jui <rjui@broadcom.com> > Cc: Scott Branden <sbranden@broadcom.com> > Cc: Alexander Shiyan <shc_work@mail.ru> > Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Cc: Alim Akhtar <alim.akhtar@samsung.com> > Cc: Shawn Guo <shawnguo@kernel.org> > Cc: Sascha Hauer <s.hauer@pengutronix.de> > Cc: Pengutronix Kernel Team <kernel@pengutronix.de> > Cc: Fabio Estevam <festevam@gmail.com> > Cc: NXP Linux Team <linux-imx@nxp.com> > Cc: Vladimir Zapolskiy <vz@mleia.com> > Cc: Taichi Sugaya <sugaya.taichi@socionext.com> > Cc: Takao Orito <orito.takao@socionext.com> > Cc: Liviu Dudau <liviu.dudau@arm.com> > Cc: Sudeep Holla <sudeep.holla@arm.com> > Cc: Lorenzo Pieralisi <lpieralisi@kernel.org> > Cc: Andrew Lunn <andrew@lunn.ch> > Cc: Gregory Clement <gregory.clement@bootlin.com> > Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > Cc: Aaro Koskinen <aaro.koskinen@iki.fi> > Cc: Janusz Krzysztofik <jmkrzyszt@gmail.com> > Cc: Tony Lindgren <tony@atomide.com> > Cc: Neil Armstrong <narmstrong@baylibre.com> > Cc: Dinh Nguyen <dinguyen@kernel.org> > Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> > Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> > Cc: Chen-Yu Tsai <wens@csie.org> > Cc: Jernej Skrabec <jernej.skrabec@gmail.com> > Cc: Samuel Holland <samuel@sholland.org> > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: Jonathan Hunter <jonathanh@nvidia.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will@kernel.org> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > Cc: linux-aspeed@lists.ozlabs.org > Cc: bcm-kernel-feedback-list@broadcom.com > Cc: linux-rpi-kernel@lists.infradead.org > Cc: linux-samsung-soc@vger.kernel.org > Cc: linux-omap@vger.kernel.org > Cc: linux-oxnas@groups.io > Cc: linux-stm32@st-md-mailman.stormreply.com > Cc: linux-sunxi@lists.linux.dev > Cc: linux-tegra@vger.kernel.org > Cc: linux-sh@vger.kernel.org > > arch/arm/configs/am200epdkit_defconfig | 28 ++--- > arch/arm/configs/aspeed_g4_defconfig | 17 ++- > arch/arm/configs/aspeed_g5_defconfig | 17 ++- > arch/arm/configs/assabet_defconfig | 19 ++- > arch/arm/configs/at91_dt_defconfig | 10 +- > arch/arm/configs/axm55xx_defconfig | 26 ++-- > arch/arm/configs/badge4_defconfig | 17 +-- > arch/arm/configs/bcm2835_defconfig | 38 +++--- > arch/arm/configs/cerfcube_defconfig | 24 ++-- > arch/arm/configs/clps711x_defconfig | 6 +- > arch/arm/configs/cm_x300_defconfig | 28 ++--- > arch/arm/configs/cns3420vb_defconfig | 20 ++-- > arch/arm/configs/colibri_pxa270_defconfig | 41 +++---- > arch/arm/configs/colibri_pxa300_defconfig | 12 +- > arch/arm/configs/collie_defconfig | 22 ++-- > arch/arm/configs/corgi_defconfig | 51 ++++---- > arch/arm/configs/davinci_all_defconfig | 28 ++--- > arch/arm/configs/dove_defconfig | 32 +++-- > arch/arm/configs/ep93xx_defconfig | 18 ++- > arch/arm/configs/eseries_pxa_defconfig | 36 ++---- > arch/arm/configs/exynos_defconfig | 24 ++-- > arch/arm/configs/ezx_defconfig | 74 ++++++------ > arch/arm/configs/footbridge_defconfig | 31 ++--- > arch/arm/configs/h3600_defconfig | 16 +-- > arch/arm/configs/h5000_defconfig | 20 ++-- > arch/arm/configs/hackkit_defconfig | 12 +- > arch/arm/configs/hisi_defconfig | 24 ++-- > arch/arm/configs/imx_v4_v5_defconfig | 10 +- > arch/arm/configs/imx_v6_v7_defconfig | 8 +- > arch/arm/configs/integrator_defconfig | 2 +- > arch/arm/configs/iop32x_defconfig | 23 ++-- > arch/arm/configs/ixp4xx_defconfig | 1 - > arch/arm/configs/jornada720_defconfig | 16 +-- > arch/arm/configs/keystone_defconfig | 64 +++++----- > arch/arm/configs/lart_defconfig | 21 ++-- > arch/arm/configs/lpc18xx_defconfig | 16 ++- > arch/arm/configs/lpc32xx_defconfig | 12 +- > arch/arm/configs/lpd270_defconfig | 11 +- > arch/arm/configs/lubbock_defconfig | 21 ++-- > arch/arm/configs/magician_defconfig | 41 +++---- > arch/arm/configs/mainstone_defconfig | 15 ++- > arch/arm/configs/milbeaut_m10v_defconfig | 6 +- > arch/arm/configs/mini2440_defconfig | 8 +- > arch/arm/configs/mmp2_defconfig | 32 +++-- > arch/arm/configs/moxart_defconfig | 20 ++-- > arch/arm/configs/mps2_defconfig | 18 ++- > arch/arm/configs/multi_v4t_defconfig | 6 +- > arch/arm/configs/multi_v5_defconfig | 14 +-- > arch/arm/configs/multi_v7_defconfig | 62 +++++----- > arch/arm/configs/mv78xx0_defconfig | 36 +++--- > arch/arm/configs/mvebu_v5_defconfig | 32 +++-- > arch/arm/configs/mvebu_v7_defconfig | 4 +- > arch/arm/configs/mxs_defconfig | 6 +- > arch/arm/configs/neponset_defconfig | 30 ++--- > arch/arm/configs/netwinder_defconfig | 18 +-- > arch/arm/configs/nhk8815_defconfig | 8 +- > arch/arm/configs/omap1_defconfig | 80 ++++++------- > arch/arm/configs/omap2plus_defconfig | 17 ++- > arch/arm/configs/orion5x_defconfig | 36 +++--- > arch/arm/configs/oxnas_v6_defconfig | 14 +-- > arch/arm/configs/palmz72_defconfig | 16 ++- > arch/arm/configs/pcm027_defconfig | 24 ++-- > arch/arm/configs/pleb_defconfig | 8 +- > arch/arm/configs/pxa168_defconfig | 22 ++-- > arch/arm/configs/pxa255-idp_defconfig | 21 ++-- > arch/arm/configs/pxa3xx_defconfig | 20 ++-- > arch/arm/configs/pxa910_defconfig | 26 ++-- > arch/arm/configs/pxa_defconfig | 140 ++++++++++------------ > arch/arm/configs/qcom_defconfig | 62 +++++----- > arch/arm/configs/realview_defconfig | 8 +- > arch/arm/configs/rpc_defconfig | 20 ++-- > arch/arm/configs/s3c2410_defconfig | 12 +- > arch/arm/configs/s3c6400_defconfig | 4 +- > arch/arm/configs/s5pv210_defconfig | 6 +- > arch/arm/configs/sama5_defconfig | 8 +- > arch/arm/configs/sama7_defconfig | 8 +- > arch/arm/configs/shannon_defconfig | 10 +- > arch/arm/configs/simpad_defconfig | 29 ++--- > arch/arm/configs/socfpga_defconfig | 8 +- > arch/arm/configs/spear13xx_defconfig | 18 +-- > arch/arm/configs/spear3xx_defconfig | 12 +- > arch/arm/configs/spear6xx_defconfig | 10 +- > arch/arm/configs/spitz_defconfig | 51 ++++---- > arch/arm/configs/stm32_defconfig | 18 ++- > arch/arm/configs/sunxi_defconfig | 2 +- > arch/arm/configs/tct_hammer_defconfig | 14 +-- > arch/arm/configs/tegra_defconfig | 20 ++-- > arch/arm/configs/trizeps4_defconfig | 66 +++++----- > arch/arm/configs/u8500_defconfig | 2 +- > arch/arm/configs/versatile_defconfig | 4 +- > arch/arm/configs/vexpress_defconfig | 8 +- > arch/arm/configs/vf610m4_defconfig | 2 +- > arch/arm/configs/viper_defconfig | 30 +++-- > arch/arm/configs/vt8500_v6_v7_defconfig | 2 +- > arch/arm/configs/xcep_defconfig | 32 +++-- > arch/arm/configs/zeus_defconfig | 28 ++--- > arch/arm64/configs/defconfig | 2 +- > arch/sh/configs/ecovec24_defconfig | 2 - > 100 files changed, 989 insertions(+), 1189 deletions(-) > > -- > 2.29.2 >
On 7/21/22 09:13, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > A lot of Kconfig options have changed over the years, and we tend > to not do a blind 'make defconfig' to refresh the files, to ensure > we catch options that should not have gone away. > > I used some a bit of scripting to only rework the bits where an > option moved around in any of the defconfig files, without also > dropping any of the other lines, to make it clearer which options > we no longer have. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/arm/configs/am200epdkit_defconfig | 26 ++--- > arch/arm/configs/aspeed_g4_defconfig | 16 +-- > arch/arm/configs/aspeed_g5_defconfig | 16 +-- > arch/arm/configs/assabet_defconfig | 8 +- > arch/arm/configs/at91_dt_defconfig | 10 +- > arch/arm/configs/axm55xx_defconfig | 22 ++-- > arch/arm/configs/badge4_defconfig | 8 +- > arch/arm/configs/bcm2835_defconfig | 36 +++---- > arch/arm/configs/cerfcube_defconfig | 16 +-- > arch/arm/configs/clps711x_defconfig | 2 +- > arch/arm/configs/cm_x300_defconfig | 26 ++--- > arch/arm/configs/cns3420vb_defconfig | 18 ++-- > arch/arm/configs/colibri_pxa270_defconfig | 32 +++--- > arch/arm/configs/colibri_pxa300_defconfig | 10 +- > arch/arm/configs/collie_defconfig | 20 ++-- > arch/arm/configs/corgi_defconfig | 44 ++++---- > arch/arm/configs/davinci_all_defconfig | 26 ++--- > arch/arm/configs/dove_defconfig | 28 ++--- > arch/arm/configs/ep93xx_defconfig | 16 +-- > arch/arm/configs/eseries_pxa_defconfig | 26 ++--- > arch/arm/configs/exynos_defconfig | 20 ++-- > arch/arm/configs/ezx_defconfig | 72 ++++++------- > arch/arm/configs/footbridge_defconfig | 14 +-- > arch/arm/configs/h3600_defconfig | 10 +- > arch/arm/configs/h5000_defconfig | 18 ++-- > arch/arm/configs/hackkit_defconfig | 4 +- > arch/arm/configs/hisi_defconfig | 24 ++--- > arch/arm/configs/imx_v4_v5_defconfig | 8 +- > arch/arm/configs/imx_v6_v7_defconfig | 8 +- > arch/arm/configs/integrator_defconfig | 2 +- > arch/arm/configs/iop32x_defconfig | 20 ++-- > arch/arm/configs/jornada720_defconfig | 10 +- > arch/arm/configs/keystone_defconfig | 62 +++++------ > arch/arm/configs/lart_defconfig | 6 +- > arch/arm/configs/lpc18xx_defconfig | 12 +-- > arch/arm/configs/lpc32xx_defconfig | 8 +- > arch/arm/configs/lpd270_defconfig | 6 +- > arch/arm/configs/lubbock_defconfig | 10 +- > arch/arm/configs/magician_defconfig | 30 +++--- > arch/arm/configs/mainstone_defconfig | 4 +- > arch/arm/configs/milbeaut_m10v_defconfig | 6 +- > arch/arm/configs/mini2440_defconfig | 6 +- > arch/arm/configs/mmp2_defconfig | 28 ++--- > arch/arm/configs/moxart_defconfig | 18 ++-- > arch/arm/configs/mps2_defconfig | 14 +-- > arch/arm/configs/multi_v4t_defconfig | 4 +- > arch/arm/configs/multi_v5_defconfig | 12 +-- > arch/arm/configs/multi_v7_defconfig | 62 +++++------ > arch/arm/configs/mv78xx0_defconfig | 32 +++--- > arch/arm/configs/mvebu_v5_defconfig | 28 ++--- > arch/arm/configs/mvebu_v7_defconfig | 2 +- > arch/arm/configs/mxs_defconfig | 4 +- > arch/arm/configs/neponset_defconfig | 24 ++--- > arch/arm/configs/netwinder_defconfig | 10 +- > arch/arm/configs/nhk8815_defconfig | 6 +- > arch/arm/configs/omap1_defconfig | 74 ++++++------- > arch/arm/configs/omap2plus_defconfig | 16 +-- > arch/arm/configs/orion5x_defconfig | 32 +++--- > arch/arm/configs/oxnas_v6_defconfig | 14 +-- > arch/arm/configs/palmz72_defconfig | 14 +-- > arch/arm/configs/pcm027_defconfig | 22 ++-- > arch/arm/configs/pleb_defconfig | 6 +- > arch/arm/configs/pxa168_defconfig | 18 ++-- > arch/arm/configs/pxa255-idp_defconfig | 10 +- > arch/arm/configs/pxa3xx_defconfig | 18 ++-- > arch/arm/configs/pxa910_defconfig | 22 ++-- > arch/arm/configs/pxa_defconfig | 126 +++++++++++----------- > arch/arm/configs/qcom_defconfig | 60 +++++------ > arch/arm/configs/realview_defconfig | 8 +- > arch/arm/configs/rpc_defconfig | 18 ++-- > arch/arm/configs/s3c2410_defconfig | 8 +- > arch/arm/configs/s3c6400_defconfig | 2 +- > arch/arm/configs/s5pv210_defconfig | 4 +- > arch/arm/configs/sama5_defconfig | 8 +- > arch/arm/configs/sama7_defconfig | 8 +- > arch/arm/configs/shannon_defconfig | 8 +- > arch/arm/configs/simpad_defconfig | 18 ++-- > arch/arm/configs/socfpga_defconfig | 4 +- for socfpga Acked-by: Dinh Nguyen <dinguyen@kernel.org>
On 21/07/2022 22:43, Arnd Bergmann wrote: > I'd rather keep them together: while removing the DEBUG_INFO is > now a NOP, keeping the two changes together explains much better > why this is done and is atomically needed based on the single patch > that caused the change. > > It's the same with the LEDS patch that replaces the CONFIG_LEDS > option with CONFIG_NEW_LEDS. OK, Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On Thu, 21 Jul 2022, at 23:43, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > A lot of Kconfig options have changed over the years, and we tend > to not do a blind 'make defconfig' to refresh the files, to ensure > we catch options that should not have gone away. > > I used some a bit of scripting to only rework the bits where an > option moved around in any of the defconfig files, without also > dropping any of the other lines, to make it clearer which options > we no longer have. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/arm/configs/am200epdkit_defconfig | 26 ++--- > arch/arm/configs/aspeed_g4_defconfig | 16 +-- > arch/arm/configs/aspeed_g5_defconfig | 16 +-- For the Aspeed bits: Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
From: Arnd Bergmann <arnd@arndb.de> In the process of deprecating board files, I had to modify some defconfig files and ran into the same problem as everyone else that a lot of them are rather outdated. With some scripting, I managed to split out a preparation patch that puts all lines into the expected order without actually changing the contents. This helped doing the cleanup separately per Kconfig option that needed to be addressed. I only did a small portion of the follow-up changes to get to the point of being able to rebase my board changes on top, but I did manage to address some bugs that have crept in. If there are no objections, I'd apply this set to the arm/defconfig branch of the soc tree directly. Arnd Arnd Bergmann (6): ARM: refresh defconfig files ARM: defconfig: remove irda remnants ARM: defconfig: remove stale CONFIG_ZBOOT_ROM entries ARM: defconfig: address renamed CONFIG_DEBUG_INFO=y ARM: defconfig: remove broken CONFIG_THUMB disables ARM: defconfig: kill remnants of CONFIG_LEDS Cc: Russell King <linux@armlinux.org.uk> Cc: Nicolas Ferre <nicolas.ferre@microchip.com> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: Claudiu Beznea <claudiu.beznea@microchip.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Ray Jui <rjui@broadcom.com> Cc: Scott Branden <sbranden@broadcom.com> Cc: Alexander Shiyan <shc_work@mail.ru> Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Cc: Alim Akhtar <alim.akhtar@samsung.com> Cc: Shawn Guo <shawnguo@kernel.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Pengutronix Kernel Team <kernel@pengutronix.de> Cc: Fabio Estevam <festevam@gmail.com> Cc: NXP Linux Team <linux-imx@nxp.com> Cc: Vladimir Zapolskiy <vz@mleia.com> Cc: Taichi Sugaya <sugaya.taichi@socionext.com> Cc: Takao Orito <orito.takao@socionext.com> Cc: Liviu Dudau <liviu.dudau@arm.com> Cc: Sudeep Holla <sudeep.holla@arm.com> Cc: Lorenzo Pieralisi <lpieralisi@kernel.org> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Gregory Clement <gregory.clement@bootlin.com> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Cc: Aaro Koskinen <aaro.koskinen@iki.fi> Cc: Janusz Krzysztofik <jmkrzyszt@gmail.com> Cc: Tony Lindgren <tony@atomide.com> Cc: Neil Armstrong <narmstrong@baylibre.com> Cc: Dinh Nguyen <dinguyen@kernel.org> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> Cc: Chen-Yu Tsai <wens@csie.org> Cc: Jernej Skrabec <jernej.skrabec@gmail.com> Cc: Samuel Holland <samuel@sholland.org> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Jonathan Hunter <jonathanh@nvidia.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: linux-aspeed@lists.ozlabs.org Cc: bcm-kernel-feedback-list@broadcom.com Cc: linux-rpi-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-omap@vger.kernel.org Cc: linux-oxnas@groups.io Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-sunxi@lists.linux.dev Cc: linux-tegra@vger.kernel.org Cc: linux-sh@vger.kernel.org arch/arm/configs/am200epdkit_defconfig | 28 ++--- arch/arm/configs/aspeed_g4_defconfig | 17 ++- arch/arm/configs/aspeed_g5_defconfig | 17 ++- arch/arm/configs/assabet_defconfig | 19 ++- arch/arm/configs/at91_dt_defconfig | 10 +- arch/arm/configs/axm55xx_defconfig | 26 ++-- arch/arm/configs/badge4_defconfig | 17 +-- arch/arm/configs/bcm2835_defconfig | 38 +++--- arch/arm/configs/cerfcube_defconfig | 24 ++-- arch/arm/configs/clps711x_defconfig | 6 +- arch/arm/configs/cm_x300_defconfig | 28 ++--- arch/arm/configs/cns3420vb_defconfig | 20 ++-- arch/arm/configs/colibri_pxa270_defconfig | 41 +++---- arch/arm/configs/colibri_pxa300_defconfig | 12 +- arch/arm/configs/collie_defconfig | 22 ++-- arch/arm/configs/corgi_defconfig | 51 ++++---- arch/arm/configs/davinci_all_defconfig | 28 ++--- arch/arm/configs/dove_defconfig | 32 +++-- arch/arm/configs/ep93xx_defconfig | 18 ++- arch/arm/configs/eseries_pxa_defconfig | 36 ++---- arch/arm/configs/exynos_defconfig | 24 ++-- arch/arm/configs/ezx_defconfig | 74 ++++++------ arch/arm/configs/footbridge_defconfig | 31 ++--- arch/arm/configs/h3600_defconfig | 16 +-- arch/arm/configs/h5000_defconfig | 20 ++-- arch/arm/configs/hackkit_defconfig | 12 +- arch/arm/configs/hisi_defconfig | 24 ++-- arch/arm/configs/imx_v4_v5_defconfig | 10 +- arch/arm/configs/imx_v6_v7_defconfig | 8 +- arch/arm/configs/integrator_defconfig | 2 +- arch/arm/configs/iop32x_defconfig | 23 ++-- arch/arm/configs/ixp4xx_defconfig | 1 - arch/arm/configs/jornada720_defconfig | 16 +-- arch/arm/configs/keystone_defconfig | 64 +++++----- arch/arm/configs/lart_defconfig | 21 ++-- arch/arm/configs/lpc18xx_defconfig | 16 ++- arch/arm/configs/lpc32xx_defconfig | 12 +- arch/arm/configs/lpd270_defconfig | 11 +- arch/arm/configs/lubbock_defconfig | 21 ++-- arch/arm/configs/magician_defconfig | 41 +++---- arch/arm/configs/mainstone_defconfig | 15 ++- arch/arm/configs/milbeaut_m10v_defconfig | 6 +- arch/arm/configs/mini2440_defconfig | 8 +- arch/arm/configs/mmp2_defconfig | 32 +++-- arch/arm/configs/moxart_defconfig | 20 ++-- arch/arm/configs/mps2_defconfig | 18 ++- arch/arm/configs/multi_v4t_defconfig | 6 +- arch/arm/configs/multi_v5_defconfig | 14 +-- arch/arm/configs/multi_v7_defconfig | 62 +++++----- arch/arm/configs/mv78xx0_defconfig | 36 +++--- arch/arm/configs/mvebu_v5_defconfig | 32 +++-- arch/arm/configs/mvebu_v7_defconfig | 4 +- arch/arm/configs/mxs_defconfig | 6 +- arch/arm/configs/neponset_defconfig | 30 ++--- arch/arm/configs/netwinder_defconfig | 18 +-- arch/arm/configs/nhk8815_defconfig | 8 +- arch/arm/configs/omap1_defconfig | 80 ++++++------- arch/arm/configs/omap2plus_defconfig | 17 ++- arch/arm/configs/orion5x_defconfig | 36 +++--- arch/arm/configs/oxnas_v6_defconfig | 14 +-- arch/arm/configs/palmz72_defconfig | 16 ++- arch/arm/configs/pcm027_defconfig | 24 ++-- arch/arm/configs/pleb_defconfig | 8 +- arch/arm/configs/pxa168_defconfig | 22 ++-- arch/arm/configs/pxa255-idp_defconfig | 21 ++-- arch/arm/configs/pxa3xx_defconfig | 20 ++-- arch/arm/configs/pxa910_defconfig | 26 ++-- arch/arm/configs/pxa_defconfig | 140 ++++++++++------------ arch/arm/configs/qcom_defconfig | 62 +++++----- arch/arm/configs/realview_defconfig | 8 +- arch/arm/configs/rpc_defconfig | 20 ++-- arch/arm/configs/s3c2410_defconfig | 12 +- arch/arm/configs/s3c6400_defconfig | 4 +- arch/arm/configs/s5pv210_defconfig | 6 +- arch/arm/configs/sama5_defconfig | 8 +- arch/arm/configs/sama7_defconfig | 8 +- arch/arm/configs/shannon_defconfig | 10 +- arch/arm/configs/simpad_defconfig | 29 ++--- arch/arm/configs/socfpga_defconfig | 8 +- arch/arm/configs/spear13xx_defconfig | 18 +-- arch/arm/configs/spear3xx_defconfig | 12 +- arch/arm/configs/spear6xx_defconfig | 10 +- arch/arm/configs/spitz_defconfig | 51 ++++---- arch/arm/configs/stm32_defconfig | 18 ++- arch/arm/configs/sunxi_defconfig | 2 +- arch/arm/configs/tct_hammer_defconfig | 14 +-- arch/arm/configs/tegra_defconfig | 20 ++-- arch/arm/configs/trizeps4_defconfig | 66 +++++----- arch/arm/configs/u8500_defconfig | 2 +- arch/arm/configs/versatile_defconfig | 4 +- arch/arm/configs/vexpress_defconfig | 8 +- arch/arm/configs/vf610m4_defconfig | 2 +- arch/arm/configs/viper_defconfig | 30 +++-- arch/arm/configs/vt8500_v6_v7_defconfig | 2 +- arch/arm/configs/xcep_defconfig | 32 +++-- arch/arm/configs/zeus_defconfig | 28 ++--- arch/arm64/configs/defconfig | 2 +- arch/sh/configs/ecovec24_defconfig | 2 - 100 files changed, 989 insertions(+), 1189 deletions(-)