Skip to content

Commit

Permalink
rpi-cmdline: Limit earlycon configuration to Pi4 family
Browse files Browse the repository at this point in the history
At this moment, when building with OS_DEVELOPMENT=1, earlycon is added
to kernel command line, however the current configuration is only
valid on the Pi4 family. Using it with any other device type will make
the kernel hang.

This patch limits the configuration to Pi4, Pi400 and CM4.

Change-type: patch
Signed-off-by: Michal Toman <michalt@balena.io>
  • Loading branch information
mtoman authored and floion committed Jan 20, 2025
1 parent fcc576f commit 1c37a84
Showing 1 changed file with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# Set console accordingly to build type
CMDLINE += " dwc_otg.lpm_enable=0 rootwait"
CMDLINE += "${OS_KERNEL_CMDLINE} ${@oe.utils.conditional('SIGN_API','','',"${OS_KERNEL_SECUREBOOT_CMDLINE}",d)}"
CMDLINE =+ " ${@bb.utils.contains('DISTRO_FEATURES','osdev-image',"earlycon=uart8250,mmio32,0xfe215040 console=tty1","",d)}"

# Add earlycon with OS_DEVELOPMENT=1
CMDLINE:prepend:raspberrypi4-64 = " ${@bb.utils.contains('DISTRO_FEATURES','osdev-image',"earlycon=uart8250,mmio32,0xfe215040 console=tty1","",d)}"
CMDLINE:prepend:raspberrypi400-64 = " ${@bb.utils.contains('DISTRO_FEATURES','osdev-image',"earlycon=uart8250,mmio32,0xfe215040 console=tty1","",d)}"
CMDLINE:prepend:raspberrypicm4-ioboard = " ${@bb.utils.contains('DISTRO_FEATURES','osdev-image',"earlycon=uart8250,mmio32,0xfe215040 console=tty1","",d)}"
CMDLINE:prepend:raspberrypicm4-ioboard-sb = " ${@bb.utils.contains('DISTRO_FEATURES','osdev-image',"earlycon=uart8250,mmio32,0xfe215040 console=tty1","",d)}"

# See https://github.com/raspberrypi/linux/commit/9b0efcc1ec497b2985c6aaa60cd97f0d2d96d203
CMDLINE += " cgroup_enable=memory"
Expand Down

0 comments on commit 1c37a84

Please sign in to comment.