From 887fa2197eca62e41fafecbcc91dd5ec2957beae Mon Sep 17 00:00:00 2001 From: Itxaka Date: Tue, 23 May 2023 15:03:51 +0200 Subject: [PATCH] :sparkles: Directly blacklist the vc4 module everywhere This makes us drop the especific config files for rpi Signed-off-by: Itxaka --- Earthfile | 5 ----- overlay/files-rpi/etc/cos/bootargs.cfg | 18 ------------------ .../files/etc/modprobe.d/vc4-blacklist.conf | 9 +++++++++ 3 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 overlay/files-rpi/etc/cos/bootargs.cfg create mode 100644 overlay/files/etc/modprobe.d/vc4-blacklist.conf diff --git a/Earthfile b/Earthfile index cff89d682..d2ea62853 100644 --- a/Earthfile +++ b/Earthfile @@ -202,11 +202,6 @@ framework: # TODO: Make this also a package? COPY overlay/files /framework - # Copy common overlay files for Raspberry Pi - IF [ "$MODEL" = "rpi64" ] - COPY overlay/files-rpi/ /framework - END - # Copy flavor-specific overlay files IF [[ "$FLAVOR" =~ ^alpine* ]] COPY overlay/files-alpine/ /framework diff --git a/overlay/files-rpi/etc/cos/bootargs.cfg b/overlay/files-rpi/etc/cos/bootargs.cfg deleted file mode 100644 index 8391be319..000000000 --- a/overlay/files-rpi/etc/cos/bootargs.cfg +++ /dev/null @@ -1,18 +0,0 @@ -set kernel=/boot/vmlinuz - -# Note on RPI bootargs -# We additionally set modprobe.blacklist=vc4 as certain Displays are not supported by vc4. -# As kairos main target is cloud and not graphics usage, we blacklist it to avoid -# that the HDMI output goes off due to drivers kicking during boot. vc4 is required where graphics -# or video playback is needed, which is not the case in this example here. -# A similar workaround could be applied at config.txt level, by diabling the vc4 overlay. -# See also: https://en.opensuse.org/HCL:Raspberry_Pi3#I_see_HDMI_output_in_U-Boot.2C_but_not_in_Linux , -# https://en.opensuse.org/HCL:Raspberry_Pi3#DSI_output_not_supported_by_VC4_driver, -# https://bugzilla.opensuse.org/show_bug.cgi?id=1181683 and https://github.com/raspberrypi/linux/issues/4020 -if [ -n "$recoverylabel" ]; then - set kernelcmd="console=tty1 console=ttyS0,115200 root=live:LABEL=$recoverylabel net.ifnames=1 rd.live.dir=/ rd.live.squashimg=$img panic=5 modprobe.blacklist=vc4 rd.cos.oemtimeout=10" -else - set kernelcmd="console=tty1 console=ttyS0,115200 root=LABEL=$label net.ifnames=1 cos-img/filename=$img panic=5 security=selinux selinux=1 modprobe.blacklist=vc4 rd.cos.oemtimeout=10 rd.cos.oemlabel=COS_OEM" -fi - -set initramfs=/boot/initrd \ No newline at end of file diff --git a/overlay/files/etc/modprobe.d/vc4-blacklist.conf b/overlay/files/etc/modprobe.d/vc4-blacklist.conf new file mode 100644 index 000000000..8b278baf8 --- /dev/null +++ b/overlay/files/etc/modprobe.d/vc4-blacklist.conf @@ -0,0 +1,9 @@ +# We additionally blacklist=vc4 as certain Displays are not supported by vc4. +# As kairos main target is cloud and not graphics usage, we blacklist it to avoid +# that the HDMI output goes off due to drivers kicking during boot. vc4 is required where graphics +# or video playback is needed, which is not the case in this example here. +# A similar workaround could be applied at config.txt level, by diabling the vc4 overlay. +# See also: https://en.opensuse.org/HCL:Raspberry_Pi3#I_see_HDMI_output_in_U-Boot.2C_but_not_in_Linux , +# https://en.opensuse.org/HCL:Raspberry_Pi3#DSI_output_not_supported_by_VC4_driver, +# https://bugzilla.opensuse.org/show_bug.cgi?id=1181683 and https://github.com/raspberrypi/linux/issues/4020 +blacklist vc4 \ No newline at end of file