From b2ac6c5d60a3d7427fc89ceed9768c779cbf87d7 Mon Sep 17 00:00:00 2001
From: Wei Chen <wei.chen@arm.com>
Date: Tue, 16 Oct 2018 02:54:09 +0000
Subject: [PATCH] kernel: configs: Add EFI support for Arm64

As x86_64 has updated the guest kernel to enable EFI support for NEMU,
because OVMF that is used by NEMU is an EFI firmware. Although the
NEMU is not ready for Arm64, we'd better to enable EFI support in
kernel to keep sync with x86_64.

Fixes #228

Signed-off-by: Wei Chen <wei.chen@arm.com>
---
 kernel/configs/arm64_kata_kvm_4.14.x | 22 ++++++++++++++++++++--
 kernel/kata_config_version           |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/kernel/configs/arm64_kata_kvm_4.14.x b/kernel/configs/arm64_kata_kvm_4.14.x
index 050bd1493f..1aa203e109 100644
--- a/kernel/configs/arm64_kata_kvm_4.14.x
+++ b/kernel/configs/arm64_kata_kvm_4.14.x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.57 Kernel Configuration
+# Linux/arm64 4.14.72 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -476,6 +476,7 @@ CONFIG_SCHED_SMT=y
 CONFIG_NR_CPUS=255
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_NUMA is not set
+CONFIG_HOLES_IN_ZONE=y
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
@@ -558,7 +559,9 @@ CONFIG_ARM64_MODULE_CMODEL_LARGE=y
 #
 CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_FORCE is not set
-# CONFIG_EFI is not set
+CONFIG_EFI_STUB=y
+CONFIG_EFI=y
+# CONFIG_DMI is not set
 
 #
 # Userspace binary formats
@@ -1538,6 +1541,7 @@ CONFIG_XEN_XENBUS_FRONTEND=y
 # CONFIG_XEN_GRANT_DEV_ALLOC is not set
 CONFIG_SWIOTLB_XEN=y
 CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_EFI=y
 CONFIG_XEN_AUTO_XLATE=y
 # CONFIG_STAGING is not set
 # CONFIG_GOLDFISH is not set
@@ -1669,6 +1673,18 @@ CONFIG_ARM_PSCI_FW=y
 # CONFIG_FW_CFG_SYSFS is not set
 CONFIG_HAVE_ARM_SMCCC=y
 # CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+# CONFIG_EFI_VARS is not set
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_PARAMS_FROM_FDT=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_ARMSTUB=y
+# CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_TEST is not set
+# CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_MESON_SM is not set
 
 #
@@ -1755,6 +1771,7 @@ CONFIG_TMPFS_XATTR=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 # CONFIG_CONFIGFS_FS is not set
+# CONFIG_EFIVAR_FS is not set
 # CONFIG_MISC_FILESYSTEMS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
@@ -2154,6 +2171,7 @@ CONFIG_NLATTR=y
 # CONFIG_IRQ_POLL is not set
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=m
+CONFIG_UCS2_STRING=y
 # CONFIG_SG_SPLIT is not set
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
diff --git a/kernel/kata_config_version b/kernel/kata_config_version
index 8351c19397..60d3b2f4a4 100644
--- a/kernel/kata_config_version
+++ b/kernel/kata_config_version
@@ -1 +1 @@
-14
+15