dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-28 22:11:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

pico-imx7d: Support distro boot for FIT image case

Browse Source 
Support distro boot for pico imx7d in FIT image case.

Signed-off-by: Jun Nie <jun.nie@linaro.org>
Tested-by: Joris Offouga <offougajoris@gmail.com>
This commit is contained in:
Jun Nie
2019-07-16 15:42:57 +08:00
committed by Stefano Babic
parent b86745efea
commit 7cc7c1e9db
1 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/configs/pico-imx7d.h
View File

@@ -55,17 +55,17 @@
/* When booting with FIT specify the node entry containing boot.scr */ /* When booting with FIT specify the node entry containing boot.scr */
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
#define PICO_BOOT_ENV \ #define PICO_BOOT_ENV \
"bootscr_fitimage_name=bootscr\0" \ BOOTENV \
"bootscriptaddr=0x83200000\0" \
"fdtovaddr=0x83100000\0" \ "fdtovaddr=0x83100000\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "scriptaddr=0x83200000\0" \
"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \ "mmcargs=setenv bootargs console=${console},${baudrate} " \
"rootwait rw;\0" \ "rootwait rw\0" \
"loadbootscript=" \ "boot_a_script=" \
"load mmc ${mmcdev}:${mmcpart} ${bootscriptaddr} ${script};\0" \ "load ${devtype} ${devnum}:${distro_bootpart} " \
"bootscript=echo Running bootscript from mmc ...; " \ "${scriptaddr} ${prefix}${script}; " \
"source ${bootscriptaddr}:${bootscr_fitimage_name}\0" "iminfo ${scriptaddr};" \
"if test $? -eq 1; then hab_failsafe; fi;" \
"source ${scriptaddr}:bootscr\0"
#else #else
#define PICO_BOOT_ENV \ #define PICO_BOOT_ENV \
"bootmenu_0=Boot using PICO-Hobbit baseboard=" \ "bootmenu_0=Boot using PICO-Hobbit baseboard=" \
@@ -112,21 +112,6 @@
"setup_emmc=mmc dev 0; gpt write mmc 0 $partitions; reset;\0" \ "setup_emmc=mmc dev 0; gpt write mmc 0 $partitions; reset;\0" \
PICO_BOOT_ENV PICO_BOOT_ENV
#if defined(CONFIG_FIT)
#define CONFIG_BOOTCOMMAND \
"mmc dev ${mmcdev};" \
"mmc dev ${mmcdev}; if mmc rescan; then " \
"if run loadbootscript; then " \
"iminfo ${bootscriptaddr};" \
"if test $? -eq 1; then hab_failsafe; fi;" \
"run bootscript; " \
"else " \
"echo Fail to load fitImage with boot script;" \
"hab_failsafe;" \
"fi; " \
"fi"
#endif
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
func(USB, usb, 0) \ func(USB, usb, 0) \