From 2c84a019c2063dc3812ac98c1bc0e566379dac2b Mon Sep 17 00:00:00 2001 From: Damodar Santhapuri Date: Fri, 6 Nov 2020 14:18:59 +0000 Subject: [PATCH] arm-bsp/firmware-image-juno: update offest addresses for NOR flash images After migrating kernel vesion to >= 5.4, Image size has been increased to >35MB . It causes the NOR flash memory corruption.This issue got fixed by updating NOR flash offeset of effected images . Change-Id: Ia635fd9d91724d8255866b9f19f1ec2d42a62d2e Signed-off-by: Damodar Santhapuri Signed-off-by: Jon Mason --- .../images/firmware-image-juno/images-r0.txt | 8 ++++---- .../images/firmware-image-juno/images-r1.txt | 8 ++++---- .../images/firmware-image-juno/images-r2.txt | 8 ++++---- .../recipes-bsp/images/firmware-image-juno/uEnv.txt | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r0.txt b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r0.txt index 286dac74..f6ac5330 100644 --- a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r0.txt +++ b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r0.txt @@ -23,14 +23,14 @@ NOR2LOAD: 00000000 ;Image Load Address NOR2ENTRY: 00000000 ;Image Entry Point NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x02700000 ;Image Flash Address +NOR3ADDRESS: 0x02900000 ;Image Flash Address NOR3FILE: \SOFTWARE\juno.dtb ;Image File Name NOR3NAME: board.dtb ;Specify target filename to preserve file extension NOR3LOAD: 00000000 ;Image Load Address NOR3ENTRY: 00000000 ;Image Entry Point NOR4UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR4ADDRESS: 0x025C0000 ;Image Flash Address +NOR4ADDRESS: 0x029C0000 ;Image Flash Address NOR4FILE: \SOFTWARE\hdlcdclk.dat ;Image File Name NOR4LOAD: 00000000 ;Image Load Address NOR4ENTRY: 00000000 ;Image Entry Point @@ -56,13 +56,13 @@ NOR7LOAD: 00000000 ;Image Load Address NOR7ENTRY: 00000000 ;Image Entry Point NOR8UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR8ADDRESS: 0x02600000 ;Image Flash Address +NOR8ADDRESS: 0x02A00000 ;Image Flash Address NOR8FILE: \SOFTWARE\selftest ;Image File Name NOR8LOAD: 00000000 ;Image Load Address NOR8ENTRY: 00000000 ;Image Entry Point NOR9UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR9ADDRESS: 0x02780000 ;Image Flash Address +NOR9ADDRESS: 0x02A80000 ;Image Flash Address NOR9NAME: uEnv.txt NOR9FILE: \SOFTWARE\uEnv.txt ;Image File Name NOR9LOAD: 00000000 ;Image Load Address diff --git a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r1.txt b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r1.txt index f84caaf9..a6291da2 100644 --- a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r1.txt +++ b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r1.txt @@ -23,14 +23,14 @@ NOR2LOAD: 00000000 ;Image Load Address NOR2ENTRY: 00000000 ;Image Entry Point NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x02700000 ;Image Flash Address +NOR3ADDRESS: 0x02900000 ;Image Flash Address NOR3FILE: \SOFTWARE\juno-r1.dtb ;Image File Name NOR3NAME: board.dtb ;Specify target filename to preserve file extension NOR3LOAD: 00000000 ;Image Load Address NOR3ENTRY: 00000000 ;Image Entry Point NOR4UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR4ADDRESS: 0x025C0000 ;Image Flash Address +NOR4ADDRESS: 0x029C0000 ;Image Flash Address NOR4FILE: \SOFTWARE\hdlcdclk.dat ;Image File Name NOR4LOAD: 00000000 ;Image Load Address NOR4ENTRY: 00000000 ;Image Entry Point @@ -56,13 +56,13 @@ NOR7LOAD: 00000000 ;Image Load Address NOR7ENTRY: 00000000 ;Image Entry Point NOR8UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR8ADDRESS: 0x02600000 ;Image Flash Address +NOR8ADDRESS: 0x02A00000 ;Image Flash Address NOR8FILE: \SOFTWARE\selftest ;Image File Name NOR8LOAD: 00000000 ;Image Load Address NOR8ENTRY: 00000000 ;Image Entry Point NOR9UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR9ADDRESS: 0x02780000 ;Image Flash Address +NOR9ADDRESS: 0x02A80000 ;Image Flash Address NOR9NAME: uEnv.txt NOR9FILE: \SOFTWARE\uEnv.txt ;Image File Name NOR9LOAD: 00000000 ;Image Load Address diff --git a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r2.txt b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r2.txt index 149e0c4c..16a6a5fe 100644 --- a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r2.txt +++ b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r2.txt @@ -23,14 +23,14 @@ NOR2LOAD: 00000000 ;Image Load Address NOR2ENTRY: 00000000 ;Image Entry Point NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x02700000 ;Image Flash Address +NOR3ADDRESS: 0x02900000 ;Image Flash Address NOR3FILE: \SOFTWARE\juno-r2.dtb ;Image File Name NOR3NAME: board.dtb ;Specify target filename to preserve file extension NOR3LOAD: 00000000 ;Image Load Address NOR3ENTRY: 00000000 ;Image Entry Point NOR4UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR4ADDRESS: 0x025C0000 ;Image Flash Address +NOR4ADDRESS: 0x029C0000 ;Image Flash Address NOR4FILE: \SOFTWARE\hdlcdclk.dat ;Image File Name NOR4LOAD: 00000000 ;Image Load Address NOR4ENTRY: 00000000 ;Image Entry Point @@ -56,13 +56,13 @@ NOR7LOAD: 00000000 ;Image Load Address NOR7ENTRY: 00000000 ;Image Entry Point NOR8UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR8ADDRESS: 0x02600000 ;Image Flash Address +NOR8ADDRESS: 0x02A00000 ;Image Flash Address NOR8FILE: \SOFTWARE\selftest ;Image File Name NOR8LOAD: 00000000 ;Image Load Address NOR8ENTRY: 00000000 ;Image Entry Point NOR9UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR9ADDRESS: 0x02780000 ;Image Flash Address +NOR9ADDRESS: 0x02A80000 ;Image Flash Address NOR9NAME: uEnv.txt NOR9FILE: \SOFTWARE\uEnv.txt ;Image File Name NOR9LOAD: 00000000 ;Image Load Address diff --git a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/uEnv.txt b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/uEnv.txt index 93eb5fb0..77c02e36 100644 --- a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/uEnv.txt +++ b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/uEnv.txt @@ -1,11 +1,11 @@ uenvcmd=run mybootcmd mybootcmd=echo Loading custom boot command; \ echo Loading kernel; \ -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 ${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; \ echo Loading device tree; \ -afs load ${fdtfile} ${fdt_addr}; \ +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}; fi; fdt addr ${fdt_addr}; fdt resize; \ -booti ${kernel_addr} - ${fdt_addr}; +afs load ${fdt_alt_name} ${fdt_addr_r}; fi; fdt addr ${fdt_addr_r}; fdt resize; \ +booti ${kernel_addr_r} - ${fdt_addr_r};