Patch queue for rpi - 2018-06-03

This pull request only includes a single patch that was left
 out in the last one: A fix to have the fdt stay at its original
 location in RAM during boot.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJbE/B2AAoJECszeR4D/txgNd8QAMEyUMTONRAxGGwUBnqrP1Nu
 ITyT84TDpNW2AFvdbTB+w+su0RvCVvEvVVj2C9EGtsCKOZiRTli52CNTK7iTpgEn
 ebA+T8SYoEwv4lex6YPhGEc05IqMzm3sePP2wXT5nSJiQBsCrvtl2ypC0QnxcHmA
 tTXX0gzaQzvg8HlMpvkxQeihjttYvw06XPUdYcvewXjloe/t3dWT0crV3or/pL2k
 ZNjAdodHMAu+ELW6zV07BxLYX6DneMjbFF5ri6tjMetlsf5TKXkx86HLCnPhWaVc
 6q5G3ftSeaHnYRdZT/i/o61TwQQKZ1cCVeqhZhFyU1UQcz37p3afgB7/7evP69Fd
 pJuqnntrwBUGEAjTqHPOnBV1/ZEbUVr4IcqrXopCSYCcV7nWJIh2slkrfRIm+kQy
 x3ksZcV1qXeVK6m40saVDfi60HtJWHmiZrXf5EOJ/UoyRABVO85ijZjVau9EKSIJ
 2UXCaMJ8n/+Jh0bodjnrLvRrp2mhDF+uyieocfoLFwqGo4KJnIsKHGLKgC+zlAve
 KyM+13RlRJVfVMkK57modThojSsC+hPnIZo/0XNWPPAJieuYLjbqhEGuNf5wwO9z
 01QBxppu6nBAl+WfHzsYiQ9W6DANWs4kh2g6l/yjuRlNc6R4jN5ZGTtlaNRIVYkd
 bo7qED/Rw8+6avIbtSvg
 =pWdA
 -----END PGP SIGNATURE-----

Merge tag 'signed-rpi-next' of git://github.com/agraf/u-boot

Patch queue for rpi - 2018-06-03

This pull request only includes a single patch that was left
out in the last one: A fix to have the fdt stay at its original
location in RAM during boot.

include/configs/rpi.h

@@ -90,6 +90,14 @@
 	"stdout=serial,vidconsole\0" \
 	"stderr=serial,vidconsole\0"
 
+#ifdef CONFIG_ARM64
+#define FDT_HIGH "ffffffffffffffff"
+#define INITRD_HIGH "ffffffffffffffff"
+#else
+#define FDT_HIGH "ffffffff"
+#define INITRD_HIGH "ffffffff"
+#endif
+
 /*
  * Memory layout for where various images get loaded by boot scripts:
  *
@@ -132,8 +140,8 @@
  * large initrds before they start colliding with U-Boot.
  */
 #define ENV_MEM_LAYOUT_SETTINGS \
-	"fdt_high=ffffffff\0" \
-	"initrd_high=ffffffff\0" \
+	"fdt_high=" FDT_HIGH "\0" \
+	"initrd_high=" INITRD_HIGH "\0" \
 	"kernel_addr_r=0x00080000\0" \
 	"scriptaddr=0x02400000\0" \
 	"pxefile_addr_r=0x02500000\0" \