diff options
Diffstat (limited to 'meta-aspeed/recipes-bsp')
| -rw-r--r-- | meta-aspeed/recipes-bsp/u-boot/files/u-boot-env-ast2600.txt | 12 | ||||
| -rw-r--r-- | meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc | 4 |
2 files changed, 9 insertions, 7 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} diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc index b662bf442..553d52dd8 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc @@ -1,6 +1,6 @@ HOMEPAGE = "https://github.com/AspeedTech-BMC/u-boot" SECTION = "bootloaders" -DEPENDS += "flex-native bison-native" +DEPENDS += "flex-native bison-native xxd-native" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" @@ -8,7 +8,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "44a8c618c1215e0faac0f335f0afd56ed4240e76" +SRCREV = "e5902174d9e0d9611619a8b468a5a9b73ab402b5" SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https" |