Some fix for building Linux host version with latest gnuefi lib

.gitignore

@@ -0,0 +1,2 @@
+*~
+cscope.*

Android.mk

@@ -0,0 +1,94 @@
+EFIWRAPPER_LOCAL_PATH := $(call my-dir)
+EFIWRAPPER_CFLAGS := -Wall -Wextra -Werror
+
+ifeq ($(TARGET_UEFI_ARCH),x86_64)
+EFIWRAPPER_CFLAGS += -DBUILD_X64
+EFIWRAPPER_CFLAGS += -D__STDC_VERSION__=199901L
+endif
+
+ifeq ($(TARGET_BUILD_VARIANT),user)
+    EFIWRAPPER_CFLAGS += -DUSER -DUSERDEBUG
+endif
+
+ifeq ($(TARGET_BOARD_PLATFORM),icelakeu)
+    EFIWRAPPER_CFLAGS += -DPLATFORM_ICELAKE
+endif
+
+ifeq ($(TARGET_BOARD_PLATFORM),tigerlake)
+    EFIWRAPPER_CFLAGS += -DPLATFORM_TIGERLAKE
+endif
+
+ifeq ($(TARGET_BOARD_PLATFORM),kabylake)
+    EFIWRAPPER_CFLAGS += -DPLATFORM_KABYLAKE
+endif
+
+ifeq ($(TARGET_BOARD_PLATFORM),broxton)
+    EFIWRAPPER_CFLAGS += -DPLATFORM_BROXTON
+endif
+
+ifeq ($(EFIWRAPPER_USE_EC_UART),true)
+    EFIWRAPPER_CFLAGS += -DEFIWRAPPER_USE_EC_UART
+endif
+
+ifeq ($(TARGET_BUILD_VARIANT),userdebug)
+    EFIWRAPPER_CFLAGS += -DUSERDEBUG
+endif
+
+ifeq ($(CAPSULE_SOURCE),abl)
+    EFIWRAPPER_CFLAGS += -DCAPSULE4ABL
+endif
+
+ifeq ($(CAPSULE_SOURCE),sbl)
+    EFIWRAPPER_CFLAGS += -DCAPSULE4SBL
+endif
+
+EFIWRAPPER_CFLAGS += -DPRODUCT_NAME=\"$(TARGET_PRODUCT)\"
+
+ifeq ($(PRODUCT_MANUFACTURER),)
+    EFIWRAPPER_CFLAGS += -DPRODUCT_MANUFACTURER=\"unknown\"
+else
+    EFIWRAPPER_CFLAGS += -DPRODUCT_MANUFACTURER=\"$(PRODUCT_MANUFACTURER)\"
+endif
+
+ifeq ($(KERNELFLINGER_DISABLE_DEBUG_PRINT),true)
+    EFIWRAPPER_CFLAGS += -DDISABLE_DEBUG_PRINT
+endif
+
+ifeq ($(IOC_USE_SLCAN),true)
+    EFIWRAPPER_CFLAGS += -DIOC_USE_SLCAN
+else ifeq ($(IOC_USE_CBC),true)
+    EFIWRAPPER_CFLAGS += -DIOC_USE_CBC
+endif
+
+EFIWRAPPER_HOST_CFLAGS := \
+	$(EFIWRAPPER_CFLAGS) \
+	-fshort-wchar \
+	-DEFI_FUNCTION_WRAPPER \
+	-DGNU_EFI_USE_MS_ABI \
+	-DHOST
+
+ifeq ($(TARGET_IAFW_ARCH),x86_64)
+    EFIWRAPPER_HOST_ARCH += x86_64
+else
+    EFIWRAPPER_HOST_ARCH += x86
+endif
+
+EFIWRAPPER_HOST_C_INCLUDES := \
+	external/gnu-efi/gnu-efi-3.0/inc \
+	external/gnu-efi/gnu-efi-3.0/inc/$(TARGET_EFI_ARCH_NAME) \
+	external/gnu-efi/gnu-efi-3.0/inc/protocol
+
+include $(call all-subdir-makefiles)
+
+include $(CLEAR_VARS)
+LOCAL_PATH := $(EFIWRAPPER_LOCAL_PATH)
+LOCAL_MODULE := efiwrapper-$(TARGET_BUILD_VARIANT)
+LOCAL_STATIC_LIBRARIES := \
+	libefiwrapper-$(TARGET_BUILD_VARIANT) \
+	libgnuefi \
+	libefi \
+	libefiwrapper_drivers-$(TARGET_BUILD_VARIANT)
+LOCAL_CFLAGS := $(EFIWRAPPER_CFLAGS)
+LOCAL_SRC_FILES := \
+	main.c
+include $(BUILD_IAFW_STATIC_LIBRARY)

