Merge pull request #1846 from Dasharo/add_novacustom_v540tu

Add NovaCustom V560TU board

.circleci/config.yml

@@ -254,7 +254,7 @@ workflows:
           target: novacustom_nv4x_adl
           subcommand: ""
           requires:
-            - x86-musl-cross-make
+            - x230-hotp-maximized
 
       # coreboot talos_2
       - build_and_persist:
@@ -510,14 +510,21 @@ workflows:
           requires:
             - librem_14
 
-      # dasharo release
+      # dasharo release, share 24.02.01 utils/crossgcc
       - build:
-          name: nitropad-ns50
-          target: nitropad-ns50
+          name: UNTESTED_nitropad-ns50
+          target: UNTESTED_nitropad-ns50
           subcommand: ""
           requires:
             - novacustom_nv4x_adl
 
+      - build:
+          name: novacustom-v560tu
+          target: novacustom-v560tu
+          subcommand: ""
+          requires:
+            - x230-hotp-maximized
+
       # coreboot 4.11
       - build:
           name: UNMAINTAINED_kgpe-d16_workstation
@@ -533,7 +540,7 @@ workflows:
           subcommand: ""
           requires:
             - librem_l1um
-      
+
       # coreboot 4.11
       - build:
           name: UNMAINTAINED_kgpe-d16_server

boards/nitropad-ns50/nitropad-ns50.config → boards/UNTESTED_nitropad-ns50/UNTESTED_nitropad-ns50.config

@@ -6,7 +6,7 @@ export CONFIG_COREBOOT_VERSION=dasharo
 export CONFIG_LINUX_VERSION=6.1.8
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-nitropad-ns50.config
-CONFIG_LINUX_CONFIG=config/linux-nitropad-x.config
+CONFIG_LINUX_CONFIG=config/linux-novacustom-common.config
 
 #Enable DEBUG output
 #export CONFIG_DEBUG_OUTPUT=y

boards/novacustom-v560tu/novacustom-v560tu.config

@@ -0,0 +1,81 @@
+# NovaCustom V54 MTL (integrated graphics) board configuration
+# Note the FLASH_OPTIONS: '--ifd -i bios -i me -i fd'
+#  This excludes gbe from internal flashing, otherwise mac address would revert to '88:88:88:88:87:88' see https://github.com/linuxboot/heads/pull/1871#discussion_r1870134788
+#   Same options should be used when externally flashing the first time, otherwise Intel GBE region (Ethernet config blob) will be overwitten and MAC reverted to '88:88:88:88:87:88'
+
+# Meteor Lake (Intel Gen 14) is not supposed to support s3 but coincidently does. In case s3 is broken, user must configure settings to not suspend or otherwise enable ME/CSME for s01x to work (unsupported by QubesOS when writing those lines) or use Hibernate (Not supported by QubesOS either)
+
+export CONFIG_COREBOOT=y
+export CONFIG_COREBOOT_VERSION=dasharo
+export CONFIG_LINUX_VERSION=6.1.8
+
+CONFIG_COREBOOT_CONFIG=config/coreboot-novacustom-v560tu.config
+CONFIG_LINUX_CONFIG=config/linux-novacustom-common.config
+
+#Enable DEBUG output
+#export CONFIG_DEBUG_OUTPUT=y
+#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
+#Enable TPM2 pcap output under /tmp
+#export CONFIG_TPM2_CAPTURE_PCAP=y
+
+#On-demand hardware support (modules.cpio)
+CONFIG_LINUX_USB=y
+CONFIG_LINUX_E1000=y
+CONFIG_MOBILE_TETHERING=y
+
+#Modules packed into tools.cpio
+CONFIG_CRYPTSETUP2=y
+CONFIG_FLASHPROG=y
+CONFIG_FLASHTOOLS=y
+CONFIG_GPG2=y
+CONFIG_KEXEC=y
+CONFIG_UTIL_LINUX=y
+CONFIG_LVM2=y
+CONFIG_MBEDTLS=y
+CONFIG_PCIUTILS=y
+
+#platform locking finalization (PR0)
+CONFIG_IO386=y
+export CONFIG_FINALIZE_PLATFORM_LOCKING=y
+
+
+#Remote attestation support
+# TPM2 requirements
+CONFIG_TPM2_TSS=y
+CONFIG_OPENSSL=y
+#Remote Attestation common tools
+CONFIG_POPT=y
+CONFIG_QRENCODE=y
+CONFIG_TPMTOTP=y
+#HOTP based remote attestation for supported USB Security dongle
+#With/Without TPM support
+CONFIG_HOTPKEY=y
+#Nitrokey Storage admin tool (deprecated)
+#CONFIG_NKSTORECLI=n
+#GUI Support
+#Console based Whiptail support(Console based, no FB):
+#CONFIG_SLANG=y
+#CONFIG_NEWT=y
+#FBWhiptail based (Graphical):
+CONFIG_CAIRO=y
+CONFIG_FBWHIPTAIL=y
+#Additional tools (tools.cpio):
+#SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
+CONFIG_DROPBEAR=y
+
+#Runtime configuration
+#Automatically boot if HOTP is valid
+export CONFIG_AUTO_BOOT_TIMEOUT=5
+#TPM2 requirements
+export CONFIG_TPM2_TOOLS=y
+export CONFIG_PRIMARY_KEY_TYPE=ecc
+#TPM1 requirements
+#export CONFIG_TPM=y
+export CONFIG_BOOTSCRIPT=/bin/gui-init
+export CONFIG_BOOT_REQ_HASH=n
+export CONFIG_BOOT_REQ_ROLLBACK=n
+export CONFIG_BOOT_KERNEL_ADD=""
+export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
+export CONFIG_BOARD_NAME="NovaCustom V560TU"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd -i bios -i me -i fd"
+export CONFIG_AUTO_BOOT_TIMEOUT=5

