diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-10 13:12:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-10 13:12:21 -0400 |
| commit | b62cd976543ae1b90050346c870d8357d749fe2d (patch) | |
| tree | bbfd3ea47f94b4b4fc8af5bd7ef243835f4642ff | |
| parent | dd12b2f632fa32d154dfb338419b987a99071862 (diff) | |
| parent | df1cf775ffa0ae770931f5911c1dc99a9545c3cd (diff) | |
Merge tag 'u-boot-atmel-fixes-2020.04-a' of https://gitlab.denx.de/u-boot/custodians/u-boot-atmel
First set of u-boot-atmel fixes for 2020.04 cycle:
- Includes two small configuration fixes that will solve the SPL booting
on sama5d3_xplained board.
| -rw-r--r-- | configs/sama5d3_xplained_nandflash_defconfig | 1 | ||||
| -rw-r--r-- | include/configs/sama5d3_xplained.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig index 2749290c1c..83ff270e5c 100644 --- a/configs/sama5d3_xplained_nandflash_defconfig +++ b/configs/sama5d3_xplained_nandflash_defconfig @@ -25,6 +25,7 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,768k(uboot)ro,256K(env_redundant),256k(env),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index 696933da73..42c14007c0 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -9,6 +9,7 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/sizes.h> #include "at91-sama5_common.h" /* @@ -64,7 +65,8 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 -#define CONFIG_SYS_MONITOR_LEN (512 << 10) +/* size of u-boot.bin to load */ +#define CONFIG_SYS_MONITOR_LEN (2 * SZ_512K) #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 |