[meta-arm] arm-bsp/u-boot: fix uenv errors while rebasing v2020.07

Submitted by Ross Burton on July 14, 2020, noon | Patch ID: 174431

Details

Message ID 20200714120007.577999-1-ross@burtonini.com
State New
Headers show

Commit Message

Ross Burton July 14, 2020, noon
From: Damodar Santhapuri <damodar.santhapuri@arm.com>

     This commit fixes the erros while rebasing u-boot src
     to v2020.07

Change-Id: Iac926f77f80348b91f20f77fb52794a5a365a0ee
Signed-off-by: Damodar Santhapuri <damodar.santhapuri@arm.com>
---
 .../files/juno/u-boot_vexpress_uenv.patch     | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta-arm-bsp/recipes-bsp/u-boot/files/juno/u-boot_vexpress_uenv.patch b/meta-arm-bsp/recipes-bsp/u-boot/files/juno/u-boot_vexpress_uenv.patch
index bb90c17..c68c173 100644
--- a/meta-arm-bsp/recipes-bsp/u-boot/files/juno/u-boot_vexpress_uenv.patch
+++ b/meta-arm-bsp/recipes-bsp/u-boot/files/juno/u-boot_vexpress_uenv.patch
@@ -1,37 +1,37 @@ 
 diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
-index 2354f4e958..3e01f477dc 100644
+index 09cdd3dab5..7d6d231bd9 100644
 --- a/include/configs/vexpress_aemv8a.h
 +++ b/include/configs/vexpress_aemv8a.h
-@@ -151,6 +151,32 @@
- 				"fdt_addr=0x83000000\0" \
- 				"fdt_high=0xffffffffffffffff\0" \
- 				"initrd_high=0xffffffffffffffff\0" \
-+                                "bootenvfile=uEnv.txt\0" \
-+                                "bootcmd=run envboot\0" \
-+                                "envboot=if run loadbootenv; then echo Loading env from ${bootenvfile}; run importbootenv; else run default_bootcmd; fi; if test -n $uenvcmd; then echo Running uenvcmd ...; run uenvcmd;fi;\0" \
+@@ -136,6 +136,32 @@
+ 				"fdtfile=board.dtb\0" \
+ 				"fdt_alt_name=juno\0" \
+ 				"fdt_addr_r=0x80000000\0" \
++                               "bootenvfile=uEnv.txt\0" \
++                               "bootcmd=run envboot\0" \
++                               "envboot=if run loadbootenv; then echo Loading env from ${bootenvfile}; run importbootenv; else run default_bootcmd; fi; if test -n $uenvcmd; then echo Running uenvcmd ...; run uenvcmd;fi;\0" \
 +                                "importbootenv=echo Importing environment from memory, size ${filesize}; env import -t ${loadaddr} ${filesize}\0" \
 +                                "loadaddr=0x82000000\0" \
 +                                "filesize=0x4000\0" \
 +                                "loadbootenv=mw.l ${loadaddr} 0 0x1000; afs load ${bootenvfile} ${loadaddr}\0" \
-+				"default_bootcmd=echo running default boot command; afs load ${kernel_name} ${kernel_addr} ; " \
-+                                		"if test $? -eq 1; then "\
-+		                                "  echo Loading ${kernel_alt_name} instead of "\
-+                		                "${kernel_name}; "\
-+		                                "  afs load ${kernel_alt_name} ${kernel_addr};"\
-+                                		"fi ; "\
-+		                                "afs load  ${fdtfile} ${fdt_addr} ; " \
-+                		                "if test $? -eq 1; then "\
-+		                                "  echo Loading ${fdt_alt_name} instead of "\
-+		                                "${fdtfile}; "\
-+		                                "  afs load ${fdt_alt_name} ${fdt_addr}; "\
++                                "default_bootcmd=echo running default boot command; afs load ${kernel_name} ${kernel_addr_r} ; " \
++                                                "if test $? -eq 1; then "\
++                                                "  echo Loading ${kernel_alt_name} instead of "\
++                                                "${kernel_name}; "\
++                                                "  afs load ${kernel_alt_name} ${kernel_addr_r};"\
++                                                "fi ; "\
++		                                "afs load  ${fdtfile} ${fdt_addr_r} ; " \
++                                                "if test $? -eq 1; then "\
++                                                "  echo Loading ${fdt_alt_name} instead of "\
++                                                "${fdtfile}; "\
++		                                "  afs load ${fdt_alt_name} ${fdt_addr_r}; "\
 +		                                "fi ; "\
