ARM: rmobile: Point load address to more sane area on Gen3

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

diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index e9e5fecc12a06ee8cf5dfc6ccd9d4e71c4d1fe3d..07f08db4fe76a183d3ce340517c048afa95a6785 100644 (file)
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * include/configs/rcar-gen3-common.h
  *     This file is R-Car Gen3 common configuration file.
  *
  * Copyright (C) 2015-2017 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __RCAR_GEN3_COMMON_H
@@ -13,14 +12,13 @@
 #include <asm/arch/rmobile.h>
 
 #define CONFIG_REMAKE_ELF
+#define CONFIG_BUILD_TARGET    "u-boot-elf.srec"
 
 /* boot option */
-#define CONFIG_SUPPORT_RAW_INITRD
 
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
 
 #undef CONFIG_SHOW_BOOT_PROGRESS
 
@@ -34,23 +32,18 @@
 /* console */
 #define CONFIG_SYS_CBSIZE              2048
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_MAXARGS             64
 #define CONFIG_SYS_BAUDRATE_TABLE      { 115200, 38400 }
 
 /* MEMORY */
-#if defined(CONFIG_R8A77970)
-#define CONFIG_SYS_TEXT_BASE           0x58280000
-#else
-#define CONFIG_SYS_TEXT_BASE           0x50000000
-#endif
 #define CONFIG_SYS_INIT_SP_ADDR                CONFIG_SYS_TEXT_BASE
 
 #define DRAM_RSV_SIZE                  0x08000000
 #define CONFIG_NR_DRAM_BANKS           4
 #define CONFIG_SYS_SDRAM_BASE          (0x40000000 + DRAM_RSV_SIZE)
 #define CONFIG_SYS_SDRAM_SIZE          (0x80000000u - DRAM_RSV_SIZE)
-#define CONFIG_SYS_LOAD_ADDR           0x48080000
+#define CONFIG_SYS_LOAD_ADDR           0x58000000
+#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_MAX_MEM_MAPPED          (0x80000000u - DRAM_RSV_SIZE)
 
@@ -58,6 +51,7 @@
 #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_BOOTM_LEN           (64 << 20)
 
 /* ENV setting */
 #define CONFIG_ENV_OVERWRITE