Skip to content

Commit 3a648df

Browse files
tlauriontlaurion
committed
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 <[email protected]>
1 parent 194ba8b commit 3a648df

26 files changed

+62
-34
lines changed

‎branding/Heads/bootsplash-1024x768.jpg renamed to ‎branding/Heads/bootsplash.jpg

File renamed without changes.

‎config/coreboot-nitropad-ns50.config

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3333
# CONFIG_NO_STAGE_CACHE is not set
3434
CONFIG_TSEG_STAGE_CACHE=y
3535
# CONFIG_UPDATE_IMAGE is not set
36-
# CONFIG_BOOTSPLASH_IMAGE is not set
36+
CONFIG_BOOTSPLASH_IMAGE=y
37+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3738
# CONFIG_FW_CONFIG is not set
3839
# end of General setup
3940

@@ -175,7 +176,7 @@ CONFIG_PCIEXP_CLK_PM=y
175176
# CONFIG_DRIVERS_UART_8250IO is not set
176177
CONFIG_HEAP_SIZE=0x10000
177178
CONFIG_EC_GPE_SCI=0x50
178-
CONFIG_LINUX_COMMAND_LINE="iommu=pt video=eDP-1:1920x1080 drm_kms_helper.drm_leak_fbdev_smem=1 i915.enable_fbc=0"
179+
CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2"
179180
CONFIG_BOARD_ROMSIZE_KB_32768=y
180181
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
181182
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -519,7 +520,7 @@ CONFIG_RUN_FSP_GOP=y
519520
#
520521
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
521522
CONFIG_LINEAR_FRAMEBUFFER=y
522-
# CONFIG_BOOTSPLASH is not set
523+
CONFIG_BOOTSPLASH=y
523524
# end of Display
524525

525526
CONFIG_PCI=y

‎config/coreboot-nitropad-nv41.config

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3333
# CONFIG_NO_STAGE_CACHE is not set
3434
CONFIG_TSEG_STAGE_CACHE=y
3535
# CONFIG_UPDATE_IMAGE is not set
36-
# CONFIG_BOOTSPLASH_IMAGE is not set
36+
CONFIG_BOOTSPLASH_IMAGE=y
37+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3738
# CONFIG_FW_CONFIG is not set
3839
# end of General setup
3940

@@ -175,7 +176,7 @@ CONFIG_PCIEXP_CLK_PM=y
175176
# CONFIG_DRIVERS_UART_8250IO is not set
176177
CONFIG_HEAP_SIZE=0x10000
177178
CONFIG_EC_GPE_SCI=0x50
178-
CONFIG_LINUX_COMMAND_LINE="iommu=pt video=eDP-1:1920x1080 drm_kms_helper.drm_leak_fbdev_smem=1 i915.enable_fbc=0"
179+
CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2"
179180
CONFIG_BOARD_ROMSIZE_KB_32768=y
180181
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
181182
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -519,7 +520,7 @@ CONFIG_RUN_FSP_GOP=y
519520
#
520521
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
521522
CONFIG_LINEAR_FRAMEBUFFER=y
522-
# CONFIG_BOOTSPLASH is not set
523+
CONFIG_BOOTSPLASH=y
523524
# end of Display
524525

525526
CONFIG_PCI=y
@@ -661,6 +662,7 @@ CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
661662
CONFIG_BOOTMEDIA_LOCK_NONE=y
662663
# CONFIG_BOOTMEDIA_LOCK_CONTROLLER is not set
663664
# CONFIG_BOOTMEDIA_LOCK_CHIP is not set
665+
# CONFIG_BOOTMEDIA_SMM_BWP is not set
664666
# end of Security
665667

666668
CONFIG_ACPI_HAVE_PCAT_8259=y
@@ -684,8 +686,7 @@ CONFIG_FIXED_UART_FOR_CONSOLE=y
684686
# CONFIG_CONSOLE_NE2K is not set
685687
CONFIG_CONSOLE_CBMEM=y
686688
# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
687-
CONFIG_CONSOLE_SPI_FLASH=y
688-
CONFIG_CONSOLE_SPI_FLASH_BUFFER_SIZE=0x50000
689+
# CONFIG_CONSOLE_SPI_FLASH is not set
689690
# CONFIG_CONSOLE_SYSTEM76_EC is not set
690691
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set
691692
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y

