Skip to contentSkip to conversation

ARM: configs: fix multi_v5_defconfig

PATCH New Andre Przywara 2 participants 7 messages Mar 17, 2022 – Mar 19, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover ARM: configs: fix multi_v5_defconfig

This series is a revamp of two patches contained in some Allwinner F1C100 DT update (patch 13 and 14 in [1]). Back then I was just syncing the result of "make savedefconfig" over to multi_v5_defconfig, but this revealed there were problems in the defconfig which warrant closer inspection.

This series fixes the multi_v5_defconfig in a way that "make savedefconfig" and multi_v5_defconfig come out identical, but also the options we mention in the defconfig are actually honoured. Currently some options are not enabled, because we lost dependencies over the past two years or so.

The commit messages contain the details about what happened to each option. Patches 1 and 4 are just cleanups, without .config or savedefconfig changes, but patch 2 and 3 change the active options. Patch 5 enables the Allwinner platform in the multi_v5_defconfig, so that the LicheePi Nano boots to the prompt.

This series relies on [2], that fixes Kconfig dependencies for one of the options we enable.

Please have a look!

Cheers,
Andre

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/dri-devel/[email protected]/raw

Andre Przywara (5):
ARM: configs: multi_v5_defconfig: remove deleted platforms
ARM: configs: multi_v5_defconfig: re-enable
CONFIG_V4L_PLATFORM_DRIVERS
ARM: configs: multi_v5_defconfig: re-enable DRM_PANEL and FB_xxx
ARM: configs: clean up multi_v5_defconfig
ARM: configs: multi_v5: Enable Allwinner F1C100

 arch/arm/configs/multi_v5_defconfig | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/5 ARM: configs: multi_v5_defconfig: remove deleted platforms

Some ARMv5 platforms got removed from the kernel over time, so we don't need their symbols in the multi_v5_defconfig anymore:

- ARCH_U300 got removed with commit ce1380c9f4bc ("ARM: remove u300 platform"), so CONFIG_ARCH_U300 is not around anymore.
- ARCH_U300 was the only platform selecting ARCH_AMBA, which I2C_NOMADIK depends on. So we won't need this symbol anymore, and can't select it anyway.
- i.MX27 got converted to DT in 879c0e5e0ac7 ("ARM: imx: Remove i.MX27 board files"). Remove the now obsolete board file version symbols.

No change in the generated .config or savedefconfig.

---
 arch/arm/configs/multi_v5_defconfig | 7 -------
 1 file changed, 7 deletions(-)
arch/arm/configs/multi_v5_defconfig +0 -7
index fe8d760256a4..5d754aad0272 100644
@@ -24,11 +24,6 @@ CONFIG_MACH_DM355_LEOPARD=y
 CONFIG_MACH_MITYOMAPL138=y
 CONFIG_MACH_OMAPL138_HAWKBOARD=y
 CONFIG_ARCH_MXC=y
-CONFIG_MACH_MX21ADS=y
-CONFIG_MACH_MX27ADS=y
-CONFIG_MACH_MX27_3DS=y
-CONFIG_MACH_IMX27_VISSTRIM_M10=y
-CONFIG_MACH_PCA100=y
 CONFIG_SOC_IMX25=y
 CONFIG_SOC_IMX27=y
 CONFIG_ARCH_MVEBU=y
@@ -57,7 +52,6 @@ CONFIG_MACH_WNR854T=y
 CONFIG_MACH_RD88F5181L_GE=y
 CONFIG_MACH_RD88F5181L_FXO=y
 CONFIG_MACH_RD88F6183AP_GE=y
-CONFIG_ARCH_U300=y
 CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -159,7 +153,6 @@ CONFIG_I2C_ASPEED=m
 CONFIG_I2C_AT91=y
 CONFIG_I2C_IMX=y
 CONFIG_I2C_MV64XXX=y
-CONFIG_I2C_NOMADIK=y
 CONFIG_SPI=y
 CONFIG_SPI_ATMEL=y
 CONFIG_SPI_IMX=y
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/5 ARM: configs: multi_v5_defconfig: re-enable CONFIG_V4L_PLATFORM_DRIVERS

In reply to Andre Przywara

Commit 06b93644f4d1 ("media: Kconfig: add an option to filter in/out platform drivers") introduced CONFIG_MEDIA_PLATFORM_SUPPORT, to allow more fine grained control over the inclusion of certain Kconfig files. multi_v5_defconfig was selecting some drivers described in drivers/media/platform/Kconfig, which now wasn't included anymore.

