eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pico-imx6: Fix bootmenu handling

Browse Source 
We should use a common script to allow booting the U-Boot console as
fallback so we ended using a 'default_boot' and 'base_boot'
environment scripts to accomplish that.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Otavio Salvador
2019-06-19 15:03:44 -03:00
committed by Stefano Babic
parent 004eee86f1
commit 7efe52a0a7
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configs/pico-imx6_defconfig
View File

@@ -15,7 +15,7 @@ CONFIG_FIT=y
CONFIG_SPL_FIT_PRINT=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
CONFIG_BOOTCOMMAND="run findbaseboard; run findfdt; run finduuid; run distro_bootcmd"
CONFIG_BOOTCOMMAND="run default_boot"
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_DEFAULT_FDT_FILE="ask"

20
include/configs/pico-imx6.h
View File

@@ -42,13 +42,13 @@
#define BOOTMENU_ENV \
"bootmenu_0=Boot using PICO-Hobbit baseboard=" \
"setenv baseboard hobbit\0" \
"setenv baseboard hobbit; saveenv; run base_boot\0" \
"bootmenu_1=Boot using PICO-Pi baseboard=" \
"setenv baseboard pi\0" \
"setenv baseboard pi; saveenv; run base_boot\0" \
"bootmenu_2=Boot using PICO-Dwarf baseboard=" \
"setenv baseboard dwarf\0" \
"setenv baseboard dwarf; saveenv; run base_boot\0" \
"bootmenu_3=Boot using PICO-Nymph baseboard=" \
"setenv baseboard nymph\0" \
"setenv baseboard nymph; saveenv; run base_boot\0" \
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=ttymxc0\0" \
@@ -61,11 +61,6 @@
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
CONFIG_DFU_ENV_SETTINGS \
"finduuid=part uuid mmc 0:1 uuid\0" \
"findbaseboard=" \
"if test $baseboard = ask ; then " \
"bootmenu -1; fi;" \
"if test $baseboard != ask ; then " \
"saveenv; fi;\0" \
"findfdt="\
"if test $baseboard = hobbit && test $board_rev = MX6Q ; then " \
"setenv fdtfile imx6q-pico-hobbit.dtb; fi; " \
@@ -85,6 +80,13 @@
"setenv fdtfile imx6dl-pico-nymph.dtb; fi; " \
"if test $fdtfile = ask; then " \
"echo WARNING: Could not determine dtb to use; fi; \0" \
"default_boot=" \
"if test $baseboard = ask ; then " \
"bootmenu -1; " \
"else " \
"run base_boot;" \
"fi; \0" \
"base_boot=run findfdt; run finduuid; run distro_bootcmd\0" \
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
"ramdisk_addr_r=0x13000000\0" \