From 6d382e33e15111400ebb582e20d8e1f5adb8068a Mon Sep 17 00:00:00 2001 From: Jonathon Hall Date: Tue, 29 Aug 2023 14:01:27 -0400 Subject: [PATCH] librem_* (except L1UM): Linux 6.1, coreboot gfx init with efifb Update all Librems except L1UM (but including L1UM v2) to Linux 6.1.8. The Purism coreboot fork is updated, the patch to enable Linux efifb boot was cherry-picked onto the 4.20.1-Purism-1 release. Use coreboot native graphics init. Raise maximum framebuffer size for laptops to 3840x2160 (desktops default to this, but laptops default to a lower value). Remove DRM modules from Linux 6.1.8 and add EFIFB. Remove Heads kernel command line options relating to IOMMU and i915, which are no longer needed. Remove OS kernel options relating to IOMMU. For Librem 13/15/14/Mini, this fixes issues booting with 4K displays attached, which were resulting in crashes due to the framebuffer memory not being reserved properly. memtest86+ now passes with a 4K display attached. For Librem L1UM v2, framebuffer boot now works. Librem L1UM remains on Linux 5.10 with Heads kernel graphic init (framebuffer boot still does not work). coreboot 4.11 has native graphics init for Aspeed, but only in text mode. Backporting the linear framebuffer support appears to be possible - the patch applied cleanly - but it did not work initially and will need more investigation. Signed-off-by: Jonathon Hall --- boards/librem_13v2/librem_13v2.config | 8 ++++---- boards/librem_13v4/librem_13v4.config | 8 ++++---- boards/librem_14/librem_14.config | 8 ++++---- boards/librem_15v3/librem_15v3.config | 8 ++++---- boards/librem_15v4/librem_15v4.config | 8 ++++---- boards/librem_l1um_v2/librem_l1um_v2.config | 2 +- boards/librem_mini/librem_mini.config | 8 ++++---- boards/librem_mini_v2/librem_mini_v2.config | 8 ++++---- config/coreboot-librem_13v2.config | 6 ++++-- config/coreboot-librem_13v4.config | 6 ++++-- config/coreboot-librem_14.config | 6 ++++-- config/coreboot-librem_15v3.config | 6 ++++-- config/coreboot-librem_15v4.config | 6 ++++-- config/coreboot-librem_l1um_v2.config | 2 +- config/coreboot-librem_mini.config | 4 ++-- config/coreboot-librem_mini_v2.config | 4 ++-- config/linux-librem_common-6.1.8.config | 11 ++--------- modules/coreboot | 2 +- 18 files changed, 57 insertions(+), 54 deletions(-) diff --git a/boards/librem_13v2/librem_13v2.config b/boards/librem_13v2/librem_13v2.config index cbdf14c3ed..9dd46728db 100644 --- a/boards/librem_13v2/librem_13v2.config +++ b/boards/librem_13v2/librem_13v2.config @@ -1,10 +1,10 @@ # Configuration for a librem_13v2 -CONFIG_LINUX_CONFIG=config/linux-librem_common.config +CONFIG_LINUX_CONFIG=config/linux-librem_common-6.1.8.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_13v2.config export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=purism -export CONFIG_LINUX_VERSION=5.10.5 +export CONFIG_LINUX_VERSION=6.1.8 CONFIG_CRYPTSETUP2=y CONFIG_FLASHROM=y @@ -34,8 +34,8 @@ export CONFIG_OEMRESET_OFFER_DEFAULTS=y export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_ROLLBACK=n -export CONFIG_BOOT_KERNEL_ADD="intel_iommu=igfx_off" -export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off" +export CONFIG_BOOT_KERNEL_ADD="" +export CONFIG_BOOT_KERNEL_REMOVE="" export CONFIG_BOOT_DEV="/dev/nvme0n1p1" export CONFIG_BOARD_NAME="Librem 13 v2/v3" export CONFIG_FLASHROM_OPTIONS="-p internal" diff --git a/boards/librem_13v4/librem_13v4.config b/boards/librem_13v4/librem_13v4.config index d39fc5259f..e17762902b 100644 --- a/boards/librem_13v4/librem_13v4.config +++ b/boards/librem_13v4/librem_13v4.config @@ -1,10 +1,10 @@ # Configuration for a librem_13v4 -CONFIG_LINUX_CONFIG=config/linux-librem_common.config +CONFIG_LINUX_CONFIG=config/linux-librem_common-6.1.8.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_13v4.config export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=purism -export CONFIG_LINUX_VERSION=5.10.5 +export CONFIG_LINUX_VERSION=6.1.8 CONFIG_CRYPTSETUP2=y CONFIG_FLASHROM=y @@ -34,8 +34,8 @@ export CONFIG_OEMRESET_OFFER_DEFAULTS=y export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_ROLLBACK=n -export CONFIG_BOOT_KERNEL_ADD="intel_iommu=igfx_off" -export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off" +export CONFIG_BOOT_KERNEL_ADD="" +export CONFIG_BOOT_KERNEL_REMOVE="" export CONFIG_BOOT_DEV="/dev/nvme0n1p1" export CONFIG_BOARD_NAME="Librem 13 v4" export CONFIG_FLASHROM_OPTIONS="-p internal" diff --git a/boards/librem_14/librem_14.config b/boards/librem_14/librem_14.config index 11a6bcb929..f00c277d88 100644 --- a/boards/librem_14/librem_14.config +++ b/boards/librem_14/librem_14.config @@ -1,10 +1,10 @@ # Configuration for a librem 14 -CONFIG_LINUX_CONFIG=config/linux-librem_common.config +CONFIG_LINUX_CONFIG=config/linux-librem_common-6.1.8.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_14.config export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=purism -export CONFIG_LINUX_VERSION=5.10.5 +export CONFIG_LINUX_VERSION=6.1.8 CONFIG_CRYPTSETUP2=y CONFIG_FLASHROM=y @@ -33,8 +33,8 @@ export CONFIG_OEMRESET_OFFER_DEFAULTS=y export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_ROLLBACK=n -export CONFIG_BOOT_KERNEL_ADD="intel_iommu=igfx_off" -export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off" +export CONFIG_BOOT_KERNEL_ADD="" +export CONFIG_BOOT_KERNEL_REMOVE="" export CONFIG_BOOT_DEV="/dev/nvme0n1p1" export CONFIG_BOARD_NAME="Librem 14" export CONFIG_FLASHROM_OPTIONS="-p internal" diff --git a/boards/librem_15v3/librem_15v3.config b/boards/librem_15v3/librem_15v3.config index 8898448fb1..5f6db0a6a4 100644 --- a/boards/librem_15v3/librem_15v3.config +++ b/boards/librem_15v3/librem_15v3.config @@ -1,10 +1,10 @@ # Configuration for a librem_15v3 -CONFIG_LINUX_CONFIG=config/linux-librem_common.config +CONFIG_LINUX_CONFIG=config/linux-librem_common-6.1.8.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_15v3.config export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=purism -export CONFIG_LINUX_VERSION=5.10.5 +export CONFIG_LINUX_VERSION=6.1.8 CONFIG_CRYPTSETUP2=y CONFIG_FLASHROM=y @@ -34,8 +34,8 @@ export CONFIG_OEMRESET_OFFER_DEFAULTS=y export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_ROLLBACK=n -export CONFIG_BOOT_KERNEL_ADD="intel_iommu=igfx_off" -export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off" +export CONFIG_BOOT_KERNEL_ADD="" +export CONFIG_BOOT_KERNEL_REMOVE="" export CONFIG_BOOT_DEV="/dev/nvme0n1p1" export CONFIG_BOARD_NAME="Librem 15 v3" export CONFIG_FLASHROM_OPTIONS="-p internal" diff --git a/boards/librem_15v4/librem_15v4.config b/boards/librem_15v4/librem_15v4.config index aa54b1ca7e..a70ce84571 100644 --- a/boards/librem_15v4/librem_15v4.config +++ b/boards/librem_15v4/librem_15v4.config @@ -1,10 +1,10 @@ # Configuration for a librem_15v4 -CONFIG_LINUX_CONFIG=config/linux-librem_common.config +CONFIG_LINUX_CONFIG=config/linux-librem_common-6.1.8.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_15v4.config export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=purism -export CONFIG_LINUX_VERSION=5.10.5 +export CONFIG_LINUX_VERSION=6.1.8 CONFIG_CRYPTSETUP2=y CONFIG_FLASHROM=y @@ -35,8 +35,8 @@ export CONFIG_OEMRESET_OFFER_DEFAULTS=y export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_ROLLBACK=n -export CONFIG_BOOT_KERNEL_ADD="intel_iommu=igfx_off" -export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off" +export CONFIG_BOOT_KERNEL_ADD="" +export CONFIG_BOOT_KERNEL_REMOVE="" export CONFIG_BOOT_DEV="/dev/nvme0n1p1" export CONFIG_BOARD_NAME="Librem 15 v4" export CONFIG_FLASHROM_OPTIONS="-p internal" diff --git a/boards/librem_l1um_v2/librem_l1um_v2.config b/boards/librem_l1um_v2/librem_l1um_v2.config index 098343092f..dcb302e262 100644 --- a/boards/librem_l1um_v2/librem_l1um_v2.config +++ b/boards/librem_l1um_v2/librem_l1um_v2.config @@ -37,7 +37,7 @@ export CONFIG_OEMRESET_OFFER_DEFAULTS=y export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_ROLLBACK=n -export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on" +export CONFIG_BOOT_KERNEL_ADD="" export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles" export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0" export CONFIG_BOOT_DEV="/dev/nvme0n1p1" diff --git a/boards/librem_mini/librem_mini.config b/boards/librem_mini/librem_mini.config index 47e84d15de..b8b130a3be 100644 --- a/boards/librem_mini/librem_mini.config +++ b/boards/librem_mini/librem_mini.config @@ -1,10 +1,10 @@ # Configuration for a librem mini -CONFIG_LINUX_CONFIG=config/linux-librem_common.config +CONFIG_LINUX_CONFIG=config/linux-librem_common-6.1.8.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini.config export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=purism -export CONFIG_LINUX_VERSION=5.10.5 +export CONFIG_LINUX_VERSION=6.1.8 CONFIG_CRYPTSETUP2=y CONFIG_FLASHROM=y @@ -35,8 +35,8 @@ export CONFIG_OEMRESET_OFFER_DEFAULTS=y export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_ROLLBACK=n -export CONFIG_BOOT_KERNEL_ADD="intel_iommu=igfx_off" -export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off" +export CONFIG_BOOT_KERNEL_ADD="" +export CONFIG_BOOT_KERNEL_REMOVE="" export CONFIG_BOOT_DEV="/dev/nvme0n1p1" export CONFIG_BOARD_NAME="Librem Mini" export CONFIG_FLASHROM_OPTIONS="-p internal" diff --git a/boards/librem_mini_v2/librem_mini_v2.config b/boards/librem_mini_v2/librem_mini_v2.config index 302249213b..ab007a0c41 100644 --- a/boards/librem_mini_v2/librem_mini_v2.config +++ b/boards/librem_mini_v2/librem_mini_v2.config @@ -1,10 +1,10 @@ # Configuration for a librem mini v2 -CONFIG_LINUX_CONFIG=config/linux-librem_common.config +CONFIG_LINUX_CONFIG=config/linux-librem_common-6.1.8.config CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini_v2.config export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=purism -export CONFIG_LINUX_VERSION=5.10.5 +export CONFIG_LINUX_VERSION=6.1.8 CONFIG_CRYPTSETUP2=y CONFIG_FLASHROM=y @@ -35,8 +35,8 @@ export CONFIG_OEMRESET_OFFER_DEFAULTS=y export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_ROLLBACK=n -export CONFIG_BOOT_KERNEL_ADD="intel_iommu=igfx_off" -export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off" +export CONFIG_BOOT_KERNEL_ADD="" +export CONFIG_BOOT_KERNEL_REMOVE="" export CONFIG_BOOT_DEV="/dev/nvme0n1p1" export CONFIG_BOARD_NAME="Librem Mini v2" export CONFIG_FLASHROM_OPTIONS="-p internal" diff --git a/config/coreboot-librem_13v2.config b/config/coreboot-librem_13v2.config index 512cd70496..9511a7ce62 100644 --- a/config/coreboot-librem_13v2.config +++ b/config/coreboot-librem_13v2.config @@ -1,4 +1,6 @@ CONFIG_VENDOR_PURISM=y +CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=2160 +CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=3840 CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_skl/descriptor.bin" CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_skl/me.bin" CONFIG_HAVE_IFD_BIN=y @@ -6,9 +8,9 @@ CONFIG_BOARD_PURISM_LIBREM13_V2=y CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_skl/cpu_microcode_blob.bin" CONFIG_HAVE_ME_BIN=y -CONFIG_NO_GFX_INIT=y +CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y CONFIG_TPM_MEASURED_BOOT=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" -CONFIG_LINUX_COMMAND_LINE="iommu=pt quiet loglevel=2 drm_kms_helper.drm_leak_fbdev_smem=1 i915.enable_fbc=0" +CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2" CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz" diff --git a/config/coreboot-librem_13v4.config b/config/coreboot-librem_13v4.config index ef583ca995..762a8b3d24 100644 --- a/config/coreboot-librem_13v4.config +++ b/config/coreboot-librem_13v4.config @@ -1,4 +1,6 @@ CONFIG_VENDOR_PURISM=y +CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=2160 +CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=3840 CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_kbl/descriptor.bin" CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_kbl/me.bin" CONFIG_HAVE_IFD_BIN=y @@ -6,9 +8,9 @@ CONFIG_BOARD_PURISM_LIBREM13_V4=y CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_kbl/cpu_microcode_blob.bin" CONFIG_HAVE_ME_BIN=y -CONFIG_NO_GFX_INIT=y +CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y CONFIG_TPM_MEASURED_BOOT=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" -CONFIG_LINUX_COMMAND_LINE="iommu=pt quiet loglevel=2 drm_kms_helper.drm_leak_fbdev_smem=1 i915.enable_fbc=0" +CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2" CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz" diff --git a/config/coreboot-librem_14.config b/config/coreboot-librem_14.config index 5bfa98de25..692da44a03 100644 --- a/config/coreboot-librem_14.config +++ b/config/coreboot-librem_14.config @@ -1,4 +1,6 @@ CONFIG_VENDOR_PURISM=y +CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=2160 +CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=3840 CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_cnl/librem_14/flashdescriptor.bin" CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_cnl/librem_14/me.bin" CONFIG_HAVE_IFD_BIN=y @@ -6,10 +8,10 @@ CONFIG_BOARD_PURISM_LIBREM_14=y CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_cnl/cpu_microcode_blob.bin" CONFIG_HAVE_ME_BIN=y -CONFIG_NO_GFX_INIT=y +CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y CONFIG_TPM_MEASURED_BOOT=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz" -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2 drm_kms_helper.drm_leak_fbdev_smem=1 i915.enable_fbc=0" +CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2" CONFIG_CBFS_SIZE=0xC00000 diff --git a/config/coreboot-librem_15v3.config b/config/coreboot-librem_15v3.config index f9e088f6e6..0148f98766 100644 --- a/config/coreboot-librem_15v3.config +++ b/config/coreboot-librem_15v3.config @@ -1,4 +1,6 @@ CONFIG_VENDOR_PURISM=y +CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=2160 +CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=3840 CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_skl/descriptor.bin" CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_skl/me.bin" CONFIG_HAVE_IFD_BIN=y @@ -6,9 +8,9 @@ CONFIG_BOARD_PURISM_LIBREM15_V3=y CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_skl/cpu_microcode_blob.bin" CONFIG_HAVE_ME_BIN=y -CONFIG_NO_GFX_INIT=y +CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y CONFIG_TPM_MEASURED_BOOT=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" -CONFIG_LINUX_COMMAND_LINE="iommu=pt quiet loglevel=2 drm_kms_helper.drm_leak_fbdev_smem=1 i915.enable_fbc=0" +CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2" CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz" diff --git a/config/coreboot-librem_15v4.config b/config/coreboot-librem_15v4.config index 4dc5715f2b..dd474e62b1 100644 --- a/config/coreboot-librem_15v4.config +++ b/config/coreboot-librem_15v4.config @@ -1,4 +1,6 @@ CONFIG_VENDOR_PURISM=y +CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=2160 +CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=3840 CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_kbl/descriptor.bin" CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_kbl/me.bin" CONFIG_HAVE_IFD_BIN=y @@ -6,9 +8,9 @@ CONFIG_BOARD_PURISM_LIBREM15_V4=y CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_kbl/cpu_microcode_blob.bin" CONFIG_HAVE_ME_BIN=y -CONFIG_NO_GFX_INIT=y +CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y CONFIG_TPM_MEASURED_BOOT=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" -CONFIG_LINUX_COMMAND_LINE="iommu=pt quiet loglevel=2 drm_kms_helper.drm_leak_fbdev_smem=1 i915.enable_fbc=0" +CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2" CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz" diff --git a/config/coreboot-librem_l1um_v2.config b/config/coreboot-librem_l1um_v2.config index f5d208f488..4a578eb378 100644 --- a/config/coreboot-librem_l1um_v2.config +++ b/config/coreboot-librem_l1um_v2.config @@ -10,7 +10,7 @@ CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2" CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_l1um_v2/cpu_microcode_blob.bin" CONFIG_HAVE_ME_BIN=y -CONFIG_NO_GFX_INIT=y +CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz" diff --git a/config/coreboot-librem_mini.config b/config/coreboot-librem_mini.config index 71b2b7dcac..a26d1af2da 100644 --- a/config/coreboot-librem_mini.config +++ b/config/coreboot-librem_mini.config @@ -8,8 +8,8 @@ CONFIG_BOARD_PURISM_LIBREM_MINI=y CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_cnl/cpu_microcode_blob.bin" CONFIG_HAVE_ME_BIN=y -CONFIG_NO_GFX_INIT=y +CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz" -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2 drm_kms_helper.drm_leak_fbdev_smem=1 i915.enable_fbc=0" +CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2" diff --git a/config/coreboot-librem_mini_v2.config b/config/coreboot-librem_mini_v2.config index fa6689b929..869ab13b6a 100644 --- a/config/coreboot-librem_mini_v2.config +++ b/config/coreboot-librem_mini_v2.config @@ -7,9 +7,9 @@ CONFIG_BOARD_PURISM_LIBREM_MINI_V2=y CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_cnl/cpu_microcode_blob.bin" CONFIG_HAVE_ME_BIN=y -CONFIG_NO_GFX_INIT=y +CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage" CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz" -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2 drm_kms_helper.drm_leak_fbdev_smem=1 i915.enable_fbc=0" +CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2" CONFIG_CBFS_SIZE=0xC00000 diff --git a/config/linux-librem_common-6.1.8.config b/config/linux-librem_common-6.1.8.config index 20564d0b14..59ffef787b 100644 --- a/config/linux-librem_common-6.1.8.config +++ b/config/linux-librem_common-6.1.8.config @@ -34,6 +34,7 @@ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y CONFIG_X86_PMEM_LEGACY=y # CONFIG_MTRR is not set # CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set +CONFIG_EFI=y CONFIG_KEXEC=y CONFIG_KEXEC_FILE=y # CONFIG_RELOCATABLE is not set @@ -158,20 +159,12 @@ CONFIG_TCG_TPM=y CONFIG_TCG_TIS=y # CONFIG_RANDOM_TRUST_CPU is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_I2C_COMPAT is not set -CONFIG_I2C_MUX=m -CONFIG_I2C_MUX_PCA9541=m -CONFIG_I2C_MUX_REG=m -# CONFIG_I2C_HELPER_AUTO is not set -CONFIG_I2C_SLAVE=y # CONFIG_HWMON is not set # CONFIG_X86_PKG_TEMP_THERMAL is not set CONFIG_MFD_SYSCON=y -CONFIG_DRM=y -CONFIG_DRM_I915=y -CONFIG_DRM_AST=y CONFIG_FB=y CONFIG_FB_VESA=y +CONFIG_FB_EFI=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y CONFIG_USB_HID=m diff --git a/modules/coreboot b/modules/coreboot index aa1e83a2ee..23fe7406b0 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -82,7 +82,7 @@ $(eval $(call coreboot_module,talos_2,)) # Similarly, purism is based on 4.20.1, but nothing builds against 4.20.1 itself # or any other fork - no benefit to sharing the toolchain yet. coreboot-purism_repo := https://source.puri.sm/firmware/coreboot.git -coreboot-purism_commit_hash := a899f08d2789db1dd9b02cff34179c4d38e6d0e3 +coreboot-purism_commit_hash := 1e8c7baf317c8b1d5b5e330c64878367fb792e2f $(eval $(call coreboot_module,purism,)) # Check that the board configured the coreboot version correctly