Module Name: src
Committed By: jmcneill
Date: Sat Mar 30 17:41:13 UTC 2019
Modified Files:
src/sys/stand/efiboot/bootarm: efibootarm.c
Log Message:
Jump to MARK_ENTRY instead of MARK_START
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/stand/efiboot/bootarm/efibootarm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/stand/efiboot/bootarm/efibootarm.c
diff -u src/sys/stand/efiboot/bootarm/efibootarm.c:1.1 src/sys/stand/efiboot/bootarm/efibootarm.c:1.2
--- src/sys/stand/efiboot/bootarm/efibootarm.c:1.1 Sat Mar 30 12:48:50 2019
+++ src/sys/stand/efiboot/bootarm/efibootarm.c Sat Mar 30 17:41:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: efibootarm.c,v 1.1 2019/03/30 12:48:50 jmcneill Exp $ */
+/* $NetBSD: efibootarm.c,v 1.2 2019/03/30 17:41:13 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <[email protected]>
@@ -47,16 +47,14 @@ efi_dcache_flush(u_long start, u_long si
void
efi_boot_kernel(u_long marks[MARK_MAX])
{
- void (*kernel_entry)(register_t, register_t, register_t, register_t);
u_long kernel_size;
- kernel_entry = (void *)marks[MARK_START];
kernel_size = marks[MARK_END] - marks[MARK_START];
- armv7_dcache_wbinv_range((u_long)kernel_entry, kernel_size);
+ armv7_dcache_wbinv_range(marks[MARK_START], kernel_size);
if (efi_fdt_size() > 0)
armv7_dcache_wbinv_range((u_long)efi_fdt_data(), efi_fdt_size());
armv7_icache_inv_all();
- armv7_exec_kernel((register_t)marks[MARK_START], (register_t)efi_fdt_data());
+ armv7_exec_kernel((register_t)marks[MARK_ENTRY], (register_t)efi_fdt_data());
}
