Module Name: src
Committed By: skrll
Date: Thu Aug 15 05:59:49 UTC 2024
Modified Files:
src/sys/stand/efiboot: efiboot.c efiboot.h efifdt.c exec.c
Log Message:
Rename some symbols for consistency with the style used elsewhere
in efiboot.
NFCI.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/stand/efiboot/efiboot.c
cvs rdiff -u -r1.20 -r1.21 src/sys/stand/efiboot/efiboot.h
cvs rdiff -u -r1.35 -r1.36 src/sys/stand/efiboot/efifdt.c
cvs rdiff -u -r1.24 -r1.25 src/sys/stand/efiboot/exec.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/efiboot.c
diff -u src/sys/stand/efiboot/efiboot.c:1.23 src/sys/stand/efiboot/efiboot.c:1.24
--- src/sys/stand/efiboot/efiboot.c:1.23 Thu Mar 28 18:24:57 2024
+++ src/sys/stand/efiboot/efiboot.c Thu Aug 15 05:59:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: efiboot.c,v 1.23 2024/03/28 18:24:57 riastradh Exp $ */
+/* $NetBSD: efiboot.c,v 1.24 2024/08/15 05:59:49 skrll Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -132,7 +132,7 @@ efi_cleanup(void)
}
#ifdef EFIBOOT_RUNTIME_ADDRESS
- arch_set_virtual_address_map(memmap, nentries, mapkey, descsize, descver);
+ efi_fdt_set_virtual_address_map(memmap, nentries, mapkey, descsize, descver);
#endif
}
Index: src/sys/stand/efiboot/efiboot.h
diff -u src/sys/stand/efiboot/efiboot.h:1.20 src/sys/stand/efiboot/efiboot.h:1.21
--- src/sys/stand/efiboot/efiboot.h:1.20 Sun Aug 14 11:26:41 2022
+++ src/sys/stand/efiboot/efiboot.h Thu Aug 15 05:59:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: efiboot.h,v 1.20 2022/08/14 11:26:41 jmcneill Exp $ */
+/* $NetBSD: efiboot.h,v 1.21 2024/08/15 05:59:49 skrll Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka <[email protected]>
@@ -43,11 +43,6 @@ struct boot_command {
const char *c_help;
};
-int arch_prepare_boot(const char *, const char *, u_long *);
-void arch_cleanup_boot(void);
-size_t arch_alloc_size(void);
-void arch_set_virtual_address_map(EFI_MEMORY_DESCRIPTOR *, UINTN, UINTN, UINTN, UINT32);
-
/* conf.c */
extern struct fs_ops null_fs_ops;
extern struct fs_ops tftp_fs_ops;
@@ -94,6 +89,12 @@ int efi_device_path_depth(EFI_DEVICE_PAT
int efi_device_path_count(EFI_DEVICE_PATH *);
int efi_device_path_ncmp(EFI_DEVICE_PATH *, EFI_DEVICE_PATH *, int);
+/* efifdt.c */
+int efi_fdt_prepare_boot(const char *, const char *, u_long *);
+void efi_fdt_cleanup_boot(void);
+size_t efi_fdt_alloc_size(void);
+void efi_fdt_set_virtual_address_map(EFI_MEMORY_DESCRIPTOR *, UINTN, UINTN, UINTN, UINT32);
+
/* efinet.c */
struct efi_net_if {
const char *if_name;
Index: src/sys/stand/efiboot/efifdt.c
diff -u src/sys/stand/efiboot/efifdt.c:1.35 src/sys/stand/efiboot/efifdt.c:1.36
--- src/sys/stand/efiboot/efifdt.c:1.35 Sun Aug 14 11:26:41 2022
+++ src/sys/stand/efiboot/efifdt.c Thu Aug 15 05:59:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: efifdt.c,v 1.35 2022/08/14 11:26:41 jmcneill Exp $ */
+/* $NetBSD: efifdt.c,v 1.36 2024/08/15 05:59:49 skrll Exp $ */
/*-
* Copyright (c) 2019 Jason R. Thorpe
@@ -596,7 +596,7 @@ load_modules(const char *kernel_name)
* Prepare kernel arguments and shutdown boot services.
*/
int
-arch_prepare_boot(const char *fname, const char *args, u_long *marks)
+efi_fdt_prepare_boot(const char *fname, const char *args, u_long *marks)
{
load_file(get_initrd_path(), 0, false, &initrd_addr, &initrd_size);
load_file(get_dtb_path(), 0, false, &dtb_addr, &dtb_size);
@@ -650,7 +650,7 @@ arch_prepare_boot(const char *fname, con
* Free memory after a failed boot.
*/
void
-arch_cleanup_boot(void)
+efi_fdt_cleanup_boot(void)
{
if (rndseed_addr) {
uefi_call_wrapper(BS->FreePages, 2, rndseed_addr, EFI_SIZE_TO_PAGES(rndseed_size));
@@ -670,7 +670,7 @@ arch_cleanup_boot(void)
}
size_t
-arch_alloc_size(void)
+efi_fdt_alloc_size(void)
{
return FDT_SPACE;
}
@@ -735,7 +735,7 @@ efi_fdt_runtime_alloc_va(uint64_t npages
}
void
-arch_set_virtual_address_map(EFI_MEMORY_DESCRIPTOR *memmap, UINTN nentries,
+efi_fdt_set_virtual_address_map(EFI_MEMORY_DESCRIPTOR *memmap, UINTN nentries,
UINTN mapkey, UINTN descsize, UINT32 descver)
{
EFI_MEMORY_DESCRIPTOR *md, *vmd, *vmemmap;
Index: src/sys/stand/efiboot/exec.c
diff -u src/sys/stand/efiboot/exec.c:1.24 src/sys/stand/efiboot/exec.c:1.25
--- src/sys/stand/efiboot/exec.c:1.24 Wed Jun 14 10:26:45 2023
+++ src/sys/stand/efiboot/exec.c Thu Aug 15 05:59:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.24 2023/06/14 10:26:45 rin Exp $ */
+/* $NetBSD: exec.c,v 1.25 2024/08/15 05:59:49 skrll Exp $ */
/*-
* Copyright (c) 2019 Jason R. Thorpe
@@ -186,7 +186,7 @@ exec_netbsd(const char *fname, const cha
}
close(fd);
marks[MARK_END] = (((u_long) marks[MARK_END] + sizeof(int) - 1)) & -sizeof(int);
- alloc_size = marks[MARK_END] - marks[MARK_START] + arch_alloc_size() + EFIBOOT_ALIGN;
+ alloc_size = marks[MARK_END] - marks[MARK_START] + efi_fdt_alloc_size() + EFIBOOT_ALIGN;
#ifdef EFIBOOT_ALLOCATE_MAX_ADDRESS
addr = EFIBOOT_ALLOCATE_MAX_ADDRESS;
@@ -213,7 +213,7 @@ exec_netbsd(const char *fname, const cha
close(fd);
load_offset = 0;
- if (arch_prepare_boot(fname, args, marks) != 0) {
+ if (efi_fdt_prepare_boot(fname, args, marks) != 0) {
goto cleanup;
}
@@ -224,7 +224,7 @@ exec_netbsd(const char *fname, const cha
cleanup:
uefi_call_wrapper(BS->FreePages, 2, addr, EFI_SIZE_TO_PAGES(alloc_size));
- arch_cleanup_boot();
+ efi_fdt_cleanup_boot();
return EIO;
}
