random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 12:56:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Nokia RX-51: Do not clear unknown memory in lowlevel_init.S

Browse Source 
If kernel image in uImage or zImage format is not detected by
lowlevel_init.S code then do not clear memory location where image was
expected. If image is not detected then this memory region is unknown.
So do not unconditionally clear it.

Signed-off-by: Pali Rohár <pali@kernel.org>
This commit is contained in:
Pali Rohár 2022-09-04 03:28:59 +02:00 committed by Tom Rini
parent 0b6924cc0f
commit 5c9bf1d655
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
board/nokia/rx51/lowlevel_init.S
View File

@ -76,7 +76,7 @@ save_boot_params:
ldr r4, [r0, #36] /* r4 - 4 bytes header of kernel at offset 36 */ ldr r4, [r0, #36] /* r4 - 4 bytes header of kernel at offset 36 */
ldr r5, z_magic /* r5 - LINUX_ARM_ZIMAGE_MAGIC */ ldr r5, z_magic /* r5 - LINUX_ARM_ZIMAGE_MAGIC */
cmp r4, r5 cmp r4, r5
bne copy_kernel_end /* skip if invalid image */ bne skip_copy /* skip if invalid image */
copy_kernel_loop: copy_kernel_loop:
ldmdb r1!, {r3 - r10} ldmdb r1!, {r3 - r10}
@ -84,12 +84,12 @@ copy_kernel_loop:
cmp r1, r0 cmp r1, r0
bhi copy_kernel_loop bhi copy_kernel_loop
copy_kernel_end:
/* remove header in source kernel image */ /* remove header in source kernel image */
mov r5, #0 mov r5, #0
str r5, [r0] /* remove 4 bytes header of kernel uImage */ str r5, [r0] /* remove 4 bytes header of kernel uImage */
str r5, [r0, #36] /* remove 4 bytes header of kernel zImage */ str r5, [r0, #36] /* remove 4 bytes header of kernel zImage */
skip_copy:
/* Returns */ /* Returns */
b save_boot_params_ret b save_boot_params_ret