Merge git://git.denx.de/u-boot-dm

[platform/kernel/u-boot.git] / include / configs / uniphier.h

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index a5ce52d..b631f79 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2012-2015 Panasonic Corporation
  * Copyright (C) 2015-2016 Socionext Inc.
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /* U-Boot - Common settings for UniPhier Family */
@@ -33,7 +32,7 @@
 
 #define CONFIG_SYS_MAX_FLASH_SECT      256
 #define CONFIG_SYS_MONITOR_BASE                0
-#define CONFIG_SYS_MONITOR_LEN         0x00080000      /* 512KB */
+#define CONFIG_SYS_MONITOR_LEN         0x00090000      /* 576KB */
 #define CONFIG_SYS_FLASH_BASE          0
 
 /*
@@ -52,8 +51,6 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE            (CONFIG_SYS_CBSIZE)
 
-#define CONFIG_CONS_INDEX              1
-
 #define CONFIG_ENV_OFFSET                      0x100000
 #define CONFIG_ENV_SIZE                                0x2000
 /* #define CONFIG_ENV_OFFSET_REDUND    (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) */
@@ -171,10 +168,10 @@
                "run boot_common\0" \
        "tftpboot=tftpboot $kernel_addr_load $bootfile && " \
                "tftpboot $ramdisk_addr_r $ramdisk_file &&" \
-               "tftpboot $fdt_addr_r $fdt_file &&" \
+               "tftpboot $fdt_addr_r $fdtfile &&" \
                "run boot_common\0" \
        "__nfsboot=tftpboot $kernel_addr_load $bootfile && " \
-               "tftpboot $fdt_addr_r $fdt_file &&" \
+               "tftpboot $fdt_addr_r $fdtfile &&" \
                "setenv ramdisk_addr_r - &&" \
                "run boot_common\0"
 #endif
@@ -188,6 +185,7 @@
                "setexpr tmp_addr $nor_base + 0x70000 && " \
                "tftpboot $tmp_addr $third_image\0" \
        "emmcupdate=mmcsetn &&"                                 \
+               "mmc dev $mmc_first_dev &&"                     \
                "mmc partconf $mmc_first_dev 0 1 1 &&"          \
                "tftpboot $second_image && " \
                "mmc write $loadaddr 0 100 && " \
@@ -221,7 +219,7 @@
 #define CONFIG_SPL_TEXT_BASE           0x00100000
 #endif
 
-#define CONFIG_SPL_STACK               (0x00100000)
+#define CONFIG_SPL_STACK               (0x00200000)
 
 #define CONFIG_SYS_NAND_U_BOOT_OFFS            0x20000