From 0f0cb99a02b6eb7e8f8a7a8cf4031bb23be9aff6 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Thu, 9 Nov 2023 09:45:06 -0500 Subject: [PATCH] Adapt NV41/NS50 changes, unify bootsplash file usage for branding Taken from : https://github.com/Nitrokey/heads/tree/temp-release-v2.3 - Move branding/Heads/bootsplash-1024x768.jpg -> branding/Heads/bootsplash.jpg (We don't care about the size. Make filename generic) - Adapt all coreboot configs so bootsplash is adapted by BRAND_NAME CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" - Reminders : - Makefile changes Heads to defined BRAND_NAME in board config - Makefile changes -e 's!@BRAND_DIR@!$(pwd)/branding/$(BRAND_NAME)!g' - nv41/nv50 - coreboot oldefconfigs adapted by: - make BOARD=nitropad-ns50 coreboot.modify_and_save_oldconfig_in_place - make BOARD=nitropad-nv41 coreboot.modify_and_save_oldconfig_in_place - linux oldefconfigs adapted by - make BOARD=nitropad-nv41 linux.modify_and_save_oldconfig_in_place - since this is shared config across nv41/ns50: it only needs to be done for a single board Signed-off-by: Thierry Laurion --- ...bootsplash-1024x768.jpg => bootsplash.jpg} | 0 config/coreboot-nitropad-ns50.config | 7 +++-- config/coreboot-nitropad-nv41.config | 11 +++---- config/coreboot-p8z77-m_pro-tpm1.config | 2 +- config/coreboot-qemu-tpm1.config | 2 +- config/coreboot-qemu-tpm2.config | 2 +- config/coreboot-t420-maximized.config | 2 +- config/coreboot-t420.config | 2 +- config/coreboot-t430-legacy.config | 2 +- config/coreboot-t430-maximized.config | 2 +- config/coreboot-t440p.config | 2 +- config/coreboot-t520-maximized.config | 2 +- config/coreboot-t530-dgpu-maximized.config | 2 +- config/coreboot-t530-maximized.config | 2 +- ...coreboot-w530-dgpu-K1000m-maximized.config | 2 +- ...coreboot-w530-dgpu-K2000m-maximized.config | 2 +- config/coreboot-w530-maximized.config | 2 +- config/coreboot-w541.config | 2 +- config/coreboot-x220-maximized.config | 2 +- config/coreboot-x220.config | 2 +- config/coreboot-x230-legacy.config | 2 +- config/coreboot-x230-maximized-fhd_edp.config | 2 +- config/coreboot-x230-maximized.config | 2 +- config/coreboot-z220-cmt.config | 2 +- config/linux-nitropad-x.config | 30 +++++++++++++++++-- modules/nitrokey-blobs | 4 +-- 26 files changed, 61 insertions(+), 33 deletions(-) rename branding/Heads/{bootsplash-1024x768.jpg => bootsplash.jpg} (100%) diff --git a/branding/Heads/bootsplash-1024x768.jpg b/branding/Heads/bootsplash.jpg similarity index 100% rename from branding/Heads/bootsplash-1024x768.jpg rename to branding/Heads/bootsplash.jpg diff --git a/config/coreboot-nitropad-ns50.config b/config/coreboot-nitropad-ns50.config index d370488f..22cac3b0 100644 --- a/config/coreboot-nitropad-ns50.config +++ b/config/coreboot-nitropad-ns50.config @@ -33,7 +33,8 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y # CONFIG_NO_STAGE_CACHE is not set CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set -# CONFIG_BOOTSPLASH_IMAGE is not set +CONFIG_BOOTSPLASH_IMAGE=y +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" # CONFIG_FW_CONFIG is not set # end of General setup @@ -175,7 +176,7 @@ CONFIG_PCIEXP_CLK_PM=y # CONFIG_DRIVERS_UART_8250IO is not set CONFIG_HEAP_SIZE=0x10000 CONFIG_EC_GPE_SCI=0x50 -CONFIG_LINUX_COMMAND_LINE="iommu=pt video=eDP-1:1920x1080 drm_kms_helper.drm_leak_fbdev_smem=1 i915.enable_fbc=0" +CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_32768=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set @@ -519,7 +520,7 @@ CONFIG_RUN_FSP_GOP=y # CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y CONFIG_LINEAR_FRAMEBUFFER=y -# CONFIG_BOOTSPLASH is not set +CONFIG_BOOTSPLASH=y # end of Display CONFIG_PCI=y diff --git a/config/coreboot-nitropad-nv41.config b/config/coreboot-nitropad-nv41.config index 62236680..fc0b5246 100644 --- a/config/coreboot-nitropad-nv41.config +++ b/config/coreboot-nitropad-nv41.config @@ -33,7 +33,8 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y # CONFIG_NO_STAGE_CACHE is not set CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set -# CONFIG_BOOTSPLASH_IMAGE is not set +CONFIG_BOOTSPLASH_IMAGE=y +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" # CONFIG_FW_CONFIG is not set # end of General setup @@ -175,7 +176,7 @@ CONFIG_PCIEXP_CLK_PM=y # CONFIG_DRIVERS_UART_8250IO is not set CONFIG_HEAP_SIZE=0x10000 CONFIG_EC_GPE_SCI=0x50 -CONFIG_LINUX_COMMAND_LINE="iommu=pt video=eDP-1:1920x1080 drm_kms_helper.drm_leak_fbdev_smem=1 i915.enable_fbc=0" +CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_32768=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set @@ -519,7 +520,7 @@ CONFIG_RUN_FSP_GOP=y # CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y CONFIG_LINEAR_FRAMEBUFFER=y -# CONFIG_BOOTSPLASH is not set +CONFIG_BOOTSPLASH=y # end of Display CONFIG_PCI=y @@ -661,6 +662,7 @@ CONFIG_PLATFORM_HAS_DRAM_CLEAR=y CONFIG_BOOTMEDIA_LOCK_NONE=y # CONFIG_BOOTMEDIA_LOCK_CONTROLLER is not set # CONFIG_BOOTMEDIA_LOCK_CHIP is not set +# CONFIG_BOOTMEDIA_SMM_BWP is not set # end of Security CONFIG_ACPI_HAVE_PCAT_8259=y @@ -684,8 +686,7 @@ CONFIG_FIXED_UART_FOR_CONSOLE=y # CONFIG_CONSOLE_NE2K is not set CONFIG_CONSOLE_CBMEM=y # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set -CONFIG_CONSOLE_SPI_FLASH=y -CONFIG_CONSOLE_SPI_FLASH_BUFFER_SIZE=0x50000 +# CONFIG_CONSOLE_SPI_FLASH is not set # CONFIG_CONSOLE_SYSTEM76_EC is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y diff --git a/config/coreboot-p8z77-m_pro-tpm1.config b/config/coreboot-p8z77-m_pro-tpm1.config index 9ee859da..98337c47 100644 --- a/config/coreboot-p8z77-m_pro-tpm1.config +++ b/config/coreboot-p8z77-m_pro-tpm1.config @@ -35,7 +35,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-qemu-tpm1.config b/config/coreboot-qemu-tpm1.config index 8865c07e..022084c3 100644 --- a/config/coreboot-qemu-tpm1.config +++ b/config/coreboot-qemu-tpm1.config @@ -35,7 +35,7 @@ CONFIG_NO_STAGE_CACHE=y # CONFIG_CBMEM_STAGE_CACHE is not set # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-qemu-tpm2.config b/config/coreboot-qemu-tpm2.config index 23b37be1..bdf4fbb5 100644 --- a/config/coreboot-qemu-tpm2.config +++ b/config/coreboot-qemu-tpm2.config @@ -35,7 +35,7 @@ CONFIG_NO_STAGE_CACHE=y # CONFIG_CBMEM_STAGE_CACHE is not set # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-t420-maximized.config b/config/coreboot-t420-maximized.config index 768b6806..af7ea9fb 100644 --- a/config/coreboot-t420-maximized.config +++ b/config/coreboot-t420-maximized.config @@ -34,7 +34,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-t420.config b/config/coreboot-t420.config index c7a6f0c3..36068d83 100644 --- a/config/coreboot-t420.config +++ b/config/coreboot-t420.config @@ -33,7 +33,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-t430-legacy.config b/config/coreboot-t430-legacy.config index 1c1f6ade..8a191771 100644 --- a/config/coreboot-t430-legacy.config +++ b/config/coreboot-t430-legacy.config @@ -34,7 +34,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-t430-maximized.config b/config/coreboot-t430-maximized.config index 017318fb..74d2eb51 100644 --- a/config/coreboot-t430-maximized.config +++ b/config/coreboot-t430-maximized.config @@ -34,7 +34,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-t440p.config b/config/coreboot-t440p.config index c5bc17ed..737119e4 100644 --- a/config/coreboot-t440p.config +++ b/config/coreboot-t440p.config @@ -34,7 +34,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-t520-maximized.config b/config/coreboot-t520-maximized.config index 09e1fa22..0e825748 100644 --- a/config/coreboot-t520-maximized.config +++ b/config/coreboot-t520-maximized.config @@ -34,7 +34,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-t530-dgpu-maximized.config b/config/coreboot-t530-dgpu-maximized.config index 15bf3996..cd2dfa2c 100644 --- a/config/coreboot-t530-dgpu-maximized.config +++ b/config/coreboot-t530-dgpu-maximized.config @@ -36,7 +36,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-t530-maximized.config b/config/coreboot-t530-maximized.config index fb134279..50e6d6a6 100644 --- a/config/coreboot-t530-maximized.config +++ b/config/coreboot-t530-maximized.config @@ -36,7 +36,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-w530-dgpu-K1000m-maximized.config b/config/coreboot-w530-dgpu-K1000m-maximized.config index df910f98..d1535454 100644 --- a/config/coreboot-w530-dgpu-K1000m-maximized.config +++ b/config/coreboot-w530-dgpu-K1000m-maximized.config @@ -36,7 +36,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-w530-dgpu-K2000m-maximized.config b/config/coreboot-w530-dgpu-K2000m-maximized.config index 7a62745e..22e79f7a 100644 --- a/config/coreboot-w530-dgpu-K2000m-maximized.config +++ b/config/coreboot-w530-dgpu-K2000m-maximized.config @@ -36,7 +36,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-w530-maximized.config b/config/coreboot-w530-maximized.config index 89bbbeae..39aee49d 100644 --- a/config/coreboot-w530-maximized.config +++ b/config/coreboot-w530-maximized.config @@ -36,7 +36,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-w541.config b/config/coreboot-w541.config index 282d2019..675b54fb 100644 --- a/config/coreboot-w541.config +++ b/config/coreboot-w541.config @@ -34,7 +34,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-x220-maximized.config b/config/coreboot-x220-maximized.config index a9596253..ab43ccf3 100644 --- a/config/coreboot-x220-maximized.config +++ b/config/coreboot-x220-maximized.config @@ -33,7 +33,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-x220.config b/config/coreboot-x220.config index a9596253..ab43ccf3 100644 --- a/config/coreboot-x220.config +++ b/config/coreboot-x220.config @@ -33,7 +33,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-x230-legacy.config b/config/coreboot-x230-legacy.config index b0a8a539..76b49c6e 100644 --- a/config/coreboot-x230-legacy.config +++ b/config/coreboot-x230-legacy.config @@ -33,7 +33,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-x230-maximized-fhd_edp.config b/config/coreboot-x230-maximized-fhd_edp.config index 67aeb278..251d206e 100644 --- a/config/coreboot-x230-maximized-fhd_edp.config +++ b/config/coreboot-x230-maximized-fhd_edp.config @@ -33,7 +33,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-x230-maximized.config b/config/coreboot-x230-maximized.config index cd1a9401..ae2cd583 100644 --- a/config/coreboot-x230-maximized.config +++ b/config/coreboot-x230-maximized.config @@ -33,7 +33,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/coreboot-z220-cmt.config b/config/coreboot-z220-cmt.config index d298384b..2bd19489 100644 --- a/config/coreboot-z220-cmt.config +++ b/config/coreboot-z220-cmt.config @@ -35,7 +35,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y CONFIG_TSEG_STAGE_CACHE=y # CONFIG_UPDATE_IMAGE is not set CONFIG_BOOTSPLASH_IMAGE=y -CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg" +CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg" CONFIG_BOOTSPLASH_CONVERT=y CONFIG_BOOTSPLASH_CONVERT_QUALITY=70 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set diff --git a/config/linux-nitropad-x.config b/config/linux-nitropad-x.config index 638605fa..6bb5bcd5 100644 --- a/config/linux-nitropad-x.config +++ b/config/linux-nitropad-x.config @@ -341,7 +341,8 @@ CONFIG_CC_HAS_IBT=y CONFIG_X86_INTEL_TSX_MODE_OFF=y # CONFIG_X86_INTEL_TSX_MODE_ON is not set # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set -# CONFIG_EFI is not set +CONFIG_EFI=y +# CONFIG_EFI_STUB is not set # CONFIG_HZ_100 is not set CONFIG_HZ_250=y # CONFIG_HZ_300 is not set @@ -414,6 +415,7 @@ CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HOTPLUG_IOAPIC=y # CONFIG_ACPI_SBS is not set # CONFIG_ACPI_HED is not set +# CONFIG_ACPI_BGRT is not set # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set # CONFIG_ACPI_NFIT is not set CONFIG_HAVE_ACPI_APEI=y @@ -424,6 +426,7 @@ CONFIG_HAVE_ACPI_APEI_NMI=y # CONFIG_ACPI_PFRUT is not set CONFIG_ACPI_PCC=y # CONFIG_PMIC_OPREGION is not set +CONFIG_ACPI_PRMT=y CONFIG_X86_PM_TIMER=y # @@ -600,6 +603,7 @@ CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y +CONFIG_ARCH_USE_MEMREMAP_PROT=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y CONFIG_HAVE_STATIC_CALL=y CONFIG_HAVE_STATIC_CALL_INLINE=y @@ -1000,9 +1004,26 @@ CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y # CONFIG_ISCSI_IBFT is not set # CONFIG_FW_CFG_SYSFS is not set CONFIG_SYSFB=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_GOOGLE_FIRMWARE is not set +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_ESRT=y +CONFIG_EFI_RUNTIME_MAP=y +# CONFIG_EFI_FAKE_MEMMAP is not set +CONFIG_EFI_RUNTIME_WRAPPERS=y +# CONFIG_EFI_BOOTLOADER_CONTROL is not set +# CONFIG_EFI_CAPSULE_LOADER is not set +# CONFIG_EFI_TEST is not set +# CONFIG_EFI_RCI2_TABLE is not set +# CONFIG_EFI_DISABLE_PCI_DMA is not set +CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y +# CONFIG_EFI_DISABLE_RUNTIME is not set +# CONFIG_EFI_COCO_SECRET is not set +# end of EFI (Extensible Firmware Interface) Support + # # Tegra firmware driver # @@ -1989,6 +2010,7 @@ CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_IMSTT is not set # CONFIG_FB_VGA16 is not set CONFIG_FB_VESA=y +CONFIG_FB_EFI=y # CONFIG_FB_N411 is not set # CONFIG_FB_HGA is not set # CONFIG_FB_OPENCORES is not set @@ -2794,6 +2816,7 @@ CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y # CONFIG_CONFIGFS_FS is not set +CONFIG_EFIVAR_FS=m # end of Pseudo filesystems # CONFIG_MISC_FILESYSTEMS is not set @@ -2868,6 +2891,7 @@ CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HARDENED_USERCOPY=y # CONFIG_FORTIFY_SOURCE is not set # CONFIG_STATIC_USERMODEHELPER is not set +# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,bpf" @@ -3200,6 +3224,7 @@ CONFIG_NLATTR=y CONFIG_CLZ_TAB=y CONFIG_IRQ_POLL=y CONFIG_MPILIB=m +CONFIG_UCS2_STRING=y CONFIG_HAVE_GENERIC_VDSO=y CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_VDSO_TIME_NS=y @@ -3434,6 +3459,7 @@ CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y CONFIG_EARLY_PRINTK=y # CONFIG_EARLY_PRINTK_DBGP is not set # CONFIG_EARLY_PRINTK_USB_XDBC is not set +# CONFIG_EFI_PGT_DUMP is not set # CONFIG_DEBUG_TLBFLUSH is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y # CONFIG_X86_DECODER_SELFTEST is not set diff --git a/modules/nitrokey-blobs b/modules/nitrokey-blobs index 077b7942..eafef400 100644 --- a/modules/nitrokey-blobs +++ b/modules/nitrokey-blobs @@ -1,11 +1,11 @@ modules-$(CONFIG_NITROKEY_BLOBS) += nitrokey-blobs nitrokey-blobs_base_dir := nitrokey-blobs -nitrokey-blobs_version := c9e2a556508518d54cd57f8c7a440cb370f69de1 +nitrokey-blobs_version := b629bad31046ff2f5f363656326646fe2081d033 nitrokey-blobs_tar := nitrokey-blobs-${nitrokey-blobs_version}.tar.gz nitrokey-blobs_tar_opt := --strip 1 nitrokey-blobs_url := https://github.com/Nitrokey/firmware-blobs/archive/${nitrokey-blobs_version}.tar.gz -nitrokey-blobs_hash := 1458798fa774e43ab2e6cf5cff875f4b3628c5dc1926bf9ec65051964b1a4854 +nitrokey-blobs_hash := 73daf2180e3ffd070e9dc80c84ccd2573a24f636dc273e3d9fe81aefc7c5d425 ## there is nothing to be built nitrokey-blobs_output := .built