e7a09764c4
- Update to 3.0.11 (via patches generated from git) - Plus newer upstream fixes (also via patches generated from git) - Fix shell exit failures in make - Fix .reloc section generation - Fix CHAR8 definition - Fix "make DESTDIR=..." - Change the installed .a/.o layout - Provide makefiles for consumers to use. - Make the -devel noarch since it's just headers. - Add a bunch of compatibility symlinks for our older packages. These will go away once we've migrated everything using them in fedora to use the newer make system... Signed-off-by: Peter Jones <pjones@redhat.com>
313 lines
11 KiB
Diff
313 lines
11 KiB
Diff
From 060258e1de84d1de3a5975bebe27575114220cdc Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 19 Jul 2018 13:12:44 -0400
|
|
Subject: [PATCH 24/45] Get rid of some unused junk that has the BSD 4-clause
|
|
license.
|
|
|
|
We don't need any of this, and its license is not GPL compatible.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
inc/Makefile | 4 -
|
|
inc/protocol/efidbg.h | 210 ---------------------------------
|
|
inc/protocol/ia64/eficontext.h | Bin 5111 -> 0 bytes
|
|
inc/protocol/makefile.hdr | Bin 640 -> 0 bytes
|
|
4 files changed, 214 deletions(-)
|
|
delete mode 100644 inc/protocol/efidbg.h
|
|
delete mode 100644 inc/protocol/ia64/eficontext.h
|
|
delete mode 100644 inc/protocol/makefile.hdr
|
|
|
|
diff --git a/inc/Makefile b/inc/Makefile
|
|
index 273d30307ae..dd36bb0103d 100644
|
|
--- a/inc/Makefile
|
|
+++ b/inc/Makefile
|
|
@@ -19,9 +19,5 @@ install:
|
|
$(INSTALL) -m 644 $(SRCDIR)/*.h $(INSTALLROOT)$(PREFIX)/include/efi
|
|
$(INSTALL) -m 644 $(SRCDIR)/protocol/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol
|
|
$(INSTALL) -m 644 $(SRCDIR)/$(ARCH)/*.h $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
|
|
-ifeq ($(ARCH),ia64)
|
|
- mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
|
|
- $(INSTALL) -m 644 $(SRCDIR)/protocol/ia64/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
|
|
-endif
|
|
|
|
include $(SRCDIR)/../Make.rules
|
|
diff --git a/inc/protocol/efidbg.h b/inc/protocol/efidbg.h
|
|
deleted file mode 100644
|
|
index 1f95a70bb42..00000000000
|
|
--- a/inc/protocol/efidbg.h
|
|
+++ /dev/null
|
|
@@ -1,210 +0,0 @@
|
|
-/*
|
|
- * Copyright (c) 1999, 2000
|
|
- * Intel Corporation.
|
|
- * All rights reserved.
|
|
- *
|
|
- * 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.
|
|
- *
|
|
- * 3. All advertising materials mentioning features or use of this software
|
|
- * must display the following acknowledgement:
|
|
- *
|
|
- * This product includes software developed by Intel Corporation and
|
|
- * its contributors.
|
|
- *
|
|
- * 4. Neither the name of Intel Corporation or its contributors may be
|
|
- * used to endorse or promote products derived from this software
|
|
- * without specific prior written permission.
|
|
- *
|
|
- * THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION 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 INTEL CORPORATION 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.
|
|
- *
|
|
- */
|
|
-
|
|
-
|
|
-#ifndef _EFIDBG_H_
|
|
-#define _EFIDBG_H_
|
|
-
|
|
-#include "eficontext.h"
|
|
-#include "efiser.h"
|
|
-
|
|
-typedef struct _DEBUGPORT_16550_CONFIG_DATA {
|
|
- UINT32 PortAddress;
|
|
- UINT64 BaudRate;
|
|
- UINT32 ReceiveFifoDepth;
|
|
- UINT32 Timeout;
|
|
- UINT8 Parity;
|
|
- UINT8 DataBits;
|
|
- UINT8 StopBits;
|
|
- UINT32 ControlMask;
|
|
- BOOLEAN RtsCtsEnable; // RTS, CTS control
|
|
-} DEBUGPORT_16550_CONFIG_DATA;
|
|
-
|
|
-typedef struct _DEBUGPORT_16550_DEVICE_PATH {
|
|
- EFI_DEVICE_PATH Header;
|
|
- DEBUGPORT_16550_CONFIG_DATA ConfigData;
|
|
-} DEBUGPORT_16550_DEVICE_PATH;
|
|
-
|
|
-typedef union {
|
|
- EFI_DEVICE_PATH DevPath;
|
|
- DEBUGPORT_16550_DEVICE_PATH Uart;
|
|
- // add new types of debugport device paths to this union...
|
|
-} DEBUGPORT_DEV_PATH;
|
|
-
|
|
-
|
|
-//
|
|
-// Debug Support protocol {2755590C-6F3C-42FA-9EA4-A3BA543CDA25}
|
|
-//
|
|
-
|
|
-#define DEBUG_SUPPORT_PROTOCOL \
|
|
-{ 0x2755590C, 0x6F3C, 0x42fa, 0x9E, 0xA4, 0xA3, 0xBA, 0x54, 0x3C, 0xDA, 0x25 }
|
|
-
|
|
-
|
|
-typedef UINTN EXCEPTION_TYPE;
|
|
-
|
|
-typedef
|
|
-VOID
|
|
-(*EXCEPTION_HANDLER) (
|
|
- IN EXCEPTION_TYPE ExceptionType,
|
|
- IN SYSTEM_CONTEXT *SystemContext
|
|
- );
|
|
-
|
|
-typedef
|
|
-EFI_STATUS
|
|
-(EFIAPI *EFI_REGISTER_TIMER_TICK_CALLBACK) (
|
|
- IN struct _EFI_DEBUG_SUPPORT_INTERFACE *This,
|
|
- IN EXCEPTION_HANDLER TimerTickCallback
|
|
- );
|
|
-
|
|
-typedef
|
|
-EFI_STATUS
|
|
-(EFIAPI *EFI_REGISTER_EXCEPTION_HANDLER) (
|
|
- IN struct _EFI_DEBUG_SUPPORT_INTERFACE *This,
|
|
- IN EXCEPTION_HANDLER ExceptionHandler,
|
|
- IN EXCEPTION_TYPE ExceptionType
|
|
- );
|
|
-
|
|
-typedef
|
|
-EFI_STATUS
|
|
-(EFIAPI *EFI_IP_CALL_TRACE) (
|
|
- IN struct _EFI_DEBUG_SUPPORT_INTERFACE *This
|
|
- );
|
|
-
|
|
-
|
|
-#define EFI_DEBUG_SUPPORT_INTERFACE_REVISION 0x00010000
|
|
-
|
|
-typedef struct _EFI_DEBUG_SUPPORT_INTERFACE {
|
|
- UINT32 Revision;
|
|
- EFI_REGISTER_TIMER_TICK_CALLBACK RegisterTimerTickCallback;
|
|
- EFI_REGISTER_EXCEPTION_HANDLER RegisterExceptionHandler;
|
|
- EFI_IP_CALL_TRACE IpCallTrace;
|
|
-} EFI_DEBUG_SUPPORT_INTERFACE;
|
|
-
|
|
-
|
|
-//
|
|
-// Debugport io protocol {EBA4E8D2-3858-41EC-A281-2647BA9660D0}
|
|
-//
|
|
-
|
|
-#define DEBUGPORT_IO_PROTOCOL \
|
|
-{ 0XEBA4E8D2, 0X3858, 0X41EC, 0XA2, 0X81, 0X26, 0X47, 0XBA, 0X96, 0X60, 0XD0 }
|
|
-
|
|
-
|
|
-typedef
|
|
-EFI_STATUS
|
|
-(EFIAPI *EFI_DEBUGPORT_IO_RESET) (
|
|
- IN struct _EFI_DEBUGPORT_IO_INTERFACE *This
|
|
- );
|
|
-
|
|
-typedef
|
|
-EFI_STATUS
|
|
-(EFIAPI *EFI_DEBUGPORT_IO_READ) (
|
|
- IN struct _EFI_DEBUGPORT_IO_INTERFACE *This,
|
|
- IN OUT UINTN *BufferSize,
|
|
- OUT VOID *Buffer
|
|
- );
|
|
-
|
|
-typedef
|
|
-EFI_STATUS
|
|
-(EFIAPI *EFI_DEBUGPORT_IO_WRITE) (
|
|
- IN struct _EFI_DEBUGPORT_IO_INTERFACE *This,
|
|
- IN OUT UINTN *BufferSize,
|
|
- IN VOID *Buffer
|
|
- );
|
|
-
|
|
-#define EFI_DEBUGPORT_IO_INTERFACE_REVISION 0x00010000
|
|
-
|
|
-typedef struct _EFI_DEBUGPORT_IO_INTERFACE {
|
|
- UINT32 Revision;
|
|
- EFI_DEBUGPORT_IO_READ Read;
|
|
- EFI_DEBUGPORT_IO_WRITE Write;
|
|
- EFI_DEBUGPORT_IO_RESET Reset;
|
|
-} EFI_DEBUGPORT_IO_INTERFACE;
|
|
-
|
|
-
|
|
-//
|
|
-// Debugport UART16550 control protocol {628EA978-4C26-4605-BC02-A42A496917DD}
|
|
-//
|
|
-
|
|
-#define DEBUGPORT_UART16550_CONTROL_PROTOCOL \
|
|
-{ 0X628EA978, 0X4C26, 0X4605, 0XBC, 0X2, 0XA4, 0X2A, 0X49, 0X69, 0X17, 0XDD }
|
|
-
|
|
-// Note: The definitions for EFI_PARITY_TYPE, EFI_STOP_BITS_TYPE, and
|
|
-// SERIAL_IO_MODE are included from efiser.h
|
|
-
|
|
-typedef
|
|
-EFI_STATUS
|
|
-(EFIAPI *EFI_UART16550_SET_ATTRIBUTES) (
|
|
- IN struct _EFI_DEBUGPORT_UART16550_CONTROL_INTERFACE *This,
|
|
- IN UINT64 BaudRate,
|
|
- IN UINT32 ReceiveFifoDepth,
|
|
- IN UINT32 Timeout,
|
|
- IN EFI_PARITY_TYPE Parity,
|
|
- IN UINT8 DataBits,
|
|
- IN EFI_STOP_BITS_TYPE StopBits
|
|
- );
|
|
-
|
|
-typedef
|
|
-EFI_STATUS
|
|
-(EFIAPI *EFI_UART16550_SET_CONTROL_BITS) (
|
|
- IN struct _EFI_DEBUGPORT_UART16550_CONTROL_INTERFACE *This,
|
|
- IN UINT32 Control
|
|
- );
|
|
-
|
|
-typedef
|
|
-EFI_STATUS
|
|
-(EFIAPI *EFI_UART16550_GET_CONTROL_BITS) (
|
|
- IN struct _EFI_DEBUGPORT_UART16550_CONTROL_INTERFACE *This,
|
|
- OUT UINT32 *Control
|
|
- );
|
|
-
|
|
-#define EFI_DEBUGPORT_UART16550_CONTROL_INTERFACE_REVISION 0x00010000
|
|
-
|
|
-typedef struct _EFI_DEBUGPORT_UART16550_CONTROL_INTERFACE {
|
|
- UINT32 Revision;
|
|
- EFI_UART16550_SET_ATTRIBUTES SetAttributes;
|
|
- EFI_UART16550_SET_CONTROL_BITS SetControl;
|
|
- EFI_UART16550_GET_CONTROL_BITS GetControl;
|
|
- DEBUGPORT_16550_CONFIG_DATA *Mode;
|
|
-} EFI_DEBUGPORT_UART16550_CONTROL_INTERFACE;
|
|
-
|
|
-
|
|
-#define DEVICE_PATH_DEBUGPORT DEBUGPORT_IO_PROTOCOL
|
|
-
|
|
-#endif /* _EFIDBG_H_ */
|
|
diff --git a/inc/protocol/ia64/eficontext.h b/inc/protocol/ia64/eficontext.h
|
|
deleted file mode 100644
|
|
index 1a39a6db1e45c8bdf96348e5e2fa82567e61df89..0000000000000000000000000000000000000000
|
|
GIT binary patch
|
|
literal 0
|
|
HcmV?d00001
|
|
|
|
literal 5111
|
|
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
|
|
AYXATM
|
|
|
|
diff --git a/inc/protocol/makefile.hdr b/inc/protocol/makefile.hdr
|
|
deleted file mode 100644
|
|
index 118d6ba3a08df254b3cf4eeecce923bdac063f3a..0000000000000000000000000000000000000000
|
|
GIT binary patch
|
|
literal 0
|
|
HcmV?d00001
|
|
|
|
literal 640
|
|
zcmb7>PiurQ5XJ9;-(l){&_fschtfTGDC(BbMHlrbNYtpIF_CDO_1iaTcS}n_FyxS7
|
|
z=J)3DVj3IM*g)3N5!A)d<Eo>aKub80cp^14lo7avAciQ;APi8Z33Xn7M#@>w_xPP`
|
|
z$(j6XH&XOUSam6HE?r*?v!rb|fm69~x7$4fAU+WWzL0}ZtEu2>)-+55MSc;4#}quU
|
|
zoonGjZW`K#?WDn5fub~fIUI@rC2mf6#Xf41lZNJl6qBd~)5QtPZMT+Vq{Y=-3Nfu`
|
|
zPYPvt9M_Y|ZC$qCoX+3|?ZL90V-oven#PH1f#-pR@WZ{el+YI&MgiLE*MiQ|<D$-*
|
|
Sq<`Dgu~$NU?D-PkUqhea3AS$l
|
|
|
|
--
|
|
2.24.1
|
|
|