From 33c2fa23700d6e03559f7f5e1dbf5c1cfae41661 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Wed, 12 Jan 2022 18:32:40 -0800 Subject: [PATCH] linux-purism-librem5: enable EFI stub (MR 2842) useful for booting the kernel via an ipxe.efi started by u-boot --- device/main/linux-purism-librem5/APKBUILD | 4 +-- .../config-purism-librem5.aarch64 | 35 ++++++++++++++++++- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/device/main/linux-purism-librem5/APKBUILD b/device/main/linux-purism-librem5/APKBUILD index 5c747384f..e75602eb4 100644 --- a/device/main/linux-purism-librem5/APKBUILD +++ b/device/main/linux-purism-librem5/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: Bhushan Shah pkgname=linux-purism-librem5 pkgver=5.13.19 -pkgrel=3 +pkgrel=4 _purismrel=5 # . _purismver=${pkgver}pureos$_purismrel @@ -87,5 +87,5 @@ sha512sums=" c52f9e7e17f876697000a0c3b959a0d571ca506ba55ee5158e30ac00e148372097c88951a354190f669137a955405c87042a925c1bbe3cd91df40721650d45d3 0003-imx8mq-librem5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch 59d480b6379dcfff94d05b08e28c005d507f640dc0147841e7df4827fce8db01dab1d4d50fb45b2b3fff72cdeb219a8cd87a889078a6372aea4469c861c378b1 0004-CVE-2021-39685-USB-gadget-detect-too-big-endpoint-0-requests.patch 61f862cda24e7b14e55e9a9ce3a537adfc7a1c77e0670255dc485886e2c19156ddaf49fdd88b629ddde3cf25a83fd603678caebb96e18f59245917d3a2e51bb0 0005-CVE-2021-39685-USB-gadget-zero-allocate-endpoint-0-buffers.patch -5cf04237282a7f568ab56a79606c645d1275c0b47c4e452c9f41d736a8c63370f6ccc2958a855000e835e9b1db50fb0c756b1d47384448dfc82e975965a06926 config-purism-librem5.aarch64 +e44a2e2032b182b565cc0c329b3eb316b6232dd57fe6bbe79dcf39d891520a5816b3a745087e18c829336d3279535e55ee559ea5e9b17365f2fdcecef17d3f6e config-purism-librem5.aarch64 " diff --git a/device/main/linux-purism-librem5/config-purism-librem5.aarch64 b/device/main/linux-purism-librem5/config-purism-librem5.aarch64 index 2d4709e8d..e54d3da50 100644 --- a/device/main/linux-purism-librem5/config-purism-librem5.aarch64 +++ b/device/main/linux-purism-librem5/config-purism-librem5.aarch64 @@ -482,7 +482,9 @@ CONFIG_STACKPROTECTOR_PER_TASK=y # Boot options # CONFIG_CMDLINE="" -# CONFIG_EFI is not set +CONFIG_EFI_STUB=y +CONFIG_EFI=y +CONFIG_DMI=y # end of Boot options CONFIG_SYSVIPC_COMPAT=y @@ -564,8 +566,28 @@ CONFIG_ARM_IMX_CPUFREQ_DT=y CONFIG_ARM_SCPI_PROTOCOL=y CONFIG_ARM_SCPI_POWER_DOMAIN=y # CONFIG_ARM_SDE_INTERFACE is not set +CONFIG_DMIID=y +# CONFIG_DMI_SYSFS is not set # CONFIG_FW_CFG_SYSFS is not set # CONFIG_GOOGLE_FIRMWARE is not set + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_ESRT=y +CONFIG_EFI_PARAMS_FROM_FDT=y +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_EFI_GENERIC_STUB=y +CONFIG_EFI_ARMSTUB_DTB_LOADER=y +CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y +# CONFIG_EFI_BOOTLOADER_CONTROL is not set +# CONFIG_EFI_CAPSULE_LOADER is not set +# CONFIG_EFI_TEST is not set +# CONFIG_RESET_ATTACK_MITIGATION is not set +# CONFIG_EFI_DISABLE_PCI_DMA is not set +# end of EFI (Extensible Firmware Interface) Support + +CONFIG_EFI_EARLYCON=y # CONFIG_IMX_DSP is not set # CONFIG_IMX_SCU is not set CONFIG_ARM_PSCI_FW=y @@ -580,6 +602,8 @@ CONFIG_ARM_SMCCC_SOC_ID=y # end of Tegra firmware driver # end of Firmware Drivers +CONFIG_ARCH_SUPPORTS_ACPI=y +# CONFIG_ACPI is not set # CONFIG_VIRTUALIZATION is not set CONFIG_ARM64_CRYPTO=y CONFIG_CRYPTO_SHA256_ARM64=y @@ -682,6 +706,7 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y CONFIG_HAVE_ARCH_COMPILER_H=y CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y +CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_RELR=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y @@ -1549,6 +1574,7 @@ CONFIG_PCI_ECAM=y CONFIG_PCI_IOV=y # CONFIG_PCI_PRI is not set # CONFIG_PCI_PASID is not set +CONFIG_PCI_LABEL=y # CONFIG_HOTPLUG_PCI is not set # @@ -2310,11 +2336,13 @@ CONFIG_REDPINE_COEX_MODE=y # CONFIG_USB_NET_RNDIS_WLAN is not set # CONFIG_VIRT_WIFI is not set # CONFIG_WAN is not set + # # Wireless WAN # # CONFIG_WWAN is not set # end of Wireless WAN + # CONFIG_VMXNET3 is not set # CONFIG_NETDEVSIM is not set # CONFIG_NET_FAILOVER is not set @@ -3879,6 +3907,7 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set +# CONFIG_FB_EFI is not set # CONFIG_FB_OPENCORES is not set # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_NVIDIA is not set @@ -4992,6 +5021,7 @@ CONFIG_RTC_DRV_DS3232_HWMON=y # CONFIG_RTC_DRV_DS1685_FAMILY is not set # CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_DS2404 is not set +# CONFIG_RTC_DRV_EFI is not set # CONFIG_RTC_DRV_STK17TA8 is not set # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_M48T35 is not set @@ -6129,6 +6159,7 @@ CONFIG_HUGETLB_PAGE=y CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y +CONFIG_EFIVAR_FS=m # end of Pseudo filesystems CONFIG_MISC_FILESYSTEMS=y @@ -6306,6 +6337,7 @@ CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y # CONFIG_SECURITY_LOCKDOWN_LSM is not set # CONFIG_SECURITY_LANDLOCK is not set # CONFIG_INTEGRITY is not set +# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set # CONFIG_DEFAULT_SECURITY_APPARMOR is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,bpf" @@ -6666,6 +6698,7 @@ CONFIG_CLZ_TAB=y CONFIG_MPILIB=y CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=y +CONFIG_UCS2_STRING=y CONFIG_HAVE_GENERIC_VDSO=y CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_VDSO_TIME_NS=y