Merge branch 'master' of git://git.denx.de/u-boot-sh

- Limit bootloader size to 1 MiB on R-Car Gen3

include/configs/rcar-gen3-common.h

@@ -46,10 +46,13 @@
 #define CONFIG_MAX_MEM_MAPPED		(0x80000000u - DRAM_RSV_SIZE)
 
 #define CONFIG_SYS_MONITOR_BASE		0x00000000
-#define CONFIG_SYS_MONITOR_LEN		(256 * 1024)
+#define CONFIG_SYS_MONITOR_LEN		(1 * 1024 * 1024)
 #define CONFIG_SYS_MALLOC_LEN		(1 * 1024 * 1024)
 #define CONFIG_SYS_BOOTM_LEN		(64 << 20)
 
+/* The HF/QSPI layout permits up to 1 MiB large bootloader blob */
+#define CONFIG_BOARD_SIZE_LIMIT		1048576
+
 /* ENV setting */
 #define CONFIG_ENV_OVERWRITE