-+                		                "fdt addr ${fdt_addr}; fdt resize; " \
-+		                                "if afs load  ${initrd_name} ${initrd_addr} ; "\
++                                                "fdt addr ${fdt_addr_r}; fdt resize; " \
++		                                "if afs load  ${ramdisk_name} ${ramdisk_addr_r} ; "\
 +		                                "then "\
-+		                                "  setenv initrd_param ${initrd_addr}; "\
-+		                                "  else setenv initrd_param -; "\
++		                                "  setenv ramdisk_param ${ramdisk_addr_r}; "\
++		                                "  else setenv ramdisk_param -; "\
 +		                                "fi ; " \
-+		                                "booti ${kernel_addr} ${initrd_param} ${fdt_addr}\0"
++		                                "booti ${kernel_addr_r} ${ramdisk_param} ${fdt_addr_r}\0"
  
  /* Copy the kernel and FDT to DRAM memory and boot */
- #define CONFIG_BOOTCOMMAND	"afs load ${kernel_name} ${kernel_addr} ; " \
+ #define CONFIG_BOOTCOMMAND	"afs load ${kernel_name} ${kernel_addr_r} ;"\

Comments

Jon Mason July 14, 2020, 5:58 p.m.
On Tue, Jul 14, 2020 at 01:00:07PM +0100, Ross Burton wrote:
> From: Damodar Santhapuri <damodar.santhapuri@arm.com>
> 
>      This commit fixes the erros while rebasing u-boot src
>      to v2020.07
> 
> Change-Id: Iac926f77f80348b91f20f77fb52794a5a365a0ee
> Signed-off-by: Damodar Santhapuri <damodar.santhapuri@arm.com>


This breaks dunfell compatability on the master branch, since it
doesn't apply cleanly to anything older than v2020.07.  I'm thinking
we probably need to keep both versions and clean-up the bbappends to
allow for the application of the correct patch depending on the
situation.

Thanks,
Jon