‎config/coreboot-p8z77-m_pro-tpm1.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3535
CONFIG_TSEG_STAGE_CACHE=y
3636
# CONFIG_UPDATE_IMAGE is not set
3737
CONFIG_BOOTSPLASH_IMAGE=y
38-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
38+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3939
CONFIG_BOOTSPLASH_CONVERT=y
4040
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
4141
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-qemu-tpm1.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ CONFIG_NO_STAGE_CACHE=y
3535
# CONFIG_CBMEM_STAGE_CACHE is not set
3636
# CONFIG_UPDATE_IMAGE is not set
3737
CONFIG_BOOTSPLASH_IMAGE=y
38-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
38+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3939
CONFIG_BOOTSPLASH_CONVERT=y
4040
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
4141
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-qemu-tpm2.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ CONFIG_NO_STAGE_CACHE=y
3535
# CONFIG_CBMEM_STAGE_CACHE is not set
3636
# CONFIG_UPDATE_IMAGE is not set
3737
CONFIG_BOOTSPLASH_IMAGE=y
38-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
38+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3939
CONFIG_BOOTSPLASH_CONVERT=y
4040
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
4141
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-t420-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3434
CONFIG_TSEG_STAGE_CACHE=y
3535
# CONFIG_UPDATE_IMAGE is not set
3636
CONFIG_BOOTSPLASH_IMAGE=y
37-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
37+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3838
CONFIG_BOOTSPLASH_CONVERT=y
3939
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
4040
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-t420.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3333
CONFIG_TSEG_STAGE_CACHE=y
3434
# CONFIG_UPDATE_IMAGE is not set
3535
CONFIG_BOOTSPLASH_IMAGE=y
36-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
36+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3737
CONFIG_BOOTSPLASH_CONVERT=y
3838
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
3939
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-t430-legacy.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3434
CONFIG_TSEG_STAGE_CACHE=y
3535
# CONFIG_UPDATE_IMAGE is not set
3636
CONFIG_BOOTSPLASH_IMAGE=y
37-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
37+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3838
CONFIG_BOOTSPLASH_CONVERT=y
3939
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
4040
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-t430-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3434
CONFIG_TSEG_STAGE_CACHE=y
3535
# CONFIG_UPDATE_IMAGE is not set
3636
CONFIG_BOOTSPLASH_IMAGE=y
37-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
37+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3838
CONFIG_BOOTSPLASH_CONVERT=y
3939
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
4040
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-t440p.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3434
CONFIG_TSEG_STAGE_CACHE=y
3535
# CONFIG_UPDATE_IMAGE is not set
3636
CONFIG_BOOTSPLASH_IMAGE=y
37-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
37+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3838
CONFIG_BOOTSPLASH_CONVERT=y
3939
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
4040
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-t520-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3434
CONFIG_TSEG_STAGE_CACHE=y
3535
# CONFIG_UPDATE_IMAGE is not set
3636
CONFIG_BOOTSPLASH_IMAGE=y
37-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
37+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3838
CONFIG_BOOTSPLASH_CONVERT=y
3939
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
4040
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-t530-dgpu-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3636
CONFIG_TSEG_STAGE_CACHE=y
3737
# CONFIG_UPDATE_IMAGE is not set
3838
CONFIG_BOOTSPLASH_IMAGE=y
39-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
39+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
4040
CONFIG_BOOTSPLASH_CONVERT=y
4141
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
4242
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-t530-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3636
CONFIG_TSEG_STAGE_CACHE=y
3737
# CONFIG_UPDATE_IMAGE is not set
3838
CONFIG_BOOTSPLASH_IMAGE=y
39-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
39+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
4040
CONFIG_BOOTSPLASH_CONVERT=y
4141
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
4242
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-w530-dgpu-K1000m-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3636
CONFIG_TSEG_STAGE_CACHE=y
3737
# CONFIG_UPDATE_IMAGE is not set
3838
CONFIG_BOOTSPLASH_IMAGE=y
39-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
39+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
4040
CONFIG_BOOTSPLASH_CONVERT=y
4141
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
4242
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-w530-dgpu-K2000m-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3636
CONFIG_TSEG_STAGE_CACHE=y
3737
# CONFIG_UPDATE_IMAGE is not set
3838
CONFIG_BOOTSPLASH_IMAGE=y
39-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
39+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
4040
CONFIG_BOOTSPLASH_CONVERT=y
4141
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
4242
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-w530-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3636
CONFIG_TSEG_STAGE_CACHE=y
3737
# CONFIG_UPDATE_IMAGE is not set
3838
CONFIG_BOOTSPLASH_IMAGE=y
39-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
39+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
4040
CONFIG_BOOTSPLASH_CONVERT=y
4141
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
4242
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-w541.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3434
CONFIG_TSEG_STAGE_CACHE=y
3535
# CONFIG_UPDATE_IMAGE is not set
3636
CONFIG_BOOTSPLASH_IMAGE=y
37-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
37+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3838
CONFIG_BOOTSPLASH_CONVERT=y
3939
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
4040
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-x220-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3333
CONFIG_TSEG_STAGE_CACHE=y
3434
# CONFIG_UPDATE_IMAGE is not set
3535
CONFIG_BOOTSPLASH_IMAGE=y
36-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
36+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3737
CONFIG_BOOTSPLASH_CONVERT=y
3838
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
3939
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-x220.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3333
CONFIG_TSEG_STAGE_CACHE=y
3434
# CONFIG_UPDATE_IMAGE is not set
3535
CONFIG_BOOTSPLASH_IMAGE=y
36-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
36+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3737
CONFIG_BOOTSPLASH_CONVERT=y
3838
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
3939
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-x230-legacy.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3333
CONFIG_TSEG_STAGE_CACHE=y
3434
# CONFIG_UPDATE_IMAGE is not set
3535
CONFIG_BOOTSPLASH_IMAGE=y
36-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
36+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3737
CONFIG_BOOTSPLASH_CONVERT=y
3838
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
3939
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-x230-maximized-fhd_edp.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3333
CONFIG_TSEG_STAGE_CACHE=y
3434
# CONFIG_UPDATE_IMAGE is not set
3535
CONFIG_BOOTSPLASH_IMAGE=y
36-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
36+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3737
CONFIG_BOOTSPLASH_CONVERT=y
3838
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
3939
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-x230-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3333
CONFIG_TSEG_STAGE_CACHE=y
3434
# CONFIG_UPDATE_IMAGE is not set
3535
CONFIG_BOOTSPLASH_IMAGE=y
36-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
36+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3737
CONFIG_BOOTSPLASH_CONVERT=y
3838
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
3939
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/coreboot-z220-cmt.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
3535
CONFIG_TSEG_STAGE_CACHE=y
3636
# CONFIG_UPDATE_IMAGE is not set
3737
CONFIG_BOOTSPLASH_IMAGE=y
38-
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
38+
CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
3939
CONFIG_BOOTSPLASH_CONVERT=y
4040
CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
4141
# CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set

