qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: add bootm_headers_t args for announce_and_cleanup() 

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8b709ffa378d2a802e9e9daf192c662af5588161
This commit is contained in:
Joseph Chen 2020-04-02 20:19:50 +08:00 committed by Jianhong Chen
parent 6afcbf8807
commit a6b5d4953b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/u-boot-arm.h
View File

@ -38,7 +38,7 @@ int arch_early_init_r(void);
/* board/.../... */ /* board/.../... */
int board_init(void); int board_init(void);
void board_quiesce_devices(void); void board_quiesce_devices(void *images);
/* cpu/.../interrupt.c */ /* cpu/.../interrupt.c */
int arch_interrupt_init (void); int arch_interrupt_init (void);

10
arch/arm/lib/bootm.c
View File

@ -67,7 +67,7 @@ void arch_lmb_reserve(struct lmb *lmb)
gd->ram_top - sp); gd->ram_top - sp);
} }
__weak void board_quiesce_devices(void) __weak void board_quiesce_devices(void *images)
{ {
} }
@ -76,7 +76,7 @@ __weak void board_quiesce_devices(void)
* *
* @fake: non-zero to do everything except actually boot * @fake: non-zero to do everything except actually boot
*/ */
static void announce_and_cleanup(int fake) static void announce_and_cleanup(bootm_headers_t *images, int fake)
{ {
ulong us; ulong us;
@ -97,7 +97,7 @@ static void announce_and_cleanup(int fake)
udc_disconnect(); udc_disconnect();
#endif #endif
board_quiesce_devices(); board_quiesce_devices(images);
/* Flush all console data */ /* Flush all console data */
flushc(); flushc();
@ -331,7 +331,7 @@ static void boot_jump_linux(bootm_headers_t *images, int flag)
(ulong) kernel_entry); (ulong) kernel_entry);
bootstage_mark(BOOTSTAGE_ID_RUN_OS); bootstage_mark(BOOTSTAGE_ID_RUN_OS);
announce_and_cleanup(fake); announce_and_cleanup(images, fake);
if (!fake) { if (!fake) {
#ifdef CONFIG_ARMV8_PSCI #ifdef CONFIG_ARMV8_PSCI
@ -381,7 +381,7 @@ static void boot_jump_linux(bootm_headers_t *images, int flag)
debug("## Transferring control to Linux (at address %08lx)" \ debug("## Transferring control to Linux (at address %08lx)" \
"...\n", (ulong) kernel_entry); "...\n", (ulong) kernel_entry);
bootstage_mark(BOOTSTAGE_ID_RUN_OS); bootstage_mark(BOOTSTAGE_ID_RUN_OS);
announce_and_cleanup(fake); announce_and_cleanup(images, fake);
if (IMAGE_ENABLE_OF_LIBFDT && images->ft_len) if (IMAGE_ENABLE_OF_LIBFDT && images->ft_len)
r2 = (unsigned long)images->ft_addr; r2 = (unsigned long)images->ft_addr;