diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/uniphier.h | 5 | ||||
-rw-r--r-- | include/configs/zynq-common.h | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 1b4140de06..c39f13bf6b 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -33,7 +33,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 /* @@ -186,6 +186,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 && " \ @@ -219,7 +220,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 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index ae82a7aa96..baad8db62f 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -127,7 +127,9 @@ #endif /* Total Size of Environment Sector */ -#define CONFIG_ENV_SIZE (128 << 10) +#ifndef CONFIG_ENV_SIZE +# define CONFIG_ENV_SIZE (128 << 10) +#endif /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE @@ -135,7 +137,9 @@ /* Environment */ #ifndef CONFIG_ENV_IS_NOWHERE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE -# define CONFIG_ENV_OFFSET 0xE0000 +# ifndef CONFIG_ENV_OFFSET +# define CONFIG_ENV_OFFSET 0xE0000 +# endif #endif /* enable preboot to be loaded before CONFIG_BOOTDELAY */ |