summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsw.multimedia <sw.multimedia@starfivetech.com>2021-09-29 13:52:52 +0300
committersw.multimedia <sw.multimedia@starfivetech.com>2021-09-29 13:52:52 +0300
commit649230306040264cc749ad2bfb68d6d21a2921ed (patch)
tree352fe8b65d8910856ebe313a87251265d245f500
parent8ae91040fec2af1a3f326e72c48bbe31aeb31953 (diff)
downloadu-boot-649230306040264cc749ad2bfb68d6d21a2921ed.tar.xz
TF Image: modify uboot env variable to support booting from tf cardu-boot-2021.10-rc5-Starlight-g6492303multimedia_v0.1_20211016multimedia_v0.1
Signed-off-by: sw.multimedia <sw.multimedia@starfivetech.com> Signed-off-by: Curry Zhang <curry.zhang@starfivetech.com>
-rw-r--r--configs/starfive_jh7100_starlight_smode_defconfig1
-rwxr-xr-x[-rw-r--r--]include/configs/starfive-jh7100.h4
2 files changed, 5 insertions, 0 deletions
diff --git a/configs/starfive_jh7100_starlight_smode_defconfig b/configs/starfive_jh7100_starlight_smode_defconfig
index 36f579b5a9..2ce18f2592 100644
--- a/configs/starfive_jh7100_starlight_smode_defconfig
+++ b/configs/starfive_jh7100_starlight_smode_defconfig
@@ -32,6 +32,7 @@ CONFIG_AUTOBOOT_DELAY_STR="f"
CONFIG_AUTOBOOT_STOP_STR="v"
CONFIG_AUTOBOOT_KEYED_CTRLC=y
# CONFIG_USE_BOOTCOMMAND is not set
+# CONFIG_BOOTCOMMAND="run mmcsetup; run fdtsetup; run fatenv; echo 'running boot2...'; run boot2"
CONFIG_USE_PREBOOT=y
CONFIG_PREBOOT="run mmcbootenv"
CONFIG_DEFAULT_FDT_FILE="starfive/jh7100-beaglev-starlight.dtb"
diff --git a/include/configs/starfive-jh7100.h b/include/configs/starfive-jh7100.h
index 590e7b6db4..71c311eaaf 100644..100755
--- a/include/configs/starfive-jh7100.h
+++ b/include/configs/starfive-jh7100.h
@@ -66,6 +66,10 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
STARLIGHT_FEDORA_BOOTENV \
+ "mmcsetup=mmc part\0" \
+ "fdtsetup=fdt addr ${fdtcontroladdr}\0" \
+ "fatenv=setenv fileaddr a0000000; fatload mmc 0:1 ${fileaddr} u74_uEnv.txt;" \
+ "env import -t ${fileaddr} ${filesize}\0" \
"loadaddr=0xa0000000\0" \
"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
"ext4bootenv=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootenv}\0" \