‎config/linux-nitropad-x.config

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,8 @@ CONFIG_CC_HAS_IBT=y
341341
CONFIG_X86_INTEL_TSX_MODE_OFF=y
342342
# CONFIG_X86_INTEL_TSX_MODE_ON is not set
343343
# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
344-
# CONFIG_EFI is not set
344+
CONFIG_EFI=y
345+
# CONFIG_EFI_STUB is not set
345346
# CONFIG_HZ_100 is not set
346347
CONFIG_HZ_250=y
347348
# CONFIG_HZ_300 is not set
@@ -414,6 +415,7 @@ CONFIG_ACPI_CONTAINER=y
414415
CONFIG_ACPI_HOTPLUG_IOAPIC=y
415416
# CONFIG_ACPI_SBS is not set
416417
# CONFIG_ACPI_HED is not set
418+
# CONFIG_ACPI_BGRT is not set
417419
# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
418420
# CONFIG_ACPI_NFIT is not set
419421
CONFIG_HAVE_ACPI_APEI=y
@@ -424,6 +426,7 @@ CONFIG_HAVE_ACPI_APEI_NMI=y
424426
# CONFIG_ACPI_PFRUT is not set
425427
CONFIG_ACPI_PCC=y
426428
# CONFIG_PMIC_OPREGION is not set
429+
CONFIG_ACPI_PRMT=y
427430
CONFIG_X86_PM_TIMER=y
428431

429432
#
@@ -600,6 +603,7 @@ CONFIG_STRICT_KERNEL_RWX=y
600603
CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
601604
CONFIG_STRICT_MODULE_RWX=y
602605
CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
606+
CONFIG_ARCH_USE_MEMREMAP_PROT=y
603607
CONFIG_ARCH_HAS_MEM_ENCRYPT=y
604608
CONFIG_HAVE_STATIC_CALL=y
605609
CONFIG_HAVE_STATIC_CALL_INLINE=y
@@ -1000,9 +1004,26 @@ CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
10001004
# CONFIG_ISCSI_IBFT is not set
10011005
# CONFIG_FW_CFG_SYSFS is not set
10021006
CONFIG_SYSFB=y
1003-
CONFIG_SYSFB_SIMPLEFB=y
1007+
# CONFIG_SYSFB_SIMPLEFB is not set
10041008
# CONFIG_GOOGLE_FIRMWARE is not set
10051009

