Skip to content

Commit

Permalink
Revert ":sparkles: Directly blacklist the vc4 module everywhere" (#1471)
Browse files Browse the repository at this point in the history
Revert ":sparkles: Directly blacklist the vc4 module everywhere (#1443)"

This reverts commit ffd9f67.
  • Loading branch information
Itxaka authored Jun 1, 2023
1 parent 46ace19 commit 8b1b1e0
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 9 deletions.
5 changes: 5 additions & 0 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,11 @@ 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
Expand Down
18 changes: 18 additions & 0 deletions overlay/files-rpi/etc/cos/bootargs.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
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
9 changes: 0 additions & 9 deletions overlay/files/etc/modprobe.d/vc4-blacklist.conf

This file was deleted.

0 comments on commit 8b1b1e0

Please sign in to comment.