[meta-intel] [PATCH] efilinux: remove

California Sullivan california.l.sullivan at intel.com
Thu Mar 22 09:19:46 PDT 2018


The code hasn't been touched for over 4 years. Its also unlikely to have
been used much if at all considering our previous lack of EFI boot
partition support.

Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
---
 conf/include/maintainers.inc                       |  1 -
 ...-Disable-address-of-packed-member-warning.patch | 33 -------------------
 .../efilinux/0002-initialize-char-pointers.patch   | 33 -------------------
 recipes-bsp/efilinux/efilinux_1.1.bb               | 38 ----------------------
 4 files changed, 105 deletions(-)
 delete mode 100644 recipes-bsp/efilinux/efilinux/0001-Disable-address-of-packed-member-warning.patch
 delete mode 100644 recipes-bsp/efilinux/efilinux/0002-initialize-char-pointers.patch
 delete mode 100644 recipes-bsp/efilinux/efilinux_1.1.bb

diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc
index 0ab61ab2..d37ddb5e 100644
--- a/conf/include/maintainers.inc
+++ b/conf/include/maintainers.inc
@@ -2,7 +2,6 @@
 
 RECIPE_MAINTAINER_pn-core-image-rt = "Stephano Cetola <stephano.cetola at linux.intel.com>"
 RECIPE_MAINTAINER_pn-core-image-rt-sdk = "Stephano Cetola <stephano.cetola at linux.intel.com>"
-RECIPE_MAINTAINER_pn-efilinux = "California Sullivan <california.l.sullivan at intel.com>"
 RECIPE_MAINTAINER_pn-gma500-gfx-check = "Anuj Mittal <anuj.mittal at intel.com>"
 RECIPE_MAINTAINER_pn-intel-gpu-tools = "Anuj Mittal <anuj.mittal at intel.com>"
 RECIPE_MAINTAINER_pn-intel-microcode = "California Sullivan <california.l.sullivan at intel.com>"
diff --git a/recipes-bsp/efilinux/efilinux/0001-Disable-address-of-packed-member-warning.patch b/recipes-bsp/efilinux/efilinux/0001-Disable-address-of-packed-member-warning.patch
deleted file mode 100644
index afb99514..00000000
--- a/recipes-bsp/efilinux/efilinux/0001-Disable-address-of-packed-member-warning.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7c171c1813651a3a02ad2cda361b42ebc7ce324d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Sat, 12 Aug 2017 10:34:19 -0700
-Subject: [PATCH 1/2] Disable address-of-packed-member warning
-
-Clang complains so make it happy
-
-loaders/bzimage/bzimage.c:346:55: error: taking address of packed member 'base' of class or structure 'dt_addr_t' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member]
-        err = emalloc(gdt.limit, 8, (EFI_PHYSICAL_ADDRESS *)&gdt.base);
-
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
----
-Upstream-Status: Pending
-
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index a955e34..ff1b79b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -61,7 +61,7 @@ ifeq ($(ARCH),ia32)
- 	endif
- endif
- ifeq ($(ARCH),x86_64)
--	CFLAGS += -mno-red-zone
-+	CFLAGS += -mno-red-zone -Wno-address-of-packed-member
- endif
- 
- LDFLAGS=-T $(LDSCRIPT) -Bsymbolic -shared -nostdlib -znocombreloc \
--- 
-2.14.1
-
diff --git a/recipes-bsp/efilinux/efilinux/0002-initialize-char-pointers.patch b/recipes-bsp/efilinux/efilinux/0002-initialize-char-pointers.patch
deleted file mode 100644
index 127c187a..00000000
--- a/recipes-bsp/efilinux/efilinux/0002-initialize-char-pointers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 49053e4ff0f3550d019cdad8a93677c18fc69791 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Sat, 12 Aug 2017 10:35:09 -0700
-Subject: [PATCH 2/2] initialize char pointers
-
-Clang complains about using them without initializing
-
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
----
-Upstream-Status: Pending
-
- entry.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/entry.c b/entry.c
-index 0aa6cdd..23ba51e 100644
---- a/entry.c
-+++ b/entry.c
-@@ -402,9 +402,9 @@ efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *_table)
- 	WCHAR *error_buf;
- 	EFI_STATUS err;
- 	EFI_LOADED_IMAGE *info;
--	CHAR16 *name, *options;
-+	CHAR16 *name = NULL, *options;
- 	UINT32 options_size;
--	char *cmdline;
-+	char *cmdline = NULL;
- 
- 	InitializeLib(image, _table);
- 	sys_table = _table;
--- 
-2.14.1
-
diff --git a/recipes-bsp/efilinux/efilinux_1.1.bb b/recipes-bsp/efilinux/efilinux_1.1.bb
deleted file mode 100644
index 63e80f88..00000000
--- a/recipes-bsp/efilinux/efilinux_1.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION = "A UEFI OS loader"
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://efilinux.h;beginline=5;endline=27;md5=f8d56e644672ac63fd81b55c205283ad"
-
-DEPENDS = "gnu-efi"
-
-inherit deploy
-
-SRCREV = "a995826f9e43f1134baea61610eafd8c173bb776"
-PV = "1.1+git${SRCPV}"
-
-SRC_URI = "git://git.kernel.org/pub/scm/boot/efilinux/efilinux.git \
-           file://0001-Disable-address-of-packed-member-warning.patch \
-           file://0002-initialize-char-pointers.patch \
-           "
-
-S = "${WORKDIR}/git"
-
-COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)'
-
-EXTRA_OEMAKE = "INCDIR=${STAGING_INCDIR} LIBDIR=${STAGING_LIBDIR}"
-
-# syslinux uses $LD for linking, strip `-Wl,' so it can work
-export LDFLAGS = "`echo $LDFLAGS | sed 's/-Wl,//g'`"
-
-do_deploy () {
-        install ${S}/efilinux.efi ${DEPLOYDIR}/efilinux.efi
-}
-addtask deploy before do_build after do_compile
-
-python () {
-    ccargs = d.getVar('TUNE_CCARGS').split()
-    if '-mx32' in ccargs:
-        # use x86_64 EFI ABI
-        ccargs.remove('-mx32')
-        ccargs.append('-m64')
-        d.setVar('TUNE_CCARGS', ' '.join(ccargs))
-}
-- 
2.14.3



More information about the meta-intel mailing list