COPYING

@@ -0,0 +1,25 @@
+Copyright (c) 2016, Intel Corportaion
+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.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
+HOLDER 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.

Make.defaults

@@ -0,0 +1,17 @@
+ARCH := $(shell uname -m | sed s/i[3-9]86/ia32/)
+GNU_EFI_PATH ?= /usr/local/include/efi
+GNU_EFI_INCS := -I$(GNU_EFI_PATH) \
+	        -I$(GNU_EFI_PATH)/$(ARCH) \
+	        -I$(GNU_EFI_PATH)/protocol
+
+EW_INCS = -I$(SRC_DIR)/include/libefiwrapper
+EW_LIB  = $(SRC_DIR)/libefiwrapper/libefiwrapper_host-$(TARGET_BUILD_VARIANT).a
+
+PRODUCT_MANUFACTURER ?= unknown
+PRODUCT_NAME         ?= default_name
+
+CFLAGS = -Wall -Werror -fshort-wchar -DGNU_EFI_USE_MS_ABI $(EXTRA_CFLAGS)
+
+#default rule
+%.o: %.c
+	$(CC) $(CFLAGS) $(GNU_EFI_INCS) $(EW_INCS) -c $< -o $@

Makefile

@@ -0,0 +1,30 @@
+SRC_DIR := .
+include $(SRC_DIR)/Make.defaults
+
+SUB_DIRS := libefiwrapper host
+define submake
+	$(foreach d,$(SUB_DIRS),$(MAKE) -C $(d) $(1);)
+endef
+
+efiwrapper_host-eng:       export EXTRA_CFLAGS := -DHOST
+efiwrapper_host-userdebug: export EXTRA_CFLAGS := -DHOST -DUSERDEBUG
+efiwrapper_host-user:      export EXTRA_CFLAGS := -DHOST -DUSERDEBUG -DUSER
+
+efiwrapper_host-eng \
+efiwrapper_host-userdebug \
+efiwrapper_host-user:
+	$(eval export TARGET_BUILD_VARIANT := $(subst efiwrapper_host-,,$@))
+	@$(MAKE) efiwrapper_host
+
+efiwrapper_host: $(EW_LIB)
+	@$(MAKE) -C host
+
+$(EW_LIB):
+	@$(MAKE) -C libefiwrapper
+
+.PHONY: clean
+clean:
+	@$(call submake,clean)
+
+mrproper: clean
+	@$(call submake,mrproper)

README.md

