From 9d339fb8503fbd5a557a6daf6ad428be87b269d5 Mon Sep 17 00:00:00 2001 From: drahn Date: Fri, 23 Apr 2021 15:31:12 +0000 Subject: [PATCH] File was accidentally duplicated on inital checkin, remove dup. --- sys/arch/riscv64/include/loadfile_machdep.h | 55 +-------------------- 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/sys/arch/riscv64/include/loadfile_machdep.h b/sys/arch/riscv64/include/loadfile_machdep.h index c4659ae4d27..f2af8d4090c 100644 --- a/sys/arch/riscv64/include/loadfile_machdep.h +++ b/sys/arch/riscv64/include/loadfile_machdep.h @@ -1,57 +1,4 @@ -/* $OpenBSD: loadfile_machdep.h,v 1.1 2021/04/23 02:42:16 drahn Exp $ */ -/* $NetBSD: loadfile_machdep.h,v 1.1 1999/04/29 03:17:12 tsubai Exp $ */ - -/*- - * Copyright (c) 1999 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Christos Zoulas. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#define BOOT_ELF -#define ELFSIZE 64 - -#define LOAD_KERNEL (LOAD_ALL & ~LOAD_TEXTA) -#define COUNT_KERNEL (COUNT_ALL & ~COUNT_TEXTA) - -extern u_long efi_loadaddr; -#define LOADADDR(a) (((((u_long)(a)) + offset)&0x3fffffffff) + \ - efi_loadaddr) -#define ALIGNENTRY(a) ((u_long)(a)) -#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c)) -#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c)) -#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c)) -#define WARN(a) (void)(printf a, \ - printf((errno ? ": %s\n" : "\n"), \ - strerror(errno))) -#define PROGRESS(a) (void) printf a -#define ALLOC(a) alloc(a) -#define FREE(a, b) free(a, b) - -void run_loadfile(uint64_t *, int); -/* $OpenBSD: loadfile_machdep.h,v 1.1 2021/04/23 02:42:16 drahn Exp $ */ +/* $OpenBSD: loadfile_machdep.h,v 1.2 2021/04/23 15:31:12 drahn Exp $ */ /* $NetBSD: loadfile_machdep.h,v 1.1 1999/04/29 03:17:12 tsubai Exp $ */ /*- -- 2.20.1