1010+
#
1011+
# EFI (Extensible Firmware Interface) Support
1012+
#
1013+
CONFIG_EFI_ESRT=y
1014+
CONFIG_EFI_RUNTIME_MAP=y
1015+
# CONFIG_EFI_FAKE_MEMMAP is not set
1016+
CONFIG_EFI_RUNTIME_WRAPPERS=y
1017+
# CONFIG_EFI_BOOTLOADER_CONTROL is not set
1018+
# CONFIG_EFI_CAPSULE_LOADER is not set
1019+
# CONFIG_EFI_TEST is not set
1020+
# CONFIG_EFI_RCI2_TABLE is not set
1021+
# CONFIG_EFI_DISABLE_PCI_DMA is not set
1022+
CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
1023+
# CONFIG_EFI_DISABLE_RUNTIME is not set
1024+
# CONFIG_EFI_COCO_SECRET is not set
1025+
# end of EFI (Extensible Firmware Interface) Support
1026+
10061027
#
10071028
# Tegra firmware driver
10081029
#
@@ -1548,7 +1569,7 @@ CONFIG_DEVPORT=y
15481569
# CONFIG_HPET is not set
15491570
# CONFIG_HANGCHECK_TIMER is not set
15501571
CONFIG_TCG_TPM=y
1551-
CONFIG_HW_RANDOM_TPM=n
1572+
# CONFIG_HW_RANDOM_TPM is not set
15521573
CONFIG_TCG_TIS_CORE=y
15531574
CONFIG_TCG_TIS=y
15541575
# CONFIG_TCG_TIS_I2C is not set
@@ -1989,6 +2010,7 @@ CONFIG_FB_DEFERRED_IO=y
19892010
# CONFIG_FB_IMSTT is not set
19902011
# CONFIG_FB_VGA16 is not set
19912012
CONFIG_FB_VESA=y
2013+
CONFIG_FB_EFI=y
19922014
# CONFIG_FB_N411 is not set
19932015
# CONFIG_FB_HGA is not set
19942016
# CONFIG_FB_OPENCORES is not set
@@ -2793,6 +2815,7 @@ CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y
27932815
CONFIG_MEMFD_CREATE=y
27942816
CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
27952817
# CONFIG_CONFIGFS_FS is not set
2818+
CONFIG_EFIVAR_FS=m
27962819
# end of Pseudo filesystems
27972820

27982821
# CONFIG_MISC_FILESYSTEMS is not set
@@ -2867,6 +2890,7 @@ CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
28672890
CONFIG_HARDENED_USERCOPY=y
28682891
# CONFIG_FORTIFY_SOURCE is not set
28692892
# CONFIG_STATIC_USERMODEHELPER is not set
2893+
# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
28702894
CONFIG_DEFAULT_SECURITY_DAC=y
28712895
CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,bpf"
28722896

@@ -3199,6 +3223,7 @@ CONFIG_NLATTR=y
31993223
CONFIG_CLZ_TAB=y
32003224
CONFIG_IRQ_POLL=y
32013225
CONFIG_MPILIB=m
3226+
CONFIG_UCS2_STRING=y
32023227
CONFIG_HAVE_GENERIC_VDSO=y
32033228
CONFIG_GENERIC_GETTIMEOFDAY=y
32043229
CONFIG_GENERIC_VDSO_TIME_NS=y
@@ -3433,6 +3458,7 @@ CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
34333458
CONFIG_EARLY_PRINTK=y
34343459
# CONFIG_EARLY_PRINTK_DBGP is not set
34353460
# CONFIG_EARLY_PRINTK_USB_XDBC is not set
3461+
# CONFIG_EFI_PGT_DUMP is not set
34363462
# CONFIG_DEBUG_TLBFLUSH is not set
34373463
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
34383464
# CONFIG_X86_DECODER_SELFTEST is not set

‎modules/nitrokey-blobs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
modules-$(CONFIG_NITROKEY_BLOBS) += nitrokey-blobs
22

33
nitrokey-blobs_base_dir := nitrokey-blobs
4-
nitrokey-blobs_version := c9e2a556508518d54cd57f8c7a440cb370f69de1
4+
nitrokey-blobs_version := b629bad31046ff2f5f363656326646fe2081d033
55
nitrokey-blobs_tar := nitrokey-blobs-${nitrokey-blobs_version}.tar.gz
66
nitrokey-blobs_tar_opt := --strip 1
77
nitrokey-blobs_url := https://github.com/Nitrokey/firmware-blobs/archive/${nitrokey-blobs_version}.tar.gz
8-
nitrokey-blobs_hash := 1458798fa774e43ab2e6cf5cff875f4b3628c5dc1926bf9ec65051964b1a4854
8+
nitrokey-blobs_hash := 73daf2180e3ffd070e9dc80c84ccd2573a24f636dc273e3d9fe81aefc7c5d425
99

1010
## there is nothing to be built
1111
nitrokey-blobs_output := .built

0 commit comments

Comments
 (0)