arm-rpi4: use mode nouboot for rpi kernel only

features.in/arm-rpi4/config.mk

@@ -21,6 +21,8 @@ use/arm-rpi4/x11: use/arm-rpi4
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd hciuart)
 
 use/arm-rpi4/kernel: use/arm-rpi4
+	@$(call set,RPI_NOUBOOT,yes)
+	@$(call xport,RPI_NOUBOOT)
 ifeq (aarch64,$(ARCH))
 	@$(call set,KFLAVOURS,rpi-un rpi-def)
 else

features.in/arm-rpi4/image-scripts.d/98-bootstrap-boot-by-firmware

@@ -28,11 +28,11 @@ hdmi_ignore_edid_audio=1
 
 [pi3]
 kernel=uboot-rpi_3.bin
-dtoverlay=vc4-fkms-v3d
+#dtoverlay=vc4-fkms-v3d
 
 [pi4]
 kernel=uboot-rpi_4.bin
-dtoverlay=vc4-fkms-v3d
+#dtoverlay=vc4-fkms-v3d
 
 [all]
 EOF
@@ -40,11 +40,10 @@ EOF
 [ "$GLOBAL_ARCH" = armh ] && \
 	sed -i 's/.bin/_32b.bin/g' /boot/efi/config.txt
 
-# framebuffer not working with dtoverlay=vc4-fkms-v3d on RPi3 aarch64
-[ "$GLOBAL_ARCH" = armh ] && \
-	sed -i '/#dtoverlay=vc4-fkms-v3d/s/#//' /boot/efi/config.txt
-
 # Enable bootloading without u-boot
-sh -x rpi4-boot-nouboot $kflavour
+if [ -n "${GLOBAL_RPI_NOUBOOT-}" ]; then
+	rpi4-boot-nouboot $kflavour
+	sed -i '/#dtoverlay=vc4-fkms-v3d/s/#//' /boot/efi/config.txt
+fi
 
 exit 0