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-10-11 14:41:03 +0300
commit8831f26e9494afb385e38754fb4768453d812c32 (patch)
treee4044e311824f15f65109f37d5af9ddd5063e9c8
parent79d31cb601310e4066a43ee66cb2b5e8135c6d30 (diff)
downloadu-boot-JH7100_starlight_multimedia.tar.xz
TF Image: modify uboot env variable to support booting from tf cardJH7100_starlight_multimedia
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 2862c88483..dcfc22106a 100644
--- a/configs/starfive_jh7100_starlight_smode_defconfig
+++ b/configs/starfive_jh7100_starlight_smode_defconfig
@@ -202,6 +202,7 @@ CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 debug rootwait earlycon=sbi stmmaceth=chain_mode:1"
# CONFIG_BOOTARGS_SUBST is not set
# 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=""
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" \