From 9977e635cbfef5ac61176a7e24d6c534591b04ae Mon Sep 17 00:00:00 2001 From: alexgithublab Date: Mon, 5 Aug 2024 12:21:24 +0200 Subject: [PATCH] add V5x --- .gitlab-ci.yml | 31 +++++++++++++ Makefile | 8 +++- nitropad-v54-defconfig | 101 +++++++++++++++++++++++++++++++++++++++++ nitropad-v54.mk | 10 ++++ nitropad-v56-defconfig | 101 +++++++++++++++++++++++++++++++++++++++++ nitropad-v56.mk | 10 ++++ 6 files changed, 259 insertions(+), 2 deletions(-) create mode 100644 nitropad-v54-defconfig create mode 100644 nitropad-v54.mk create mode 100644 nitropad-v56-defconfig create mode 100644 nitropad-v56.mk diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d3c1da..1bbd970 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -113,3 +113,34 @@ build-nitrowall: artifacts: paths: - artifacts + +build-nitropad-v54: + rules: + - if: '$CI_PIPELINE_SOURCE == "push"' + tags: + - docker + image: $CI_REGISTRY/nitrokey/coreboot-builder:latest + stage: build + script: + - make nitropad-v54 SKIP_DOCKER=true + - mkdir -p artifacts + - cp firmware-nitropad-v54.rom artifacts/ + artifacts: + paths: + - artifacts + + +build-nitropad-v56: + rules: + - if: '$CI_PIPELINE_SOURCE == "push"' + tags: + - docker + image: $CI_REGISTRY/nitrokey/coreboot-builder:latest + stage: build + script: + - make nitropad-v56 SKIP_DOCKER=true + - mkdir -p artifacts + - cp firmware-nitropad-v56.rom artifacts/ + artifacts: + paths: + - artifacts \ No newline at end of file diff --git a/Makefile b/Makefile index 9e5b05d..2713f07 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ endif all: @echo "no default target" @echo "choose any of: " - @echo " nitropc, nitrowall, nitrowall-pro, nitropad-nv41, nitropad-ns50, nitropc-v2" + @echo " nitropc, nitrowall, nitrowall-pro, nitropad-nv41, nitropad-ns50, nitropc-v2, nitropad-v54, nitropad-v56" nitropc: $(MAKE) TARGET=nitropc firmware-nitropc.rom @@ -47,7 +47,11 @@ nitropad-nv41: $(MAKE) TARGET=nitropad-nv41 firmware-nitropad-nv41.rom nitropad-ns50: $(MAKE) TARGET=nitropad-ns50 firmware-nitropad-ns50.rom - +nitropad-v54: + $(MAKE) TARGET=nitropad-v54 firmware-nitropad-v54.rom +nitropad-v56: + $(MAKE) TARGET=nitropad-v56 firmware-nitropad-v56.rom + coreboot/configs/defconfig: coreboot-update $(TARGET)-defconfig cp $(TARGET)-defconfig coreboot/configs/defconfig diff --git a/nitropad-v54-defconfig b/nitropad-v54-defconfig new file mode 100644 index 0000000..a69e3bd --- /dev/null +++ b/nitropad-v54-defconfig @@ -0,0 +1,101 @@ +CONFIG_LOCALVERSION="v0.9.0" +CONFIG_OPTION_BACKEND_NONE=y +CONFIG_VENDOR_CLEVO=y + +CONFIG_MAINBOARD_VERSION="v1.0" +#CONFIG_MAINBOARD_VENDOR="Nitrokey" +CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="NitroPad-V54" +CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Nitrokey" +CONFIG_IFD_BIN_PATH="flashdescriptor.bin" +CONFIG_ME_BIN_PATH="me.bin" + +# CONFIG_CONSOLE_SERIAL is not set +# CONFIG_POST_IO is not set +#CONFIG_VBOOT=y +CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 +CONFIG_PCIEXP_HOTPLUG_BUSES=42 +CONFIG_PCIEXP_HOTPLUG_MEM=0xc200000 +CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x1c000000 +#CONFIG_BOARD_NOVACUSTOM_NS5X_ADLP=y +CONFIG_UART_PCI_ADDR=0x0 + +CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 +CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 +CONFIG_I2C_TRANSFER_TIMEOUT_US=500000 +CONFIG_SMMSTORE_SIZE=0x40000 +# CONFIG_TPM_PPI is not set +CONFIG_CBFS_MCACHE_RW_PERCENTAGE=10 +CONFIG_VBOOT_KEYBLOCK_VERSION=1 +CONFIG_VBOOT_KEYBLOCK_PREAMBLE_FLAGS=0x0 + +CONFIG_EDK2_BOOTSPLASH_FILE="bootsplash.bmp" +CONFIG_EDK2_BOOT_TIMEOUT=2 + + +CONFIG_FMDFILE="src/mainboard/clevo/mtl-h/vboot-rwab.fmd" +# CONFIG_POST_IO is not set +CONFIG_VBOOT=y +CONFIG_BOARD_CLEVO_V540TU=y +# CONFIG_CONSOLE_POST is not set +CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=36 +CONFIG_HAVE_IFD_BIN=y +CONFIG_TPM_MEASURED_BOOT=y +CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y +CONFIG_FSP_HEADER_PATH="3rdparty/blobs/mainboard/clevo/mtl-h/FSP/MeteorLake/Include/" +CONFIG_FSP_FD_PATH="3rdparty/blobs/mainboard/clevo/mtl-h/FSP/MeteorLake/Fsp.fd" +CONFIG_BUILDING_WITH_DEBUG_FSP=y +CONFIG_SOFTWARE_CONNECTION_MANAGER=y +CONFIG_ENABLE_EARLY_DMA_PROTECTION=y +CONFIG_EC_SYSTEM76_EC_UPDATE=y +CONFIG_HAVE_ME_BIN=y +CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS=y +CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR=y +CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y +CONFIG_DRIVERS_EFI_VARIABLE_STORE=y +CONFIG_ADD_FSP_BINARIES=y +CONFIG_FSP_FULL_FD=y +CONFIG_CBFS_VERIFICATION=y +CONFIG_CBFS_ALLOW_UNVERIFIED_DECOMPRESSION=y +CONFIG_VBOOT_CBFS_INTEGRATION=y +CONFIG_TPM_RDRESP_NEED_DELAY=y +CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y +CONFIG_BOOTMEDIA_LOCK_WPRO_VBOOT_RO=y +CONFIG_BOOTMEDIA_SMM_BWP=y +CONFIG_PAYLOAD_EDK2=y +CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2" +CONFIG_EDK2_TAG_OR_REV="cc2be2284a311b6804e83d09477db203c9d270be" +CONFIG_EDK2_USE_EDK2_PLATFORMS=y +CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms" +CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf" +CONFIG_EDK2_CBMEM_LOGGING=y +CONFIG_EDK2_FOLLOW_BGRT_SPEC=y +CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" +CONFIG_EDK2_CPU_THROTTLING_THRESHOLD_OPTION=y +CONFIG_BUILD_IPXE=y +CONFIG_IPXE_ADD_SCRIPT=y +CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe" +CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789" +CONFIG_EDK2_SYSTEM76_EC_LOGGING=y +CONFIG_EDK2_SKIP_PS2_DETECT=y +CONFIG_EDK2_ENABLE_IPXE=y +# CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set +CONFIG_EDK2_SETUP_PASSWORD=y +CONFIG_EDK2_PERFORMANCE_MEASUREMENT_ENABLE=y +CONFIG_EDK2_DASHARO_SYSTEM_FEATURES=y +CONFIG_EDK2_DASHARO_SECURITY_OPTIONS=y +CONFIG_EDK2_SHOW_CAMERA_OPTION=y +CONFIG_EDK2_SHOW_WIFI_BT_OPTION=y +CONFIG_EDK2_DASHARO_INTEL_ME_OPTIONS=y +CONFIG_EDK2_DASHARO_USB_CONFIG=y +CONFIG_EDK2_DASHARO_NETWORK_CONFIG=y +CONFIG_EDK2_DASHARO_POWER_CONFIG=y +CONFIG_EDK2_FAN_CURVE_OPTION=y +CONFIG_EDK2_BATTERY_CONFIG_OPTION=y +CONFIG_EDK2_BOOT_MENU_KEY=0x0011 +CONFIG_EDK2_SETUP_MENU_KEY=0x000C +CONFIG_EDK2_ENABLE_BATTERY_CHECK=y +CONFIG_EDK2_PRINT_SOL_STRINGS=y +CONFIG_EDK2_LAN_ROM_DRIVER="3rdparty/blobs/mainboard/clevo/mtl-h/LanRom.efi" +CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y +CONFIG_CHECK_GPIO_CONFIG_CHANGES=y \ No newline at end of file diff --git a/nitropad-v54.mk b/nitropad-v54.mk new file mode 100644 index 0000000..292a9b2 --- /dev/null +++ b/nitropad-v54.mk @@ -0,0 +1,10 @@ + +COREBOOT_REF = novacustom_v54x_mtl_v0.9.0 + +coreboot/build/coreboot.rom: coreboot/configs/defconfig coreboot/util/crossgcc/xgcc blobs-update + + cp blobs/nitropad-v54/*.bin coreboot/ + cp blobs/common/bootsplash-1080.bmp coreboot/bootsplash.bmp + cd coreboot && git checkout $(COREBOOT_REF) + + make -C coreboot CPUS=$(CPU_COUNT) diff --git a/nitropad-v56-defconfig b/nitropad-v56-defconfig new file mode 100644 index 0000000..18ef564 --- /dev/null +++ b/nitropad-v56-defconfig @@ -0,0 +1,101 @@ +CONFIG_LOCALVERSION="v0.9.0" +CONFIG_OPTION_BACKEND_NONE=y +CONFIG_VENDOR_CLEVO=y + +CONFIG_MAINBOARD_VERSION="v1.0" +#CONFIG_MAINBOARD_VENDOR="Nitrokey" +CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="NitroPad-V56" +CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Nitrokey" +CONFIG_IFD_BIN_PATH="flashdescriptor.bin" +CONFIG_ME_BIN_PATH="me.bin" + +# CONFIG_CONSOLE_SERIAL is not set +# CONFIG_POST_IO is not set +#CONFIG_VBOOT=y +CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 +CONFIG_PCIEXP_HOTPLUG_BUSES=42 +CONFIG_PCIEXP_HOTPLUG_MEM=0xc200000 +CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x1c000000 +#CONFIG_BOARD_NOVACUSTOM_NS5X_ADLP=y +CONFIG_UART_PCI_ADDR=0x0 + +CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 +CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 +CONFIG_I2C_TRANSFER_TIMEOUT_US=500000 +CONFIG_SMMSTORE_SIZE=0x40000 +# CONFIG_TPM_PPI is not set +CONFIG_CBFS_MCACHE_RW_PERCENTAGE=10 +CONFIG_VBOOT_KEYBLOCK_VERSION=1 +CONFIG_VBOOT_KEYBLOCK_PREAMBLE_FLAGS=0x0 + +CONFIG_EDK2_BOOTSPLASH_FILE="bootsplash.bmp" +CONFIG_EDK2_BOOT_TIMEOUT=2 + + +CONFIG_FMDFILE="src/mainboard/clevo/mtl-h/vboot-rwab.fmd" +# CONFIG_POST_IO is not set +CONFIG_VBOOT=y +CONFIG_BOARD_CLEVO_V560TU=y +# CONFIG_CONSOLE_POST is not set +CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=36 +CONFIG_HAVE_IFD_BIN=y +CONFIG_TPM_MEASURED_BOOT=y +CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y +CONFIG_FSP_HEADER_PATH="3rdparty/blobs/mainboard/clevo/mtl-h/FSP/MeteorLake/Include/" +CONFIG_FSP_FD_PATH="3rdparty/blobs/mainboard/clevo/mtl-h/FSP/MeteorLake/Fsp.fd" +CONFIG_BUILDING_WITH_DEBUG_FSP=y +CONFIG_SOFTWARE_CONNECTION_MANAGER=y +CONFIG_ENABLE_EARLY_DMA_PROTECTION=y +CONFIG_EC_SYSTEM76_EC_UPDATE=y +CONFIG_HAVE_ME_BIN=y +CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS=y +CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR=y +CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y +CONFIG_DRIVERS_EFI_VARIABLE_STORE=y +CONFIG_ADD_FSP_BINARIES=y +CONFIG_FSP_FULL_FD=y +CONFIG_CBFS_VERIFICATION=y +CONFIG_CBFS_ALLOW_UNVERIFIED_DECOMPRESSION=y +CONFIG_VBOOT_CBFS_INTEGRATION=y +CONFIG_TPM_RDRESP_NEED_DELAY=y +CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y +CONFIG_BOOTMEDIA_LOCK_WPRO_VBOOT_RO=y +CONFIG_BOOTMEDIA_SMM_BWP=y +CONFIG_PAYLOAD_EDK2=y +CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2" +CONFIG_EDK2_TAG_OR_REV="cc2be2284a311b6804e83d09477db203c9d270be" +CONFIG_EDK2_USE_EDK2_PLATFORMS=y +CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms" +CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf" +CONFIG_EDK2_CBMEM_LOGGING=y +CONFIG_EDK2_FOLLOW_BGRT_SPEC=y +CONFIG_EDK2_SERIAL_SUPPORT=y +CONFIG_EDK2_CUSTOM_BUILD_PARAMS="" +CONFIG_EDK2_CPU_THROTTLING_THRESHOLD_OPTION=y +CONFIG_BUILD_IPXE=y +CONFIG_IPXE_ADD_SCRIPT=y +CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe" +CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789" +CONFIG_EDK2_SYSTEM76_EC_LOGGING=y +CONFIG_EDK2_SKIP_PS2_DETECT=y +CONFIG_EDK2_ENABLE_IPXE=y +# CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set +CONFIG_EDK2_SETUP_PASSWORD=y +CONFIG_EDK2_PERFORMANCE_MEASUREMENT_ENABLE=y +CONFIG_EDK2_DASHARO_SYSTEM_FEATURES=y +CONFIG_EDK2_DASHARO_SECURITY_OPTIONS=y +CONFIG_EDK2_SHOW_CAMERA_OPTION=y +CONFIG_EDK2_SHOW_WIFI_BT_OPTION=y +CONFIG_EDK2_DASHARO_INTEL_ME_OPTIONS=y +CONFIG_EDK2_DASHARO_USB_CONFIG=y +CONFIG_EDK2_DASHARO_NETWORK_CONFIG=y +CONFIG_EDK2_DASHARO_POWER_CONFIG=y +CONFIG_EDK2_FAN_CURVE_OPTION=y +CONFIG_EDK2_BATTERY_CONFIG_OPTION=y +CONFIG_EDK2_BOOT_MENU_KEY=0x0011 +CONFIG_EDK2_SETUP_MENU_KEY=0x000C +CONFIG_EDK2_ENABLE_BATTERY_CHECK=y +CONFIG_EDK2_PRINT_SOL_STRINGS=y +CONFIG_EDK2_LAN_ROM_DRIVER="3rdparty/blobs/mainboard/clevo/mtl-h/LanRom.efi" +CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y +CONFIG_CHECK_GPIO_CONFIG_CHANGES=y \ No newline at end of file diff --git a/nitropad-v56.mk b/nitropad-v56.mk new file mode 100644 index 0000000..039c25d --- /dev/null +++ b/nitropad-v56.mk @@ -0,0 +1,10 @@ + +COREBOOT_REF = novacustom_v56x_mtl_v0.9.0 + +coreboot/build/coreboot.rom: coreboot/configs/defconfig coreboot/util/crossgcc/xgcc blobs-update + + cp blobs/nitropad-v56/*.bin coreboot/ + cp blobs/common/bootsplash-1080.bmp coreboot/bootsplash.bmp + cd coreboot && git checkout $(COREBOOT_REF) + + make -C coreboot CPUS=$(CPU_COUNT)