boards/novacustom_nv4x_adl/novacustom_nv4x_adl.config

@@ -6,7 +6,7 @@ export CONFIG_COREBOOT_VERSION=dasharo
 export CONFIG_LINUX_VERSION=6.1.8
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-novacustom_nv4x_adl.config
-CONFIG_LINUX_CONFIG=config/linux-nitropad-x.config
+CONFIG_LINUX_CONFIG=config/linux-novacustom-common.config
 
 #Enable DEBUG output
 #export CONFIG_DEBUG_OUTPUT=y

config/coreboot-nitropad-ns50.config

@@ -22,6 +22,7 @@ CONFIG_USE_OPTION_TABLE=y
 # CONFIG_STATIC_OPTION_TABLE is not set
 CONFIG_COMPRESS_RAMSTAGE_LZMA=y
 # CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set
+CONFIG_SEPARATE_ROMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_TIMESTAMPS_ON_CONSOLE is not set
@@ -79,6 +80,7 @@ CONFIG_BOOTSPLASH_CONVERT_QUALITY=90
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GOOGLE is not set
+# CONFIG_VENDOR_HARDKERNEL is not set
 # CONFIG_VENDOR_HP is not set
 # CONFIG_VENDOR_IBASE is not set
 # CONFIG_VENDOR_IBM is not set
@@ -147,6 +149,7 @@ CONFIG_TPM_PIRQ=0x27
 # CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
 CONFIG_VBOOT_FWID_VERSION="$(CONFIG_LOCALVERSION)"
 CONFIG_EC_SYSTEM76_EC_BAT_THRESHOLDS=y
+CONFIG_EC_SYSTEM76_EC_FLASH_SIZE=0x20000
 CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xc0000000
 CONFIG_ECAM_MMCONF_BUS_NUMBER=256
 CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
@@ -161,7 +164,6 @@ CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/novacustom/ns5x_adl/descriptor.bin"
 CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/novacustom/ns5x_adl/me.bin"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_VBT_DATA_SIZE_KB=9
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
 # CONFIG_USE_LEGACY_8254_TIMER is not set
@@ -191,7 +193,7 @@ CONFIG_PCIEXP_L1_SUB_STATE=y
 CONFIG_PCIEXP_CLK_PM=y
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
-CONFIG_HEAP_SIZE=0x10000
+CONFIG_FSP_TEMP_RAM_SIZE=0x20000
 CONFIG_EC_GPE_SCI=0x50
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2"
@@ -207,6 +209,7 @@ CONFIG_BOARD_ROMSIZE_KB_32768=y
 # CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_24576 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_32768=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=32768
