[src/trunk]: src/sys/stand/efiboot/bootarm Jump to MARK_ENTRY instead of MARK...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ab6d6c6267ce
branches:  trunk
changeset: 997894:ab6d6c6267ce
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Mar 30 17:41:13 2019 +0000

description:
Jump to MARK_ENTRY instead of MARK_START

diffstat:

 sys/stand/efiboot/bootarm/efibootarm.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r f99e3b146aee -r ab6d6c6267ce sys/stand/efiboot/bootarm/efibootarm.c
--- a/sys/stand/efiboot/bootarm/efibootarm.c    Sat Mar 30 17:40:34 2019 +0000
+++ b/sys/stand/efiboot/bootarm/efibootarm.c    Sat Mar 30 17:41:13 2019 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -47,16 +47,14 @@
 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());
 }