From 2ad331874eaacfb14aa45fde5db3e66838ac81c5 Mon Sep 17 00:00:00 2001 From: Nathan Whitehorn Date: Thu, 28 Dec 2017 23:49:53 +0000 Subject: [PATCH] Remove ELF note for Open Firmware. It is marked optional in a single 1996 draft of a never-finalized standard (CHRP) and is irrelevant in practice on FreeBSD since we load the kernel with loader(8) on Open Firmware platforms anyway. Moreover, loader(8), which is directly loaded by Open Firmware, has never had an equivalent note. MFC after: 2 weeks --- sys/conf/files.powerpc | 1 - sys/powerpc/ofw/ofwmagic.S | 68 -------------------------------------- 2 files changed, 69 deletions(-) delete mode 100644 sys/powerpc/ofw/ofwmagic.S diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 932a2ae80c3..941c1f31e11 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -158,7 +158,6 @@ powerpc/ofw/ofw_real.c optional aim powerpc/ofw/ofw_syscons.c optional sc aim powerpc/ofw/ofwcall32.S optional aim powerpc powerpc/ofw/ofwcall64.S optional aim powerpc64 -powerpc/ofw/ofwmagic.S optional aim powerpc/ofw/openpic_ofw.c optional aim | fdt powerpc/ofw/rtas.c optional aim powerpc/powermac/ata_kauai.c optional powermac ata | powermac atamacio diff --git a/sys/powerpc/ofw/ofwmagic.S b/sys/powerpc/ofw/ofwmagic.S deleted file mode 100644 index f44f1e5f68d..00000000000 --- a/sys/powerpc/ofw/ofwmagic.S +++ /dev/null @@ -1,68 +0,0 @@ -/* $FreeBSD$ */ -/* $NetBSD: ofwmagic.S,v 1.2 1997/10/09 08:38:18 jtc Exp $ */ - -/*- - * Copyright (c) 1997 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Jason R. Thorpe. - * - * 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. - */ - -/* - * Magic note section used by Open Firmware. - */ - - .section ".note" - - /*# note header */ - - /*# length of name */ - .long 8 - - /*# note descriptor size */ - .long 20 - - /*# note type (IEEE 1275) */ - .long 0x1275 - - /*# name of owner */ - .asciz "PowerPC" - .balign 4 - - - /*# note descriptor */ - - /*# real mode (-1) or virtual mode (0) */ - .long 0 - - /*# real-base */ - .long -1 - /*# real-size */ - .long -1 - - /*# virt-base */ - .long -1 - /*# virt-size */ - .long -1