@@ -0,0 +1,85 @@
+EfiWrapper
+==========
+
+Overview
+--------
+
+EfiWrapper is a library which simulate a UEFI firmware
+implementation. Its first purpose is to run a subset of the
+[Kernelflinger](https://github.com/01org/kernelflinger/) OS loader to
+run in a non-UEFI environment.
+
+Basic architecture
+------------------
+* `libefiwrapper`: library that provides a basic implementation of the
+  Boot services and Runtime services.  It includes basic EFI variable
+  management (no storage) and serial IO protocol support. It also
+  provides an abstraction for storage class implementation.  This
+  library is system independent and MUST be kept that way.
+
+* `libefiwrapper_drivers`: library including all the protocols
+  specified by the `LIBEFIWRAPPER_DRIVERS` Makefile variable.  Drivers
+  are in the drivers/DRIVER\_NAME directories and might rely on
+  external libraries like the `libpayload` from the
+  [Coreboot](https://www.coreboot.org/) project.
+
+* `host`: produce an `efiwrapper_host` host executable that can run an
+  EFI binary. See `Run an EFI binary on host` section.
+
+* efiwrapper: library that provides the `main()` entry point which
+  initialize the libefiwrapper library and all the drivers before
+  calling the `efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *table)`
+  function.
+
+Run an EFI binary on host
+-------------------------
+
+To build `efiwrapper_host`, run the following command in your Android
+build environment:
+
+``` bash
+$ make efiwrapper_host-<BUILD_VARIANT>
+```
+Where `<BUILD_VARIANT>` is either `user`, `userdebug` or `eng`.
+
+``` bash
+$ efiwrapper_host --help
+Usage: efiwrapper_host [OPTIONS] <EFI binary> [ARGS]
+ OPTIONS:
+ -h,--help                      Print this help
+ --list-drivers                 List available drivers
+ --disable-drivers=DRV1,DRV2    Disable drivers DRV1 and DRV2
+```
+
+The `efiwrapper_host` has built-in drivers:
+``` bash
+$ efiwrapper_host --list-drivers
+Drivers list:
+- disk: Emulate eMMC storage
+- event: Event management for host
+- tcp4: TCP/IP protocol
+- fileio: File System Protocol support
+- gop: Graphics Output Protocol support based on Xlib
+- image: PE/COFF image
+```
+
+Drivers can be independently deactivated.  For instance, if you want to
+run Kernelflinger EFI binary witout the Graphic Output Protocol support:
+
+``` bash
+$ efiwrapper_host --disable-drivers=gop kernelflinger.efi -f
+```
+
+Dependencies
+------------
+* gnu-efi: libefiwrapper and efiwrapper libraries depends on the
+  gnu-efi library for EFI types definitions.
+
+* drivers/*: most of these drivers depends on the `libpayload` library
+  from the [Coreboot](https://www.coreboot.org/) project.
+
+* host/gop.c: libx11 devel library
+
+Copyright and Licence
+---------------------
+EfiWrapper is licensed under the terms of the BSD 2-Clause.

drivers/Android.mk

@@ -0,0 +1,41 @@
+LOCAL_PATH := $(call my-dir)
+
+# LIBEFIWRAPPER_DRIVERS must be defined for the current product with
+# the list of drivers (see directories of this very directory).
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libefiwrapper_drivers-$(TARGET_BUILD_VARIANT)
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_STATIC_LIBRARIES := \
+	libpayload \
+	libefiwrapper-$(TARGET_BUILD_VARIANT) \
+	libgnuefi \
+	libefi
+LOCAL_SRC_FILES := \
+	$(foreach drv, $(LIBEFIWRAPPER_DRIVERS), \
+		$(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/$(drv)/*.c)))
+GEN := $(local-generated-sources-dir)/drivers.c
+ifeq ($(LIBEFIWRAPPER_DRIVERS),)
+$(GEN):
+	$(hide) mkdir -p $(dir $@)
+	$(hide)	echo "/* Do not modify this auto-generated file. */" > $@
+	$(hide) echo "#error \"no driver selected.  Cf. LIBEFIWRAPPER_DRIVERS Makefile variable.\"" >> $@
+else
+$(GEN):
+	$(hide) mkdir -p $(dir $@)
+	$(hide) echo "/* Do not modify this auto-generated file. */" > $@
+	$(hide) echo "#include \"ewdrv.h\"" >> $@
+	$(hide) $(foreach drv, $(LIBEFIWRAPPER_DRIVERS), echo "#include" \"$(drv)/$(drv).h\" >> $@;)
+	$(hide) echo "" >> $@
+	$(hide) echo "static ewdrv_t *drivers[] = {" >> $@
+	$(hide) $(foreach drv, $(LIBEFIWRAPPER_DRIVERS), echo "&"$(drv)_drv, >> $@;)
+	$(hide) echo  "NULL" >> $@
+	$(hide) echo "};" >> $@
+	$(hide) echo "" >> $@
+	$(hide) echo "ewdrv_t **ew_drivers = drivers;" >> $@
+endif
+LOCAL_GENERATED_SOURCES := $(GEN)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+LOCAL_CFLAGS := $(EFIWRAPPER_CFLAGS)
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include/hardware
+include $(BUILD_IAFW_STATIC_LIBRARY)