Explicitly set the new symbol in multi_v5_defconfig to bring those drivers back.
This enables some new V4L2 and VIDEOBUF2 features, but as modules only.

Fixes 06b93644f4d1 ("media: Kconfig: add an option to filter in/out platform drivers")
---
 arch/arm/configs/multi_v5_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/multi_v5_defconfig +1 -0
index 5d754aad0272..dfbca8a683e2 100644
@@ -181,6 +181,7 @@ CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_ASPEED=m
 CONFIG_VIDEO_ATMEL_ISI=m
Signature · 1 line
2.25.1
#3 lore raw

PATCH 3/5 ARM: configs: multi_v5_defconfig: re-enable DRM_PANEL and FB_xxx

In reply to Andre Przywara

Commit 91185d55b32e ("drm: Remove DRM_KMS_FB_HELPER Kconfig option") led to de-selection of CONFIG_FB, which was a prerequisite for BACKLIGHT_CLASS_DEVICE, which CONFIG_DRM_PANEL_SIMPLE depended on. Explicitly set CONFIG_FB, to bring DRM_PANEL_SIMPLE, DRM_PANEL_EDP, FB_IMX and FB_ATMEL back into the generated .config.
This also adds some new FB related features like fonts and the framebuffer console.

See also commit 8c1768967e27 ("ARM: config: mutli v7: Reenable FB dependency"), which solved the same problem for multi_v7_defconfig.

This relies on [1], to fix a broken Kconfig dependency.

[1] https://lore.kernel.org/dri-devel/[email protected]/raw

Fixes 91185d55b32e ("drm: Remove DRM_KMS_FB_HELPER Kconfig option")
---
 arch/arm/configs/multi_v5_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/multi_v5_defconfig +1 -0
index dfbca8a683e2..9af55d650cf4 100644
@@ -190,6 +190,7 @@ CONFIG_DRM_ATMEL_HLCDC=m
 CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_DRM_PANEL_EDP=y
 CONFIG_DRM_ASPEED_GFX=m
+CONFIG_FB=y
 CONFIG_FB_IMX=y
 CONFIG_FB_ATMEL=y
 CONFIG_BACKLIGHT_ATMEL_LCDC=y
Signature · 1 line
2.25.1
#4 lore raw

PATCH 4/5 ARM: configs: clean up multi_v5_defconfig

In reply to Andre Przywara

Clean up some cruft accumulated over time:
- The default definition of CONFIG_ZBOOT_ROM_* got fixed in commit 39c3e304567a ("ARM: 8984/1: Kconfig: set default ZBOOT_ROM_TEXT/BSS value to 0x0"), so we don't need the explicit setting anymore.
- CONFIG_ABX500_CORE now explicitly depends on the ARMv7 ARCH_U8500, so we don't need to disable that symbol explicitly anymore.
- CONFIG_DEBUG_FS was just moved around in the generated defconfig.

No change to the generated .config or savedefconfig.

---
 arch/arm/configs/multi_v5_defconfig | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/arm/configs/multi_v5_defconfig +1 -4
index 9af55d650cf4..f89baa88facb 100644
@@ -54,8 +54,6 @@ CONFIG_MACH_RD88F5181L_FXO=y
 CONFIG_MACH_RD88F6183AP_GE=y
 CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_CPU_FREQ=y
@@ -176,7 +174,6 @@ CONFIG_ORION_WATCHDOG=y
 CONFIG_NPCM7XX_WATCHDOG=y
 CONFIG_IMX2_WDT=y
 CONFIG_MFD_ATMEL_HLCDC=y
-# CONFIG_ABX500_CORE is not set
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_MEDIA_SUPPORT=y
@@ -298,8 +295,8 @@ CONFIG_CRYPTO_DEV_MARVELL_CESA=y
 CONFIG_CRC_CCITT=y
 CONFIG_LIBCRC32C=y
 CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_FS=y
 CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_DEBUG_PREEMPT is not set
Signature · 1 line
2.25.1
#5 lore raw

PATCH 5/5 ARM: configs: multi_v5: Enable Allwinner F1C100

In reply to Andre Przywara

