From patchwork Thu May 25 11:59:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 766939 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3wYSVY2bNVz9s5L; Thu, 25 May 2017 21:59:33 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b="f+jG8jJv"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1dDrQO-0006rP-8W; Thu, 25 May 2017 11:59:28 +0000 Received: from mail-qt0-f172.google.com ([209.85.216.172]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1dDrQJ-0006r9-Ig for kernel-team@lists.ubuntu.com; Thu, 25 May 2017 11:59:23 +0000 Received: by mail-qt0-f172.google.com with SMTP id v27so177840768qtg.2 for ; Thu, 25 May 2017 04:59:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=lroIT1srw6oGQ8djxi5RLPH2yJ8aSAhlzGv++3tia1U=; b=f+jG8jJv7xI+yOX2gzsMQp4iwHyex/zR/nHIjz8gdFAlAXzI3y7Ovd6uRwsvnD/0r4 u0TUQgNywbbvV2kh9bitO7YmyjTTZBwhvh5SuDpxvi4oc7WvQm13PXawMDK/tBxDHYCa TwB2kdTVVtMu4U+fqTZavhMukZ10npEGrsu9CHyZsYNYcTHr7Ww8nvdK0mjnsBiVJtgp MIh6JoA8efRBBwRWFufJzl4ZT1c7LiNZdlDOGpl0EP0RnZfABfamY44l+zxZHON9/hei chiOVTfDm1GlVgmAId2I2WL8NBWLdNUJWh4Z60ZRuLgEQNYgl+HtnWwh70yisCK+kH7v LLnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=lroIT1srw6oGQ8djxi5RLPH2yJ8aSAhlzGv++3tia1U=; b=km5/zXHmJYzSrmovjRbplOiqC0MHUqmBKW/O9pcAoZPF6GTcHWg/B4UJt5Ig0Kc0Nj lJ082fZeXKcL27sj2reti+hf0rWmy9C3EH2P/c25WFljBq5ltRC7+50/gUGuG/PrZ4Lr dCPmc5uWUqVwbIYixISjOZ/8fafdjcEPf0wk+icEHR8G6gY2bn8B3TJGul73Nrsj28xm hfDuZvNIyYhmEUR82VSJTRVlNRgR71VCuIrsFsM3alZDPugP88VV7b8Rriitlo5HxqFe ofLUr5RQA8kmaaqbE6T7IIy7KiKmzEsW1rNIAyLP8p84niGs01GAyWGZAVXGrZSbd/W4 Ycvw== X-Gm-Message-State: AODbwcAJ6YFPlOay//WcP/afNoaWTX0HHfhYbJniBBQURGkyYwVS3L5D BYI4h5AOOus4nzZlvCE= X-Received: by 10.200.37.201 with SMTP id f9mr44269574qtf.138.1495713562357; Thu, 25 May 2017 04:59:22 -0700 (PDT) Received: from localhost.localdomain (189-19-112-107.dsl.telesp.net.br. [189.19.112.107]) by smtp.gmail.com with ESMTPSA id v1sm4433617qtg.45.2017.05.25.04.59.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 May 2017 04:59:21 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [azure][PATCH] Revert "UBUNTU: [config] azure: disable CONFIG_EFI" Date: Thu, 25 May 2017 08:59:14 -0300 Message-Id: <1495713554-29187-1-git-send-email-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.7.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com BugLink: https://bugs.launchpad.net/bugs/1692920 This reverts commit 78e3758bc07ac6d25e4081529e87f62dcaec8e34. It's desirable to be able to boot the azure kernel in a local Hyper-V for testing and other purposes. In order to support that it's necessary to keep EFI enabled. Signed-off-by: Marcelo Henrique Cerri Acked-by: Colin Ian King --- debian.azure/config/annotations | 4 ++-- debian.azure/config/config.common.ubuntu | 27 +++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations index 1722a0f0b575..d1c9f4c94018 100644 --- a/debian.azure/config/annotations +++ b/debian.azure/config/annotations @@ -8335,7 +8335,7 @@ CONFIG_FW_CFG_SYSFS_CMDLINE policy<{'amd64': 'n', 'arm64': ' CONFIG_GOOGLE_FIRMWARE policy<{'amd64': 'n', 'i386': 'n'}> # Menu: Firmware Drivers >> EFI (Extensible Firmware Interface) Support -CONFIG_EFI_VARS policy<{'amd64': '-', 'arm64': 'y', 'i386': 'y'}> +CONFIG_EFI_VARS policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y'}> CONFIG_EFI_VARS_PSTORE policy<{'amd64': 'm', 'arm64': 'm', 'i386': 'm'}> CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE policy<{'amd64': 'n', 'arm64': 'n', 'i386': 'n'}> CONFIG_EFI_RUNTIME_MAP policy<{'amd64': 'y', 'i386': 'y'}> @@ -8345,7 +8345,7 @@ CONFIG_EFI_CAPSULE_LOADER policy<{'amd64': 'm', 'arm64': ' CONFIG_EFI_TEST policy<{'amd64': 'm', 'arm64': 'm', 'i386': 'm'}> CONFIG_APPLE_PROPERTIES policy<{'amd64': 'y', 'i386': 'y'}> # -CONFIG_EFI_VARS mark note note +CONFIG_EFI_VARS mark note # Menu: Firmware Drivers >> Google Firmware Drivers diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu index 2b70297c3442..cefd79787b5e 100644 --- a/debian.azure/config/config.common.ubuntu +++ b/debian.azure/config/config.common.ubuntu @@ -51,6 +51,7 @@ CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_MEMORY_FAILURE=y CONFIG_ACPI_APEI_PCIEAER=y # CONFIG_ACPI_BATTERY is not set +# CONFIG_ACPI_BGRT is not set CONFIG_ACPI_BUTTON=y # CONFIG_ACPI_CMPC is not set # CONFIG_ACPI_CONFIGFS is not set @@ -227,6 +228,7 @@ CONFIG_APDS9300=m CONFIG_APDS9802ALS=m CONFIG_APDS9960=m # CONFIG_APPLE_GMUX is not set +CONFIG_APPLE_PROPERTIES=y CONFIG_APPLICOM=m CONFIG_AQUANTIA_PHY=m CONFIG_ARCH_CLOCKSOURCE_DATA=y @@ -1287,6 +1289,7 @@ CONFIG_E1000E=m CONFIG_E1000E_HWTS=y CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK_DBGP=y +CONFIG_EARLY_PRINTK_EFI=y CONFIG_EBC_C384_WDT=m CONFIG_ECHO=m CONFIG_ECRYPT_FS=y @@ -1322,9 +1325,25 @@ CONFIG_EEPROM_AT24=m CONFIG_EEPROM_AT25=m CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m -# CONFIG_EFI is not set -# CONFIG_EFI_DEV_PATH_PARSER is not set +CONFIG_EFI=y +CONFIG_EFIVAR_FS=y +CONFIG_EFI_BOOTLOADER_CONTROL=m +CONFIG_EFI_CAPSULE_LOADER=m +CONFIG_EFI_DEV_PATH_PARSER=y +CONFIG_EFI_ESRT=y +# CONFIG_EFI_FAKE_MEMMAP is not set +CONFIG_EFI_MIXED=y CONFIG_EFI_PARTITION=y +# CONFIG_EFI_PGT_DUMP is not set +CONFIG_EFI_RUNTIME_MAP=y +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE=y +CONFIG_EFI_SIGNATURE_LIST_PARSER=y +CONFIG_EFI_STUB=y +CONFIG_EFI_TEST=m +CONFIG_EFI_VARS=y +CONFIG_EFI_VARS_PSTORE=m +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set CONFIG_EFS_FS=m CONFIG_ELFCORE=y CONFIG_ELF_CORE=y @@ -1420,6 +1439,7 @@ CONFIG_FB_CMDLINE=y # CONFIG_FB_CYBER2000 is not set CONFIG_FB_DDC=m CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_EFI is not set CONFIG_FB_FLEX=m # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HGA is not set @@ -2950,6 +2970,7 @@ CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" # CONFIG_MODULE_SIG_SHA256 is not set # CONFIG_MODULE_SIG_SHA384 is not set CONFIG_MODULE_SIG_SHA512=y +CONFIG_MODULE_SIG_UEFI=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODVERSIONS is not set @@ -4954,6 +4975,7 @@ CONFIG_TWL4030_WATCHDOG=m CONFIG_TWL6030_GPADC=m CONFIG_TWL6040_CORE=y # CONFIG_UBSAN is not set +CONFIG_UCS2_STRING=y CONFIG_UDF_FS=m CONFIG_UDF_NLS=y CONFIG_UEFI_CPER=y @@ -5165,6 +5187,7 @@ CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y # CONFIG_X86_SYSFB is not set CONFIG_X86_THERMAL_VECTOR=y CONFIG_X86_TSC=y +# CONFIG_X86_UV is not set # CONFIG_X86_VERBOSE_BOOTUP is not set # CONFIG_X86_VSMP is not set CONFIG_X86_VSYSCALL_EMULATION=y