diff mbox series

[meta-rockchip,v2] kernel: restore options the 32-bit arch removal drops

Message ID 20261104130230.236614-1-andrea.ricchi@amarulasolutions.com
State New
Headers show
Series [meta-rockchip,v2] kernel: restore options the 32-bit arch removal drops | expand

Commit Message

Andrea Ricchi Nov. 4, 2026, 1:02 p.m. UTC 
multi_v7_defconfig does not list several options the Rockchip boards
rely on; it gets them through "select" from platforms that
remove-non-rockchip-arch-arm.cfg switches off (ARCH_OMAP2PLUS,
ARCH_VEXPRESS, ARCH_VIRT, ARCH_U8500, ...). Removing those platforms
therefore also removes:

  REGULATOR_FIXED_VOLTAGE   parent supply of the PMIC regulators
  VFP, VFPv3, NEON, KERNEL_MODE_NEON
  ARM_PSCI                  HAVE_ARM_SMCCC_DISCOVERY, which
                            ROCKCHIP_PM_DOMAINS depends on
  ROCKCHIP_PM_DOMAINS
  HIGHMEM
  REALTEK_PHY
  USB_EHCI_HCD_PLATFORM, USB_OHCI_HCD_PLATFORM

On tinker-board-s with linux-yocto 6.18 the kernel stops at "Waiting
for root device": the RK808 regulators have no parent supply, so the
SD host never gets vmmc. With the root mounted, every hard-float
binary would fail and the VOPs would never probe for lack of power
domains.

Add the options back in a fragment pulled in by the same scc, so the
removal no longer takes them along. Found by diffing the expanded
multi_v7_defconfig against the built .config.

Signed-off-by: Andrea Ricchi <andrea.ricchi@amarulasolutions.com>
---
v2: add the layer tag to the subject, the patch itself is unchanged.

 .../rockchip/remove-non-rockchip-arch-arm.scc |  1 +
 .../rockchip/restore-arm-selected-options.cfg | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/restore-arm-selected-options.cfg
diff mbox series

Patch

diff --git a/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc b/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc
index ce77704..da5c12e 100644
--- a/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc
+++ b/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc
@@ -1 +1,2 @@ 
 kconf hardware remove-non-rockchip-arch-arm.cfg
+kconf hardware restore-arm-selected-options.cfg
diff --git a/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/restore-arm-selected-options.cfg b/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/restore-arm-selected-options.cfg
new file mode 100644
index 0000000..ababaf6
--- /dev/null
+++ b/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/restore-arm-selected-options.cfg
@@ -0,0 +1,26 @@ 
+# multi_v7_defconfig does not list these options; it gets them through
+# "select" from platforms that remove-non-rockchip-arch-arm.cfg switches
+# off (ARCH_OMAP2PLUS, ARCH_VEXPRESS, ARCH_VIRT, ARCH_U8500, ...). Set them
+# explicitly so removing those platforms does not remove them too.
+
+# regulator-fixed: parent supply of the PMIC regulators on most boards
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+
+# hard-float userspace
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_NEON=y
+CONFIG_KERNEL_MODE_NEON=y
+
+# ROCKCHIP_PM_DOMAINS depends on HAVE_ARM_SMCCC_DISCOVERY, provided by
+# ARM_PSCI; without the power domains the VOPs, HDMI and IOMMUs never probe
+CONFIG_ARM_PSCI=y
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+
+# boards with more than 768 MB
+CONFIG_HIGHMEM=y
+
+# Realtek PHYs on most boards, generic-ehci/generic-ohci in rk3288.dtsi
+CONFIG_REALTEK_PHY=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y