Fixed booting of Raspberry Pi 4 Model B

Makefile

@@ -379,6 +379,8 @@ rpi4b: rpi4b-boot-cmd rpi4b-fw_env.config rpi4b-config
 	tar xf u-boot-2020.04.tar.bz2
 	patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-serial-number-fix.patch
 	$(MAKE) -C u-boot-2020.04 rpi_4_defconfig
+	@echo "CONFIG_ARCH_FIXUP_FDT_MEMORY=y" >> u-boot-2020.04/.config
+	$(MAKE) -C u-boot-2020.04 oldconfig
 	$(MAKE) -C u-boot-2020.04
 	mkdir /uboot
 	mkfs -t vfat -n UBOOT /dev/$(DISK)1
@@ -388,6 +390,8 @@ rpi4b: rpi4b-boot-cmd rpi4b-fw_env.config rpi4b-config
 	@echo "$$BOOTCMD_RPI4" > u-boot-2020.04/boot.cmd
 	u-boot-2020.04/tools/mkimage -C none -A arm -T script -d u-boot-2020.04/boot.cmd /uboot/boot.scr
 	@echo "$$RPI4CONFIG" > /uboot/config.txt
+	tar xf rpi4-firmware.tar.xz -C /uboot --no-same-owner
+	cp /boot/dtbs/5.4.51/broadcom/bcm2711-rpi-4-b.dtb /uboot/bcm2711-rpi-4-b.dtb
 	$(MAKE) -C u-boot-2020.04 envtools
 	cp u-boot-2020.04/tools/env/fw_printenv /sbin/fw_printenv
 	ln -sf /sbin/fw_printenv /sbin/fw_setenv
@@ -421,14 +425,12 @@ max_framebuffers=2
 
 [all]
 arm_64bit=1
+device_tree_address=0x03000000
 enable_uart=1
-dtparam=i2c=on
-dtparam=spi=on
-dtparam=act_led_trigger=heartbeat
-dtparam=pwr_led_trigger=mmc0
 dtparam=audio=on
-device_tree_address=0x02000000
-dtoverlay=vc4-fkms-v3d,cma-128
+dtparam=i2c_arm=on
+dtparam=spi=on
+avoid_warnings=2
 endef
 export RPI4CONFIG
 
@@ -437,6 +439,7 @@ rpi4b-mender: rpi4b-boot-cmd-mender rpi4b-fw_env.config-mender rpi4b-config-mend
 	patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-serial-number-fix.patch
 	patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-mender.patch
 	$(MAKE) -C u-boot-2020.04 rpi_4_defconfig
+	@echo "CONFIG_ARCH_FIXUP_FDT_MEMORY=y" >> u-boot-2020.04/.config
 	@echo "# CONFIG_ENV_IS_NOWHERE is not set" >> u-boot-2020.04/.config
 	@echo "# CONFIG_ENV_IS_IN_FAT is not set" >> u-boot-2020.04/.config
 	@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
@@ -450,6 +453,8 @@ rpi4b-mender: rpi4b-boot-cmd-mender rpi4b-fw_env.config-mender rpi4b-config-mend
 	@echo "$$BOOTCMD_RPI4_MENDER" > u-boot-2020.04/boot.cmd
 	u-boot-2020.04/tools/mkimage -C none -A arm -T script -d u-boot-2020.04/boot.cmd /uboot/boot.scr
 	@echo "$$RPI4CONFIG_MENDER" > /uboot/config.txt
+	tar xf rpi4-firmware.tar.xz -C /uboot --no-same-owner
+	cp /boot/dtbs/5.4.51/broadcom/bcm2711-rpi-4-b.dtb /uboot/bcm2711-rpi-4-b.dtb
 	$(MAKE) -C u-boot-2020.04 envtools
 	cp u-boot-2020.04/tools/env/fw_printenv /sbin/fw_printenv
 	ln -svf /sbin/fw_printenv /sbin/fw_setenv
@@ -485,14 +490,12 @@ max_framebuffers=2
 
 [all]
 arm_64bit=1
+device_tree_address=0x03000000
 enable_uart=1
-dtparam=i2c=on
-dtparam=spi=on
-dtparam=act_led_trigger=heartbeat
-dtparam=pwr_led_trigger=mmc0
 dtparam=audio=on
-device_tree_address=0x02000000
-dtoverlay=vc4-fkms-v3d,cma-128
+dtparam=i2c_arm=on
+dtparam=spi=on
+avoid_warnings=2
 endef
 export RPI4CONFIG_MENDER