The Kconfig symbols required for the Allwinner F1C100 (MACH_SUNIV) are currently not selected by any defconfig. sunxi_defconfig only covers the v7 SoCs, but the F1C100s is ARMv5, so we cannot share a single image.

Add the required symbols to multi_v5_defconfig, to give people some sane default config when playing around with this chip. This is probably more important as there are surely not many distros out there supporting ARMv5 out of the box.

This allows my LicheePi Nano board to boot to a busybox prompt.

The zImage size grows by about 50 KB, in detail:

text data bss dec hex filename

10510000  4400700  687740 15598440 ee0368 vmlinux-old
10588592  4469096  686812 15744500 f03df4 vmlinux-new

14922908 arch/arm/boot/Image-old
15067388 arch/arm/boot/Image-new
6388016 arch/arm/boot/zImage-old
6440064 arch/arm/boot/zImage-new

---
 arch/arm/configs/multi_v5_defconfig | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm/configs/multi_v5_defconfig +5 -0
index f89baa88facb..19ffce42223f 100644
@@ -52,6 +52,7 @@ CONFIG_MACH_WNR854T=y
 CONFIG_MACH_RD88F5181L_GE=y
 CONFIG_MACH_RD88F5181L_FXO=y
 CONFIG_MACH_RD88F6183AP_GE=y
+CONFIG_ARCH_SUNXI=y
 CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
 CONFIG_ARM_APPENDED_DTB=y
@@ -135,6 +136,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=6
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_ASPEED_VUART=m
+CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_ATMEL=y
 CONFIG_SERIAL_ATMEL_CONSOLE=y
@@ -155,6 +157,7 @@ CONFIG_SPI=y
 CONFIG_SPI_ATMEL=y
 CONFIG_SPI_IMX=y
 CONFIG_SPI_ORION=y
+CONFIG_SPI_SUN6I=y
 CONFIG_GPIO_ASPEED=m
 CONFIG_GPIO_ASPEED_SGPIO=y
 CONFIG_GPIO_MXC=y
@@ -171,6 +174,7 @@ CONFIG_THERMAL=y
 CONFIG_KIRKWOOD_THERMAL=y
 CONFIG_AT91SAM9X_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
+CONFIG_SUNXI_WATCHDOG=y
 CONFIG_NPCM7XX_WATCHDOG=y
 CONFIG_IMX2_WDT=y
 CONFIG_MFD_ATMEL_HLCDC=y
@@ -241,6 +245,7 @@ CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_SDHCI_OF_ASPEED=m
 CONFIG_MMC_ATMELMCI=y
 CONFIG_MMC_MVSDIO=y
+CONFIG_MMC_SUNXI=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
Signature · 1 line
2.25.1
#6 lore raw
In reply to Andre Przywara
This series was applied to soc/soc.git (for-next) by Arnd Bergmann <[email protected]>:

Hello:

This series was applied to soc/soc.git (for-next)
by Arnd Bergmann <[email protected]>:

Quoted 6 lines · On Thu, 17 Mar 2022 18:30:38 +0000 you wrote:

This series is a revamp of two patches contained in some Allwinner F1C100 DT update (patch 13 and 14 in [1]). Back then I was just syncing the result of "make savedefconfig" over to multi_v5_defconfig, but this revealed there were problems in the defconfig which warrant closer inspection.

Quoted 7 lines

This series fixes the multi_v5_defconfig in a way that "make savedefconfig" and multi_v5_defconfig come out identical, but also the options we mention in the defconfig are actually honoured. Currently some options are not enabled, because we lost dependencies over the past two years or so.

[...]

Here is the summary with links:
- [1/5] ARM: configs: multi_v5_defconfig: remove deleted platforms

    https://git.kernel.org/soc/soc/c/30160c195596
  - [2/5] ARM: configs: multi_v5_defconfig: re-enable CONFIG_V4L_PLATFORM_DRIVERS
    https://git.kernel.org/soc/soc/c/f5eb04d7a0e4
  - [3/5] ARM: configs: multi_v5_defconfig: re-enable DRM_PANEL and FB_xxx
    https://git.kernel.org/soc/soc/c/9c44d0805f94
  - [4/5] ARM: configs: clean up multi_v5_defconfig
    https://git.kernel.org/soc/soc/c/4bcf5f95c7fd

- [5/5] ARM: configs: multi_v5: Enable Allwinner F1C100 (no matching commit)

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html