@@ -233,7 +236,6 @@ CONFIG_FSP_M_FILE="$(obj)/Fsp_M.fd"
 CONFIG_FSP_S_FILE="$(obj)/Fsp_S.fd"
 CONFIG_CBFS_MCACHE_SIZE=0x4000
 CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_FSP_TEMP_RAM_SIZE=0x20000
 CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_CONSOLE_UART_BASE_ADDRESS=0xfe03e000
 CONFIG_SMM_TSEG_SIZE=0x800000
@@ -243,6 +245,8 @@ CONFIG_ACPI_BERT=y
 CONFIG_ACPI_BERT_SIZE=0x10000
 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=133
 CONFIG_VBOOT_HASH_BLOCK_SIZE=0x1000
+CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000
+CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xe0000000
 CONFIG_ACPI_CPU_STRING="CP%02X"
 CONFIG_STACK_SIZE=0x2000
 CONFIG_SOC_INTEL_ALDERLAKE=y
@@ -273,12 +277,11 @@ CONFIG_SOC_INTEL_UART_DEV_MAX=7
 CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x25a
 CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0x7fff
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/AlderLakeFspBinPkg/Client/AlderLakeP/Include/"
-CONFIG_FSP_FD_PATH="3rdparty/fsp/AlderLakeFspBinPkg/Client/AlderLakeP/Fsp.fd"
+CONFIG_FSP_FD_PATH="3rdparty/fsp/RaptorLakeFspBinPkg/Client/RaptorLakeP/Fsp.fd"
 CONFIG_SOC_INTEL_ALDERLAKE_DEBUG_CONSENT=0
 CONFIG_DATA_BUS_WIDTH=128
 CONFIG_DIMMS_PER_CHANNEL=2
 CONFIG_MRC_CHANNEL_WIDTH=16
-CONFIG_ACPI_ADL_IPU_ES_SUPPORT=y
 CONFIG_ALDERLAKE_ENABLE_SOC_WORKAROUND=y
 CONFIG_SI_DESC_REGION="SI_DESC"
 CONFIG_SI_DESC_REGION_SZ=4096
@@ -295,9 +298,11 @@ CONFIG_BOOTBLOCK_IN_CBFS=y
 CONFIG_HAVE_PAM0_REGISTER=y
 CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=4
+CONFIG_CPU_MAX_TEMPERATURE=100
 CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
 CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
 CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
+CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
 CONFIG_INTEL_TME=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
 CONFIG_FIXED_SMBUS_IO_BASE=0xefa0
@@ -382,6 +387,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_LPSS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_MEMINIT=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_OC_WDT=y
 # CONFIG_SOC_INTEL_COMMON_OC_WDT_ENABLE is not set
+# CONFIG_SOC_INTEL_COMMON_OC_WDT_WDAT is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_BASE_P2SB=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PCIE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PCIE_RTD3=y
@@ -403,10 +409,8 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
 CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SA=y
-CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xe0000000
 CONFIG_SOC_INTEL_COMMON_BLOCK_TCSS=y
-# CONFIG_ENABLE_TCSS_DISPLAY_DETECTION is not set
-# CONFIG_ENABLE_TCSS_USB_DETECTION is not set
+# CONFIG_TCSS_HAS_USBC_OPS is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL_BEHIND_PMC=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y
@@ -416,6 +420,8 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_USB4=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_USB4_PCIE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_USB4_XHCI=y
 CONFIG_SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES=y
+CONFIG_FIRMWARE_CONNECTION_MANAGER=y
+# CONFIG_SOFTWARE_CONNECTION_MANAGER is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_VTD=y
 # CONFIG_ENABLE_EARLY_DMA_PROTECTION is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_XDCI=y
@@ -437,7 +443,6 @@ CONFIG_PCH_SPECIFIC_CLIENT_OPTIONS=y
 # Intel SoC Common coreboot stages and non-IP blocks
 #
 CONFIG_SOC_INTEL_COMMON_BASECODE=y
-CONFIG_SOC_INTEL_COMMON_BASECODE_RAMTOP=y
 CONFIG_SOC_INTEL_COMMON_RESET=y
 CONFIG_SOC_INTEL_COMMON_ACPI_WAKE_SOURCE=y
 CONFIG_PAVP=y
