leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

riscv: align bootm implementation with that of other architectures

Browse Source 
The bootm implementation of RISC-V diverges from that of other
architectures. Update it to match the implementation of other
architectures. The ARM implementation is used as a reference.

This adds the following features and changes to RISC-V.
* Add support for the BOOTM_STATE_OS_FAKE_GO command
* Call the remove function on devices with the removal flag set before
booting Linux
* Force disconnect USB devices from the host before booting Linux
* Print and add bootstage information to the device tree before booting
Linux

Signed-off-by: Lukas Auer <lukas.auer@aisec.fraunhofer.de>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Lukas Auer 2018-11-22 11:26:32 +01:00 committed by Andes
parent 52b984369f
commit c3b1a99040
1 changed files with 79 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
arch/riscv/lib/bootm.c
View File

@ -8,6 +8,8 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <dm.h>
#include <dm/root.h>
#include <image.h> #include <image.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/csr.h> #include <asm/csr.h>
@ -26,38 +28,28 @@ int arch_fixup_fdt(void *blob)
return 0; return 0;
} }
int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) /**
* announce_and_cleanup() - Print message and prepare for kernel boot
*
* @fake: non-zero to do everything except actually boot
*/
static void announce_and_cleanup(int fake)
{ {
void (*kernel)(ulong hart, void *dtb); printf("\nStarting kernel ...%s\n\n", fake ?
"(fake run for tracing)" : "");
/* bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel");
* allow the PREP bootm subcommand, it is required for bootm to work #ifdef CONFIG_BOOTSTAGE_FDT
*/ bootstage_fdt_add_report();
if (flag & BOOTM_STATE_OS_PREP) #endif
return 0; #ifdef CONFIG_BOOTSTAGE_REPORT
bootstage_report();
if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
return 1;
kernel = (void (*)(ulong, void *))images->ep;
bootstage_mark(BOOTSTAGE_ID_RUN_OS);
debug("## Transferring control to Linux (at address %08lx) ...\n",
(ulong)kernel);
if (IMAGE_ENABLE_OF_LIBFDT && images->ft_len) {
#ifdef CONFIG_OF_LIBFDT
debug("using: FDT\n");
if (image_setup_linux(images)) {
printf("FDT creation failed! hanging...");
hang();
}
#endif #endif
}
/* we assume that the kernel is in place */ #ifdef CONFIG_USB_DEVICE
printf("\nStarting kernel ...\n\n"); udc_disconnect();
#endif
board_quiesce_devices();
/* /*
* Call remove function of all devices with a removal flag set. * Call remove function of all devices with a removal flag set.
@ -67,11 +59,62 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
dm_remove_devices_flags(DM_REMOVE_ACTIVE_ALL); dm_remove_devices_flags(DM_REMOVE_ACTIVE_ALL);
cleanup_before_linux(); cleanup_before_linux();
}
if (IMAGE_ENABLE_OF_LIBFDT && images->ft_len)
kernel(csr_read(mhartid), images->ft_addr); static void boot_prep_linux(bootm_headers_t *images)
{
/* does not return */ if (IMAGE_ENABLE_OF_LIBFDT && images->ft_len) {
#ifdef CONFIG_OF_LIBFDT
return 1; debug("using: FDT\n");
if (image_setup_linux(images)) {
printf("FDT creation failed! hanging...");
hang();
}
#endif
} else {
printf("Device tree not found or missing FDT support\n");
hang();
}
}
static void boot_jump_linux(bootm_headers_t *images, int flag)
{
void (*kernel)(ulong hart, void *dtb);
int fake = (flag & BOOTM_STATE_OS_FAKE_GO);
kernel = (void (*)(ulong, void *))images->ep;
bootstage_mark(BOOTSTAGE_ID_RUN_OS);
debug("## Transferring control to Linux (at address %08lx) ...\n",
(ulong)kernel);
announce_and_cleanup(fake);
if (!fake) {
if (IMAGE_ENABLE_OF_LIBFDT && images->ft_len)
kernel(csr_read(mhartid), images->ft_addr);
}
}
int do_bootm_linux(int flag, int argc, char * const argv[],
bootm_headers_t *images)
{
/* No need for those on RISC-V */
if (flag & BOOTM_STATE_OS_BD_T || flag & BOOTM_STATE_OS_CMDLINE)
return -1;
if (flag & BOOTM_STATE_OS_PREP) {
boot_prep_linux(images);
return 0;
}
if (flag & (BOOTM_STATE_OS_GO | BOOTM_STATE_OS_FAKE_GO)) {
boot_jump_linux(images, flag);
return 0;
}
boot_prep_linux(images);
boot_jump_linux(images, flag);
return 0;
} }