APPLIED[P]: [SRU][O:raspi][PATCH 1/1] UBUNTU: [Config] raspi: Set EFI=y
Manuel Diewald
manuel.diewald at canonical.com
Fri Feb 28 15:10:28 UTC 2025
On Mon, Feb 24, 2025 at 03:11:37PM +0100, Juerg Haefliger wrote:
> BugLink: https://bugs.launchpad.net/bugs/2053147
>
> Even though we're not officially supporting it, there are use cases
> for booting an Ubuntu raspi kernel via EFI (UEFI or u-boot+grub) which
> we broke when we turned off CONFIG_EFI. Play nice and turn it back on.
>
> Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
> ---
> debian.raspi/config/annotations | 45 ++++++++-------------------------
> 1 file changed, 10 insertions(+), 35 deletions(-)
>
> diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations
> index 83123bfa3086..f3530592e099 100644
> --- a/debian.raspi/config/annotations
> +++ b/debian.raspi/config/annotations
> @@ -6,6 +6,7 @@
>
> include "../../debian.master/config/annotations"
>
> +CONFIG_ACPI policy<{'arm64': 'n'}> note<'Different from master (LP: #2053147)'>
> CONFIG_ACPI_CUSTOM_METHOD policy<{'arm64': '-'}> note<'Master note override'>
> CONFIG_AD525X_DPOT_I2C policy<{'arm64': 'n'}> note<'Different from master'>
> CONFIG_ADF4371 policy<{'arm64': 'n'}> note<'Different from master'>
> @@ -225,9 +226,9 @@ CONFIG_DW_AXI_DMAC policy<{'arm64': 'y'}> note<'Nee
> CONFIG_DW_I3C_MASTER policy<{'arm64': 'n'}> note<'Different from master'>
> CONFIG_ECRYPT_FS policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
> CONFIG_EDAC_XGENE policy<{'arm64': 'n'}> note<'Different from master'>
> -CONFIG_EFI policy<{'arm64': 'n'}> note<'Not supported on Pi (different from master)'>
> -CONFIG_EFIVAR_FS policy<{'arm64': '-'}> note<'Master note override'>
> -CONFIG_EFI_ZBOOT policy<{'arm64': '-'}> note<'Master note override'>
> +CONFIG_EFIVAR_FS policy<{'arm64': 'm'}> note<'Different from master (LP: #2053147)'>
> +CONFIG_EFI_COCO_SECRET policy<{'arm64': 'n'}> note<'Different from master (LP: #2053147)'>
> +CONFIG_EFI_ZBOOT policy<{'arm64': 'n'}> note<'Different from master (LP: #2053147)'>
> CONFIG_ENA_ETHERNET policy<{'arm64': 'n'}> note<'Different from master'>
> CONFIG_ENERGY_MODEL policy<{'arm64': 'n'}> note<'Different from master'>
> CONFIG_EROFS_FS_SECURITY policy<{'arm64': 'n'}> note<'Required for Pi (different from master)'>
> @@ -240,7 +241,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET policy<{'arm64': '"ascii"'}> not
> CONFIG_FB_ASILIANT policy<{'arm64': 'n'}> note<'Different from master'>
> CONFIG_FB_ATY policy<{'arm64': 'n'}> note<'Different from master'>
> CONFIG_FB_BCM2708 policy<{'arm64': 'm'}> note<'Added by rpi-6.6.y patchset'>
> -CONFIG_FB_EFI policy<{'arm64': '-'}> note<'Not supported on Pi (different from master)'>
> +CONFIG_FB_EFI policy<{'arm64': 'n'}> note<'Different from master (LP: #2053147)'>
> CONFIG_FB_IMSTT policy<{'arm64': 'n'}> note<'Different from master'>
> CONFIG_FB_RPISENSE policy<{'arm64': 'm'}> note<'Added by rpi-6.6.y patchset'>
> CONFIG_FB_SIMPLE policy<{'arm64': 'y'}> note<'LP: #1976147 (different from master)'>
> @@ -320,6 +321,7 @@ CONFIG_IMA_APPRAISE_MODSIG policy<{'arm64': 'n'}> note<'Dif
> CONFIG_IMA_ARCH_POLICY policy<{'arm64': 'n'}> note<'LP: #1982090 (different from master)'>
> CONFIG_IMA_DEFAULT_HASH_SHA1 policy<{'arm64': 'y'}> note<'Different from master'>
> CONFIG_IMA_DEFAULT_HASH_SHA256 policy<{'arm64': 'n'}> note<'Different from master'>
> +CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT policy<{'arm64': 'n'}> note<'Different from master (LP: #2053147)'>
> CONFIG_INDIRECT_PIO policy<{'arm64': 'n'}> note<'Different from master'>
> CONFIG_INFINIBAND_EFA policy<{'arm64': 'n'}> note<'Different from master'>
> CONFIG_INFINIBAND_HNS policy<{'arm64': 'n'}> note<'Different from master'>
> @@ -373,6 +375,7 @@ CONFIG_LEGACY_PTY_COUNT policy<{'arm64': '256'}> note<'D
> CONFIG_LEGACY_TIOCSTI policy<{'arm64': 'y'}> note<'Different from master'>
> CONFIG_LIBNVDIMM policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
> CONFIG_LIQUIDIO_VF policy<{'arm64': 'n'}> note<'Different from master'>
> +CONFIG_LOCK_DOWN_IN_SECURE_BOOT policy<{'arm64': 'n'}> note<'Different from master (LP: #2053147)'>
> CONFIG_LOGO policy<{'arm64': 'y'}> note<'Required for Pi (different from master)'>
> CONFIG_LOGO_LINUX_CLUT224 policy<{'arm64': 'y'}> note<'Required for Pi (not in master)'>
> CONFIG_LOGO_LINUX_MONO policy<{'arm64': 'n'}> note<'Required for Pi (not in master)'>
> @@ -578,6 +581,7 @@ CONFIG_REGULATOR_SY8106A policy<{'arm64': 'n'}> note<'Dif
> CONFIG_REGULATOR_SY8824X policy<{'arm64': 'n'}> note<'Different from master'>
> CONFIG_REGULATOR_TWL4030 policy<{'arm64': '-'}> note<'Master note override'>
> CONFIG_REMOTEPROC policy<{'arm64': 'n'}> note<'Not supported on Pi (different from master)'>
> +CONFIG_RESET_ATTACK_MITIGATION policy<{'arm64': 'n'}> note<'Different from master (LP: #2053147)'>
> CONFIG_RESET_BRCMSTB policy<{'arm64': 'm'}> note<'Required for Pi (not in master)'>
> CONFIG_RESET_BRCMSTB_RESCAL policy<{'arm64': 'm'}> note<'Required for Pi (not in master)'>
> CONFIG_RESET_RASPBERRYPI policy<{'arm64': 'y'}> note<'Required for Pi (not in master)'>
> @@ -587,7 +591,7 @@ CONFIG_RPI_AXIPERF policy<{'arm64': 'm'}> note<'Add
> CONFIG_RPI_POE_POWER policy<{'arm64': 'm'}> note<'Added by rpi-6.6.y patchset'>
> CONFIG_RTC_DRV_BD70528 policy<{'arm64': 'n'}> note<'Different from master'>
> CONFIG_RTC_DRV_BRCMSTB policy<{'arm64': 'm'}> note<'Required for Pi (not in master)'>
> -CONFIG_RTC_DRV_EFI policy<{'arm64': '-'}> note<'Master note override'>
> +CONFIG_RTC_DRV_EFI policy<{'arm64': 'm'}> note<'Different from master (LP: #2053147)'>
> CONFIG_RTC_DRV_ISL12026 policy<{'arm64': 'n'}> note<'Different from master'>
> CONFIG_RTC_DRV_RPI policy<{'arm64': 'm'}> note<'Added by rpi-6.6.y patchset'>
> CONFIG_RTC_DRV_TWL4030 policy<{'arm64': '-'}> note<'Master note override'>
> @@ -705,7 +709,7 @@ CONFIG_SURFACE_PLATFORMS policy<{'arm64': 'n'}> note<'Req
> CONFIG_SUSPEND policy<{'arm64': 'n'}> note<'Required for Pi (different from master)'>
> CONFIG_SWIOTLB_DYNAMIC policy<{'arm64': 'n'}> note<'Disabled for Pi (prevent vc4 compile error)'>
> CONFIG_SW_SYNC policy<{'arm64': 'n'}> note<'Not desired on Pi (different from master)'>
> -CONFIG_SYSFB_SIMPLEFB policy<{'arm64': '-'}> note<'Not supported on Pi (different from master)'>
> +CONFIG_SYSFB_SIMPLEFB policy<{'arm64': 'n'}> note<'Different from master (LP: #2053147)'>
> CONFIG_SYSV68_PARTITION policy<{'arm64': 'n'}> note<'Not desired on Pi (different from master)'>
> CONFIG_TCG_TIS policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
> CONFIG_TCG_TIS_CORE policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
> @@ -868,7 +872,6 @@ CONFIG_8139TOO_PIO policy<{'arm64': '-'}>
> CONFIG_8139TOO_TUNE_TWISTER policy<{'arm64': '-'}>
> CONFIG_8139_OLD_RX_RESET policy<{'arm64': '-'}>
> CONFIG_A64FX_DIAG policy<{'arm64': '-'}>
> -CONFIG_ACPI policy<{'arm64': '-'}>
> CONFIG_ACPI_AC policy<{'arm64': '-'}>
> CONFIG_ACPI_AGDI policy<{'arm64': '-'}>
> CONFIG_ACPI_ALS policy<{'arm64': '-'}>
> @@ -979,7 +982,6 @@ CONFIG_ARCH_RCAR_GEN3 policy<{'arm64': '-'}>
> CONFIG_ARCH_RCAR_GEN4 policy<{'arm64': '-'}>
> CONFIG_ARCH_RZG2L policy<{'arm64': '-'}>
> CONFIG_ARCH_S32 policy<{'arm64': '-'}>
> -CONFIG_ARCH_SUPPORTS_ACPI policy<{'arm64': '-'}>
> CONFIG_ARCH_SUPPORTS_KEXEC policy<{'arm64': '-'}>
> CONFIG_ARCH_TEGRA_132_SOC policy<{'arm64': '-'}>
> CONFIG_ARCH_TEGRA_186_SOC policy<{'arm64': '-'}>
> @@ -987,7 +989,6 @@ CONFIG_ARCH_TEGRA_194_SOC policy<{'arm64': '-'}>
> CONFIG_ARCH_TEGRA_210_SOC policy<{'arm64': '-'}>
> CONFIG_ARCH_TEGRA_234_SOC policy<{'arm64': '-'}>
> CONFIG_ARCH_TEGRA_241_SOC policy<{'arm64': '-'}>
> -CONFIG_ARCH_USE_MEMREMAP_PROT policy<{'arm64': '-'}>
> CONFIG_ARC_EMAC_CORE policy<{'arm64': '-'}>
> CONFIG_ARM64_ACPI_PARKING_PROTOCOL policy<{'arm64': '-'}>
> CONFIG_ARMADA_37XX_CLK policy<{'arm64': '-'}>
> @@ -1525,7 +1526,6 @@ CONFIG_DA_MON_EVENTS policy<{'arm64': '-'}>
> CONFIG_DA_MON_EVENTS_ID policy<{'arm64': '-'}>
> CONFIG_DE2104X policy<{'arm64': '-'}>
> CONFIG_DE2104X_DSL policy<{'arm64': '-'}>
> -CONFIG_DEBUG_EFI policy<{'arm64': '-'}>
> CONFIG_DEBUG_KERNEL_DC policy<{'arm64': '-'}>
> CONFIG_DEFXX policy<{'arm64': '-'}>
> CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI policy<{'arm64': '-'}>
> @@ -1542,9 +1542,6 @@ CONFIG_DMA_ACPI policy<{'arm64': '-'}>
> CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC policy<{'arm64': '-'}>
> CONFIG_DMA_NUMA_CMA policy<{'arm64': '-'}>
> CONFIG_DMA_SUN6I policy<{'arm64': '-'}>
> -CONFIG_DMI policy<{'arm64': '-'}>
> -CONFIG_DMIID policy<{'arm64': '-'}>
> -CONFIG_DMI_SYSFS policy<{'arm64': '-'}>
> CONFIG_DM_INIT policy<{'arm64': '-'}>
> CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_PLATFORM_KEYRING policy<{'arm64': '-'}>
> CONFIG_DPAA2_CONSOLE policy<{'arm64': '-'}>
> @@ -1700,23 +1697,8 @@ CONFIG_EDAC_QCOM policy<{'arm64': '-'}>
> CONFIG_EDAC_SYNOPSYS policy<{'arm64': '-'}>
> CONFIG_EDAC_VERSAL policy<{'arm64': '-'}>
> CONFIG_EDAC_ZYNQMP policy<{'arm64': '-'}>
> -CONFIG_EFI_ARMSTUB_DTB_LOADER policy<{'arm64': '-'}>
> -CONFIG_EFI_BOOTLOADER_CONTROL policy<{'arm64': '-'}>
> -CONFIG_EFI_CAPSULE_LOADER policy<{'arm64': '-'}>
> -CONFIG_EFI_COCO_SECRET policy<{'arm64': '-'}>
> CONFIG_EFI_CUSTOM_SSDT_OVERLAYS policy<{'arm64': '-'}>
> -CONFIG_EFI_DISABLE_PCI_DMA policy<{'arm64': '-'}>
> -CONFIG_EFI_DISABLE_RUNTIME policy<{'arm64': '-'}>
> -CONFIG_EFI_EARLYCON policy<{'arm64': '-'}>
> -CONFIG_EFI_ESRT policy<{'arm64': '-'}>
> -CONFIG_EFI_GENERIC_STUB policy<{'arm64': '-'}>
> -CONFIG_EFI_PARAMS_FROM_FDT policy<{'arm64': '-'}>
> -CONFIG_EFI_RUNTIME_WRAPPERS policy<{'arm64': '-'}>
> CONFIG_EFI_SOFT_RESERVE policy<{'arm64': '-'}>
> -CONFIG_EFI_STUB policy<{'arm64': '-'}>
> -CONFIG_EFI_TEST policy<{'arm64': '-'}>
> -CONFIG_EFI_VARS_PSTORE policy<{'arm64': '-'}>
> -CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE policy<{'arm64': '-'}>
> CONFIG_EINT_MTK policy<{'arm64': '-'}>
> CONFIG_EMAC_ROCKCHIP policy<{'arm64': '-'}>
> CONFIG_ENIC policy<{'arm64': '-'}>
> @@ -1917,7 +1899,6 @@ CONFIG_I2C_CROS_EC_TUNNEL policy<{'arm64': '-'}>
> CONFIG_I2C_DESIGNWARE_CORE policy<{'arm64': 'm'}>
> CONFIG_I2C_HID_ACPI policy<{'arm64': '-'}>
> CONFIG_I2C_HIX5HD2 policy<{'arm64': '-'}>
> -CONFIG_I2C_I801_MUX policy<{'arm64': '-'}>
> CONFIG_I2C_IMX policy<{'arm64': '-'}>
> CONFIG_I2C_IMX_LPI2C policy<{'arm64': '-'}>
> CONFIG_I2C_LJCA policy<{'arm64': '-'}>
> @@ -1965,7 +1946,6 @@ CONFIG_IIO_SCMI policy<{'arm64': '-'}>
> CONFIG_IIO_STM32_LPTIMER_TRIGGER policy<{'arm64': '-'}>
> CONFIG_IIO_STM32_TIMER_TRIGGER policy<{'arm64': '-'}>
> CONFIG_IMA_DEFAULT_HASH policy<{'arm64': '"sha1"'}>
> -CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT policy<{'arm64': '-'}>
> CONFIG_IMX2_WDT policy<{'arm64': '-'}>
> CONFIG_IMX7D_ADC policy<{'arm64': '-'}>
> CONFIG_IMX7ULP_WDT policy<{'arm64': '-'}>
> @@ -2110,7 +2090,6 @@ CONFIG_KERNEL_LZMA policy<{'arm64': '-'}>
> CONFIG_KERNEL_LZO policy<{'arm64': '-'}>
> CONFIG_KERNEL_XZ policy<{'arm64': '-'}>
> CONFIG_KEXEC policy<{'arm64': '-'}>
> -CONFIG_KEXEC_IMAGE_VERIFY_SIG policy<{'arm64': '-'}>
> CONFIG_KEYBOARD_ADP5520 policy<{'arm64': '-'}>
> CONFIG_KEYBOARD_CROS_EC policy<{'arm64': '-'}>
> CONFIG_KEYBOARD_IMX policy<{'arm64': '-'}>
> @@ -2145,7 +2124,6 @@ CONFIG_LEDS_SUN50I_A100 policy<{'arm64': '-'}>
> CONFIG_LEDS_WM831X_STATUS policy<{'arm64': '-'}>
> CONFIG_LEDS_WM8350 policy<{'arm64': '-'}>
> CONFIG_LOAD_UEFI_KEYS policy<{'arm64': '-'}>
> -CONFIG_LOCK_DOWN_IN_SECURE_BOOT policy<{'arm64': '-'}>
> CONFIG_LP8788_ADC policy<{'arm64': '-'}>
> CONFIG_LS_EXTIRQ policy<{'arm64': '-'}>
> CONFIG_LS_SCFG_MSI policy<{'arm64': '-'}>
> @@ -2458,7 +2436,6 @@ CONFIG_PCI_J721E_HOST policy<{'arm64': '-'}>
> CONFIG_PCI_KEYSTONE policy<{'arm64': '-'}>
> CONFIG_PCI_KEYSTONE_EP policy<{'arm64': '-'}>
> CONFIG_PCI_KEYSTONE_HOST policy<{'arm64': '-'}>
> -CONFIG_PCI_LABEL policy<{'arm64': '-'}>
> CONFIG_PCI_LAYERSCAPE policy<{'arm64': '-'}>
> CONFIG_PCI_LAYERSCAPE_EP policy<{'arm64': '-'}>
> CONFIG_PCI_P2PDMA policy<{'arm64': '-'}>
> @@ -2995,7 +2972,6 @@ CONFIG_RENESAS_RZN1WDT policy<{'arm64': '-'}>
> CONFIG_RENESAS_USB_DMAC policy<{'arm64': '-'}>
> CONFIG_RENESAS_WDT policy<{'arm64': '-'}>
> CONFIG_RESET_A10SR policy<{'arm64': '-'}>
> -CONFIG_RESET_ATTACK_MITIGATION policy<{'arm64': '-'}>
> CONFIG_RESET_BERLIN policy<{'arm64': '-'}>
> CONFIG_RESET_HISI policy<{'arm64': '-'}>
> CONFIG_RESET_IMX7 policy<{'arm64': '-'}>
> @@ -3837,7 +3813,6 @@ CONFIG_TYPEC_QCOM_PMIC policy<{'arm64': '-'}>
> CONFIG_UCC policy<{'arm64': '-'}>
> CONFIG_UCC_FAST policy<{'arm64': '-'}>
> CONFIG_UCC_SLOW policy<{'arm64': '-'}>
> -CONFIG_UCS2_STRING policy<{'arm64': '-'}>
> CONFIG_UCSI_ACPI policy<{'arm64': '-'}>
> CONFIG_UCSI_LENOVO_YOGA_C630 policy<{'arm64': '-'}>
> CONFIG_UEFI_CPER policy<{'arm64': '-'}>
> --
> 2.43.0
>
>
> --
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
plucky:linux-raspi had this turned off as well since it was based on an
earlier version of oracular:linux-raspi where this patch had not been
applied. We should turn this on for plucky, too. Target plucky in the
bug and apply the oracular patch to plucky.
Applied the oracular version of this patch to
plucky:linux-raspi/master-next. Thanks!
--
Manuel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20250228/0ad48816/attachment-0001.sig>
More information about the kernel-team
mailing list