@@ -506,6 +511,7 @@ CONFIG_RCBA_LENGTH=0x4000
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_SYSTEM76_EC=y
+# CONFIG_EC_SYSTEM76_EC_UPDATE is not set
 
 #
 # Intel Firmware
@@ -532,6 +538,7 @@ CONFIG_BIOS_VENDOR="3mdeb"
 # Dasharo Configuration
 #
 CONFIG_DASHARO_PREFER_S3_SLEEP=y
+# CONFIG_DASHARO_FIRMWARE_UPDATE_MODE is not set
 # end of Dasharo Configuration
 
 CONFIG_UDK_BASE=y
@@ -548,7 +555,10 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_POSTCAR_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_ARCH_ALL_STAGES_X86_32=y
+CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
 CONFIG_X86_CUSTOM_BOOTMEDIA=y
+CONFIG_POSTRAM_CBFS_CACHE_IN_BSS=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
 CONFIG_PC80_SYSTEM=y
 CONFIG_HAVE_CMOS_DEFAULT=y
 CONFIG_POSTCAR_STAGE=y
@@ -585,7 +595,7 @@ CONFIG_BOOTSPLASH=y
 CONFIG_PCI=y
 CONFIG_ECAM_MMCONF_SUPPORT=y
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_AZALIA_PLUGIN_SUPPORT=y
+CONFIG_AZALIA_HDA_CODEC_SUPPORT=y
 CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP=y
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_ECAM_MMCONF_LENGTH=0x10000000
@@ -596,8 +606,6 @@ CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
 # CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR is not set
 CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y
 CONFIG_PCIEXP_HOTPLUG_IO=0x2000
-CONFIG_FIRMWARE_CONNECTION_MANAGER=y
-# CONFIG_SOFTWARE_CONNECTION_MANAGER is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
@@ -667,7 +675,12 @@ CONFIG_FSP_USES_CB_DEBUG_EVENT_HANDLER=y
 CONFIG_FSP_ENABLE_SERIAL_DEBUG=y
 CONFIG_FSP_MULTIPHASE_SI_INIT_RETURN_BROKEN=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
+# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
+# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
+CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
 CONFIG_INTEL_GMA_OPREGION_2_1=y
+CONFIG_INTEL_GMA_VERSION_2=y
 CONFIG_DRIVERS_INTEL_PMC=y
 # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
@@ -679,6 +692,7 @@ CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
 # CONFIG_DRIVERS_SIL_3114 is not set
 CONFIG_DRIVERS_USB_ACPI=y
 CONFIG_DRIVERS_WIFI_GENERIC=y
+CONFIG_DRIVERS_MTK_WIFI=y
 CONFIG_MP_SERVICES_PPI=y
 CONFIG_MP_SERVICES_PPI_V2=y
 CONFIG_DRIVERS_INTEL_USB4_RETIMER=y
@@ -719,6 +733,7 @@ CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
 CONFIG_PCR_BOOT_MODE=1
 CONFIG_PCR_HWID=1
 CONFIG_PCR_SRTM=2
+CONFIG_PCR_FW_VER=10
 CONFIG_PCR_RUNTIME_DATA=3
 # end of Trusted Platform Module
 
@@ -738,6 +753,7 @@ CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
 # CONFIG_BOOTMEDIA_LOCK_CHIP is not set
 CONFIG_BOOTMEDIA_LOCK_WHOLE_RO=y
 # CONFIG_BOOTMEDIA_LOCK_WHOLE_NO_ACCESS is not set
+# CONFIG_BOOTMEDIA_LOCK_WPRO_VBOOT_RO is not set
 # CONFIG_BOOTMEDIA_SMM_BWP is not set
 # end of Security
 
@@ -752,6 +768,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH=y
 CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
 CONFIG_RTC=y
+CONFIG_HEAP_SIZE=0x100000
 
 #
 # Console
@@ -815,6 +832,13 @@ CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
+
+#
+# Dasharo specific payload options
+#
+# end of Dasharo specific payload options
+
+# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
 CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 
 #
@@ -839,6 +863,10 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 #
 # CONFIG_DISPLAY_MTRRS is not set
 
+#
+# Vendorcode Debug Settings
+#
+
 #
 # BLOB Debug Settings
 #