From 21cb8749b420c3da8f89d53510cf536d052343ae Mon Sep 17 00:00:00 2001 From: Fabien Lehoussel Date: Mon, 24 Feb 2020 16:28:32 +0100 Subject: [PATCH 1/2] board: sama5d3_xplained: Fix SPL DTB read from NAND SPL boot cannot find dtb if CONFIG_SPL_SEPARATE_BSS is disabled : CONFIG_SPL_SEPARATE_BSS=n RomBOOT Missing DTB ### ERROR ### Please RESET the board ### RomBOOT CONFIG_SPL_SEPARATE_BSS=y RomBOOT U-Boot SPL 2019.04-linux4sam_6.2-icp-dirty (Feb 24 2020 - 15:34:35 +0100) Trying to boot from NAND Signed-off-by: Fabien Lehoussel --- configs/sama5d3_xplained_nandflash_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig index 9ad05f5ffd6..bfc639975d6 100644 --- a/configs/sama5d3_xplained_nandflash_defconfig +++ b/configs/sama5d3_xplained_nandflash_defconfig @@ -24,6 +24,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 From df1cf775ffa0ae770931f5911c1dc99a9545c3cd Mon Sep 17 00:00:00 2001 From: Fabien Lehoussel Date: Mon, 24 Feb 2020 16:45:31 +0100 Subject: [PATCH 2/2] board: sama5d3_xplained: Fix uboot size when loaded from NAND by SPL Uboot size is incorrect. Uboot SPL use CONFIG_SYS_MONITOR_LEN to read uboot from NAND : 0x80000 With sama5d3_xplained_nandflash_defconfig : u-boot.bin size is ~800Ko 0xC0000 So I increased size to 1MB : 0x100000 Signed-off-by: Fabien Lehoussel --- include/configs/sama5d3_xplained.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index 696933da73d..42c14007c08 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -9,6 +9,7 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include #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