> ---
>  .../files/juno/u-boot_vexpress_uenv.patch     | 50 +++++++++----------
>  1 file changed, 25 insertions(+), 25 deletions(-)
> 
> diff --git a/meta-arm-bsp/recipes-bsp/u-boot/files/juno/u-boot_vexpress_uenv.patch b/meta-arm-bsp/recipes-bsp/u-boot/files/juno/u-boot_vexpress_uenv.patch
> index bb90c17..c68c173 100644
> --- a/meta-arm-bsp/recipes-bsp/u-boot/files/juno/u-boot_vexpress_uenv.patch
> +++ b/meta-arm-bsp/recipes-bsp/u-boot/files/juno/u-boot_vexpress_uenv.patch
> @@ -1,37 +1,37 @@
>  diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
> -index 2354f4e958..3e01f477dc 100644
> +index 09cdd3dab5..7d6d231bd9 100644
>  --- a/include/configs/vexpress_aemv8a.h
>  +++ b/include/configs/vexpress_aemv8a.h
> -@@ -151,6 +151,32 @@
> - 				"fdt_addr=0x83000000\0" \
> - 				"fdt_high=0xffffffffffffffff\0" \
> - 				"initrd_high=0xffffffffffffffff\0" \
> -+                                "bootenvfile=uEnv.txt\0" \
> -+                                "bootcmd=run envboot\0" \
> -+                                "envboot=if run loadbootenv; then echo Loading env from ${bootenvfile}; run importbootenv; else run default_bootcmd; fi; if test -n $uenvcmd; then echo Running uenvcmd ...; run uenvcmd;fi;\0" \
> +@@ -136,6 +136,32 @@
> + 				"fdtfile=board.dtb\0" \
> + 				"fdt_alt_name=juno\0" \
> + 				"fdt_addr_r=0x80000000\0" \
> ++                               "bootenvfile=uEnv.txt\0" \
> ++                               "bootcmd=run envboot\0" \
> ++                               "envboot=if run loadbootenv; then echo Loading env from ${bootenvfile}; run importbootenv; else run default_bootcmd; fi; if test -n $uenvcmd; then echo Running uenvcmd ...; run uenvcmd;fi;\0" \
>  +                                "importbootenv=echo Importing environment from memory, size ${filesize}; env import -t ${loadaddr} ${filesize}\0" \
>  +                                "loadaddr=0x82000000\0" \
>  +                                "filesize=0x4000\0" \
>  +                                "loadbootenv=mw.l ${loadaddr} 0 0x1000; afs load ${bootenvfile} ${loadaddr}\0" \
> -+				"default_bootcmd=echo running default boot command; afs load ${kernel_name} ${kernel_addr} ; " \
> -+                                		"if test $? -eq 1; then "\
> -+		                                "  echo Loading ${kernel_alt_name} instead of "\
> -+                		                "${kernel_name}; "\
> -+		                                "  afs load ${kernel_alt_name} ${kernel_addr};"\
> -+                                		"fi ; "\
> -+		                                "afs load  ${fdtfile} ${fdt_addr} ; " \
> -+                		                "if test $? -eq 1; then "\
> -+		                                "  echo Loading ${fdt_alt_name} instead of "\
> -+		                                "${fdtfile}; "\
> -+		                                "  afs load ${fdt_alt_name} ${fdt_addr}; "\
> ++                                "default_bootcmd=echo running default boot command; afs load ${kernel_name} ${kernel_addr_r} ; " \
> ++                                                "if test $? -eq 1; then "\
> ++                                                "  echo Loading ${kernel_alt_name} instead of "\
> ++                                                "${kernel_name}; "\
> ++                                                "  afs load ${kernel_alt_name} ${kernel_addr_r};"\
> ++                                                "fi ; "\
> ++		                                "afs load  ${fdtfile} ${fdt_addr_r} ; " \
> ++                                                "if test $? -eq 1; then "\
> ++                                                "  echo Loading ${fdt_alt_name} instead of "\
> ++                                                "${fdtfile}; "\
> ++		                                "  afs load ${fdt_alt_name} ${fdt_addr_r}; "\
>  +		                                "fi ; "\
> -+                		                "fdt addr ${fdt_addr}; fdt resize; " \
> -+		                                "if afs load  ${initrd_name} ${initrd_addr} ; "\
> ++                                                "fdt addr ${fdt_addr_r}; fdt resize; " \
> ++		                                "if afs load  ${ramdisk_name} ${ramdisk_addr_r} ; "\
>  +		                                "then "\
> -+		                                "  setenv initrd_param ${initrd_addr}; "\
> -+		                                "  else setenv initrd_param -; "\
> ++		                                "  setenv ramdisk_param ${ramdisk_addr_r}; "\
> ++		                                "  else setenv ramdisk_param -; "\
>  +		                                "fi ; " \
> -+		                                "booti ${kernel_addr} ${initrd_param} ${fdt_addr}\0"
> ++		                                "booti ${kernel_addr_r} ${ramdisk_param} ${fdt_addr_r}\0"
>   
>   /* Copy the kernel and FDT to DRAM memory and boot */
> - #define CONFIG_BOOTCOMMAND	"afs load ${kernel_name} ${kernel_addr} ; " \
> + #define CONFIG_BOOTCOMMAND	"afs load ${kernel_name} ${kernel_addr_r} ;"\
> -- 
> 2.26.2
> 

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#850): https://lists.yoctoproject.org/g/meta-arm/message/850
Mute This Topic: https://lists.yoctoproject.org/mt/75497174/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-