Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

[oweals/u-boot.git] / include / configs / rcar-gen3-common.h

diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 435d1086285b4a843e43ac85728f9826ea3910c5..8f400ba05a0c6542308fe8600ddb6b0c42239941 100644 (file)
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -12,7 +12,10 @@
 #include <asm/arch/rmobile.h>
 
 #define CONFIG_REMAKE_ELF
-#define CONFIG_BUILD_TARGET    "u-boot-elf.srec"
+
+#ifdef CONFIG_SPL
+#define CONFIG_SPL_TARGET      "spl/u-boot-spl.scif"
+#endif
 
 /* boot option */
 
@@ -20,10 +23,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 
-#undef CONFIG_SHOW_BOOT_PROGRESS
-
-#define CONFIG_ARCH_CPU_INIT
-
 /* Generic Interrupt Controller Definitions */
 #define CONFIG_GICV2
 #define GICD_BASE      0xF1010000
@@ -47,24 +46,37 @@
 #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_MALLOC_LEN          (1 * 1024 * 1024)
-#define CONFIG_SYS_BOOTMAPSZ           (8 * 1024 * 1024)
+#define CONFIG_SYS_MONITOR_LEN         (1 * 1024 * 1024)
+#define CONFIG_SYS_MALLOC_LEN          (64 * 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
-#define CONFIG_ENV_SECT_SIZE   (128 * 1024)
-#define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
-       "fdt_high=0xffffffffffffffff\0" \
-       "initrd_high=0xffffffffffffffff\0"
+       "bootm_size=0x10000000\0"
 
 #define CONFIG_BOOTCOMMAND     \
        "tftp 0x48080000 Image; " \
        "tftp 0x48000000 Image-"CONFIG_DEFAULT_FDT_FILE"; " \
        "booti 0x48080000 - 0x48000000"
 
+/* SPL support */
+#if defined(CONFIG_R8A7795) || defined(CONFIG_R8A7796) || defined(CONFIG_R8A77965)
+#define CONFIG_SPL_BSS_START_ADDR      0xe633f000
+#define CONFIG_SPL_BSS_MAX_SIZE                0x1000
+#else
+#define CONFIG_SPL_BSS_START_ADDR      0xe631f000
+#define CONFIG_SPL_BSS_MAX_SIZE                0x1000
+#endif
+#define CONFIG_SPL_STACK               0xe6304000
+#define CONFIG_SPL_MAX_SIZE            0x7000
+#ifdef CONFIG_SPL_BUILD
+#define CONFIG_CONS_SCIF2
+#define CONFIG_SH_SCIF_CLK_FREQ                65000000
+#endif
+
 #endif /* __RCAR_GEN3_COMMON_H */