From 3f9e671fedd54b4a332e5a93e156489600203fad Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Thu, 21 Oct 2021 16:05:00 +0200 Subject: [PATCH] Drop extraneous sed-ing of cma= in z50-raspi-firmware hook for Pi 4. For starters, the pattern no longer exists since this commit in raspi-firmware: commit dd456f4746a800ac85bdf376b5efcdb1fac133de Author: Gunnar Wolf Date: Wed Aug 5 12:02:57 2020 -0500 Don't set CMA in RPi4 unless specified expressly and there's now a SET_CMA variable instead. And more importantly, the Pi 4 gets appropriate treatment thanks to this commit (empty SET_CMA), which the Pi Compute Module 4 might get soon too (see #996937). This commit first shipped in debian/1.20200601-2, and we are using one of those at the moment for the Pi 4 family: - 1.20210303+ds-2 (bullseye) - 1.20210303+ds-2~bpo10+1 (buster-backports) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9bc4569..31a1f14 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ raspi_4_buster.yaml: raspi_base_buster.yaml cat raspi_base_buster.yaml | sed "s/__ARCH__/arm64/" | \ sed "s#raspi3-firmware#raspi-firmware/buster-backports#" | \ sed "s#apt-get update#echo 'APT::Default-Release \"buster\";' > /etc/apt/apt.conf\n apt-get update#" | \ - sed "s#\(RASPIROOT.*cmdline.txt\)#\1\n sed -i 's/cma=64M //' /boot/firmware/cmdline.txt\n sed -i 's/cma=\\\$$CMA //' /etc/kernel/postinst.d/z50-raspi-firmware#" | \ + sed "s#\(RASPIROOT.*cmdline.txt\)#\1\n sed -i 's/cma=64M //' /boot/firmware/cmdline.txt#" | \ sed "s/__LINUX_IMAGE__/linux-image-arm64\/buster-backports/" | \ sed "s/__EXTRA_PKGS__/- firmware-brcm80211\/buster-backports/" | \ sed "s/__DTB__/\\/usr\\/lib\\/linux-image-*-arm64\\/broadcom\\/bcm*rpi*.dtb/" |\ @@ -113,7 +113,7 @@ raspi_3_bullseye.yaml: raspi_base_bullseye.yaml raspi_4_bullseye.yaml: raspi_base_bullseye.yaml cat raspi_base_bullseye.yaml | sed "s/__ARCH__/arm64/" | \ - sed "s#\(RASPIROOT.*cmdline.txt\)#\1\n sed -i 's/cma=64M //' /boot/firmware/cmdline.txt\n sed -i 's/cma=\\\$$CMA //' /etc/kernel/postinst.d/z50-raspi-firmware#" | \ + sed "s#\(RASPIROOT.*cmdline.txt\)#\1\n sed -i 's/cma=64M //' /boot/firmware/cmdline.txt#" | \ sed "s/__LINUX_IMAGE__/linux-image-arm64/" | \ sed "s/__EXTRA_PKGS__/- firmware-brcm80211/" | \ sed "s/__DTB__/\\/usr\\/lib\\/linux-image-*-arm64\\/broadcom\\/bcm*rpi*.dtb/" |\