diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
| commit | bb6a14e2f317abf60677c6ad8de9c33d5760bf36 (patch) | |
| tree | 00457d3677e86437cec25fd7dab6c4513a53b1a4 /meta-aspeed/recipes-bsp/u-boot/files | |
| parent | defdca82c107f46e980c84bffb1b2c1263522fa0 (diff) | |
| parent | cf6fd27dbd8e2d1b507f8c3752b85801b2c6ef57 (diff) | |
| download | openbmc-bb6a14e2f317abf60677c6ad8de9c33d5760bf36.tar.xz | |
Merge tag '0.63' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-aspeed/recipes-bsp/u-boot/files')
| -rw-r--r-- | meta-aspeed/recipes-bsp/u-boot/files/u-boot-env-ast2600.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/meta-aspeed/recipes-bsp/u-boot/files/u-boot-env-ast2600.txt b/meta-aspeed/recipes-bsp/u-boot/files/u-boot-env-ast2600.txt index 47a474c92..15dd2f522 100644 --- a/meta-aspeed/recipes-bsp/u-boot/files/u-boot-env-ast2600.txt +++ b/meta-aspeed/recipes-bsp/u-boot/files/u-boot-env-ast2600.txt @@ -1,9 +1,11 @@ bootargs=console=ttyS4,115200n8 -boota=setenv bootpart 2; setenv rootfs rofs-a; run setmmcargs; ext4load mmc 0:${bootpart} ${loadaddr} fitImage && bootm; echo Error loading kernel FIT image -bootb=setenv bootpart 3; setenv rootfs rofs-b; run setmmcargs; ext4load mmc 0:${bootpart} ${loadaddr} fitImage && bootm; echo Error loading kernel FIT image -bootcmd=if test "${bootside}" = "b"; then run bootb; run boota; else run boota; run bootb; fi +boota=setenv bootpart 2; setenv rootfs rofs-a; run bootmmc +bootb=setenv bootpart 3; setenv rootfs rofs-b; run bootmmc +bootcmd=setenv origbootargs ${bootargs}; run bootconfcmd; run bootsidecmd +bootconfcmd=if test ${fitconfig} -n; then setenv bootmconf "#${fitconfig}"; fi bootdelay=2 +bootmmc=run setmmcargs; ext4load mmc 0:${bootpart} ${loadaddr} fitImage && bootm ${loadaddr}${bootmconf}; echo Error loading kernel FIT image with fitconfig ${fitconfig}; bootm ${loadaddr}; echo Error loading kernel FIT image bootside=a +bootsidecmd=if test ${bootside} = b; then run bootb; run boota; else run boota; run bootb; fi loadaddr=0x83000000 -rootfs=rofs-a -setmmcargs=setenv bootargs ${bootargs} rootwait root=PARTLABEL=${rootfs} +setmmcargs=setenv bootargs ${origbootargs} rootwait root=PARTLABEL=${rootfs} |