diff --git a/live-build/auto/config b/live-build/auto/config
index 98802ae0..cf5574c3 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1280,74 +1280,16 @@ EOF
     ;;
 esac
 
-case $ARCH+$SUBARCH in
-	armhf+raspi2|armhf+raspi|arm64+raspi)
+case "$ARCH+${SUBARCH:-}" in
+	*+raspi)
 		cat > config/hooks/01-firmware-directory.chroot_early <<EOF
 #!/bin/sh -ex
 mkdir -p /boot/firmware
 EOF
-		cat > config/hooks/999-raspi2-fixes.chroot <<EOF
+		cat > config/hooks/999-raspi-fixes.chroot <<EOF
 #!/bin/sh -ex
 cat >> /etc/fstab << EOM
 LABEL=system-boot       /boot/firmware  vfat    defaults        0       1
-EOM
-
-cat > /boot/firmware/cmdline.txt << EOM
-net.ifnames=0 dwc_otg.lpm_enable=0 console=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline rootwait
-EOM
-
-cat > /boot/firmware/config.txt << EOM
-# For more options and information see 
-# http://www.raspberrypi.org/documentation/configuration/config-txt.md
-# Some settings may impact device functionality. See link above for details
-
-kernel=uboot.bin
-device_tree_address=0x02000000
-
-# enable i2c
-dtparam=i2c_arm=on
-dtparam=spi=on
-
-# uncomment if you get no picture on HDMI for a default "safe" mode
-#hdmi_safe=1
-
-# uncomment this if your display has a black border of unused pixels visible
-# and your display can output without overscan
-#disable_overscan=1
-
-# uncomment the following to adjust overscan. Use positive numbers if console
-# goes off screen, and negative if there is too much border
-#overscan_left=16
-#overscan_right=16
-#overscan_top=16
-#overscan_bottom=16
-
-# uncomment to force a console size. By default it will be display's size minus
-# overscan.
-#framebuffer_width=1280
-#framebuffer_height=720
-
-# uncomment if hdmi display is not detected and composite is being output
-#hdmi_force_hotplug=1
-
-# uncomment to force a specific HDMI mode (this will force VGA)
-#hdmi_group=1
-#hdmi_mode=1
-
-# uncomment to force a HDMI mode rather than DVI. This can make audio work in
-# DMT (computer monitor) modes
-#hdmi_drive=2
-
-# uncomment to increase signal to HDMI, if you have interference, blanking, or
-# no display
-#config_hdmi_boost=4
-
-# uncomment for composite PAL
-#sdtv_mode=2
-
-#uncomment to overclock the arm. 700 MHz is the default.
-#arm_freq=800
-
 EOM
 EOF
 		;;