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

common: spl: move armv7m-specific code to spl_perform_fixups()

Browse Source 
Factor out armv7m fragment to spl_perform_fixups(), which is an arch/board
specific function designed for this purpose.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
This commit is contained in:
Ovidiu Panait 2022-01-01 19:13:25 +02:00 committed by Tom Rini
parent ea9733ac4c
commit 027b0e9c16
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/cpu/armv7m/cpu.c
View File

@ -12,6 +12,7 @@
#include <irq_func.h> #include <irq_func.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/armv7m.h> #include <asm/armv7m.h>
#include <spl.h>
/* /*
* This is called right before passing control to * This is called right before passing control to
@ -56,3 +57,8 @@ void reset_cpu(void)
| (V7M_SCB->aircr & V7M_AIRCR_PRIGROUP_MSK) | (V7M_SCB->aircr & V7M_AIRCR_PRIGROUP_MSK)
| V7M_AIRCR_SYSRESET, &V7M_SCB->aircr); | V7M_AIRCR_SYSRESET, &V7M_SCB->aircr);
} }
void spl_perform_fixups(struct spl_image_info *spl_image)
{
spl_image->entry_point |= 0x1;
}

3
common/spl/spl.c
View File

@ -770,9 +770,6 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
ret); ret);
} }
#ifdef CONFIG_CPU_V7M
spl_image.entry_point |= 0x1;
#endif
switch (spl_image.os) { switch (spl_image.os) {
case IH_OS_U_BOOT: case IH_OS_U_BOOT:
debug("Jumping to %s...\n", spl_phase_name(spl_next_phase())); debug("Jumping to %s...\n", spl_phase_name(spl_next_phase()));