From 82b9feadb9ed101fade35dc15440cc1b4f2f180e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= <michal.zygowski@3mdeb.com>
Date: Mon, 16 Dec 2024 12:03:39 +0100
Subject: [PATCH 1/2] configs/config.novacustom: Fix iPXE and edk2 options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix the iPXE options, which were set incorrectly and did not result
in building iPXE with correct menu and reproducibility.

Also enabel ESP scanning for automated validation and CPU throttling,
which was originally designed for laptops, but none of them actually
use it.

Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com>
---
 configs/config.novacustom_ns5x_adl | 8 ++++++++
 configs/config.novacustom_ns5x_tgl | 8 ++++++++
 configs/config.novacustom_nv4x_adl | 8 ++++++++
 configs/config.novacustom_nv4x_tgl | 8 ++++++++
 4 files changed, 32 insertions(+)

diff --git a/configs/config.novacustom_ns5x_adl b/configs/config.novacustom_ns5x_adl
index 5cfefbd7119..483a1124154 100644
--- a/configs/config.novacustom_ns5x_adl
+++ b/configs/config.novacustom_ns5x_adl
@@ -35,6 +35,12 @@ CONFIG_EDK2_CBMEM_LOGGING=y
 CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
 CONFIG_EDK2_SERIAL_SUPPORT=y
 CONFIG_EDK2_CUSTOM_BUILD_PARAMS="-D VARIABLE_SUPPORT=SMMSTORE --pcd gDasharoSystemFeaturesTokenSpaceGuid.PcdS3SupportExperimental=TRUE"
+CONFIG_BUILD_IPXE=y
+# CONFIG_IPXE_SERIAL_CONSOLE is not set
+CONFIG_IPXE_NO_PROMPT=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
@@ -52,7 +58,9 @@ CONFIG_EDK2_DASHARO_POWER_CONFIG=y
 CONFIG_EDK2_SLEEP_TYPE_OPTION=y
 CONFIG_EDK2_FAN_CURVE_OPTION=y
 CONFIG_EDK2_BATTERY_CONFIG_OPTION=y
+CONFIG_EDK2_CPU_THROTTLING_THRESHOLD_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_CREATE_PREINSTALLED_BOOT_OPTIONS=y
diff --git a/configs/config.novacustom_ns5x_tgl b/configs/config.novacustom_ns5x_tgl
index 2d769d8b762..82c2181749f 100644
--- a/configs/config.novacustom_ns5x_tgl
+++ b/configs/config.novacustom_ns5x_tgl
@@ -35,6 +35,12 @@ CONFIG_EDK2_CBMEM_LOGGING=y
 CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
 CONFIG_EDK2_SERIAL_SUPPORT=y
 CONFIG_EDK2_CUSTOM_BUILD_PARAMS="-D VARIABLE_SUPPORT=SMMSTORE --pcd gDasharoSystemFeaturesTokenSpaceGuid.PcdS3SupportExperimental=TRUE"
+CONFIG_BUILD_IPXE=y
+# CONFIG_IPXE_SERIAL_CONSOLE is not set
+CONFIG_IPXE_NO_PROMPT=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
@@ -52,7 +58,9 @@ CONFIG_EDK2_DASHARO_POWER_CONFIG=y
 CONFIG_EDK2_SLEEP_TYPE_OPTION=y
 CONFIG_EDK2_FAN_CURVE_OPTION=y
 CONFIG_EDK2_BATTERY_CONFIG_OPTION=y
+CONFIG_EDK2_CPU_THROTTLING_THRESHOLD_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_CREATE_PREINSTALLED_BOOT_OPTIONS=y
diff --git a/configs/config.novacustom_nv4x_adl b/configs/config.novacustom_nv4x_adl
index 5ddb6780c05..3b49b12b080 100644
--- a/configs/config.novacustom_nv4x_adl
+++ b/configs/config.novacustom_nv4x_adl
@@ -35,6 +35,12 @@ CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
 CONFIG_EDK2_CBMEM_LOGGING=y
 CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
 CONFIG_EDK2_SERIAL_SUPPORT=y
+CONFIG_BUILD_IPXE=y
+# CONFIG_IPXE_SERIAL_CONSOLE is not set
+CONFIG_IPXE_NO_PROMPT=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
@@ -52,7 +58,9 @@ CONFIG_EDK2_DASHARO_POWER_CONFIG=y
 CONFIG_EDK2_SLEEP_TYPE_OPTION=y
 CONFIG_EDK2_FAN_CURVE_OPTION=y
 CONFIG_EDK2_BATTERY_CONFIG_OPTION=y
+CONFIG_EDK2_CPU_THROTTLING_THRESHOLD_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_CREATE_PREINSTALLED_BOOT_OPTIONS=y
diff --git a/configs/config.novacustom_nv4x_tgl b/configs/config.novacustom_nv4x_tgl
index 15f8d239a64..3c82b01e3e2 100644
--- a/configs/config.novacustom_nv4x_tgl
+++ b/configs/config.novacustom_nv4x_tgl
@@ -35,6 +35,12 @@ CONFIG_EDK2_CBMEM_LOGGING=y
 CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
 CONFIG_EDK2_SERIAL_SUPPORT=y
 CONFIG_EDK2_CUSTOM_BUILD_PARAMS="-D VARIABLE_SUPPORT=SMMSTORE --pcd gDasharoSystemFeaturesTokenSpaceGuid.PcdS3SupportExperimental=TRUE"
+CONFIG_BUILD_IPXE=y
+# CONFIG_IPXE_SERIAL_CONSOLE is not set
+CONFIG_IPXE_NO_PROMPT=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
@@ -52,7 +58,9 @@ CONFIG_EDK2_DASHARO_POWER_CONFIG=y
 CONFIG_EDK2_SLEEP_TYPE_OPTION=y
 CONFIG_EDK2_FAN_CURVE_OPTION=y
 CONFIG_EDK2_BATTERY_CONFIG_OPTION=y
+CONFIG_EDK2_CPU_THROTTLING_THRESHOLD_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_CREATE_PREINSTALLED_BOOT_OPTIONS=y

From 7000ed66ab71ecb22b40fa44bf87bb7eaa90a04d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= <michal.zygowski@3mdeb.com>
Date: Mon, 16 Dec 2024 12:07:54 +0100
Subject: [PATCH 2/2] configs/config.novacustom: Enable CBFS Serial Number and
 UUID
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com>
---
 configs/config.novacustom_ns5x_adl | 2 ++
 configs/config.novacustom_ns5x_tgl | 2 ++
 configs/config.novacustom_nv4x_adl | 2 ++
 configs/config.novacustom_nv4x_tgl | 2 ++
 configs/config.novacustom_v540tnx  | 2 ++
 configs/config.novacustom_v540tu   | 2 ++
 configs/config.novacustom_v560tnx  | 2 ++
 configs/config.novacustom_v560tu   | 2 ++
 8 files changed, 16 insertions(+)

diff --git a/configs/config.novacustom_ns5x_adl b/configs/config.novacustom_ns5x_adl
index 483a1124154..ea9c96572ed 100644
--- a/configs/config.novacustom_ns5x_adl
+++ b/configs/config.novacustom_ns5x_adl
@@ -19,6 +19,8 @@ CONFIG_HAVE_ME_BIN=y
 CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y
 CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
+CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
+CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
 CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
 CONFIG_BOOTMEDIA_LOCK_WPRO_VBOOT_RO=y
 CONFIG_BOOTMEDIA_LOCK_IN_VERSTAGE=y
diff --git a/configs/config.novacustom_ns5x_tgl b/configs/config.novacustom_ns5x_tgl
index 82c2181749f..36b5d5da3dd 100644
--- a/configs/config.novacustom_ns5x_tgl
+++ b/configs/config.novacustom_ns5x_tgl
@@ -19,6 +19,8 @@ CONFIG_HAVE_ME_BIN=y
 CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y
 CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
+CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
+CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
 CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
 CONFIG_BOOTMEDIA_LOCK_WPRO_VBOOT_RO=y
 CONFIG_BOOTMEDIA_LOCK_IN_VERSTAGE=y
diff --git a/configs/config.novacustom_nv4x_adl b/configs/config.novacustom_nv4x_adl
index 3b49b12b080..e0bc5dce28f 100644
--- a/configs/config.novacustom_nv4x_adl
+++ b/configs/config.novacustom_nv4x_adl
@@ -20,6 +20,8 @@ CONFIG_HAVE_ME_BIN=y
 CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y
 CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
+CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
+CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
 CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
 CONFIG_BOOTMEDIA_LOCK_WPRO_VBOOT_RO=y
 CONFIG_BOOTMEDIA_LOCK_IN_VERSTAGE=y
diff --git a/configs/config.novacustom_nv4x_tgl b/configs/config.novacustom_nv4x_tgl
index 3c82b01e3e2..15856c0fc37 100644
--- a/configs/config.novacustom_nv4x_tgl
+++ b/configs/config.novacustom_nv4x_tgl
@@ -19,6 +19,8 @@ CONFIG_HAVE_ME_BIN=y
 CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y
 CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
+CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
+CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
 CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
 CONFIG_BOOTMEDIA_LOCK_WPRO_VBOOT_RO=y
 CONFIG_BOOTMEDIA_LOCK_IN_VERSTAGE=y
diff --git a/configs/config.novacustom_v540tnx b/configs/config.novacustom_v540tnx
index c42a68804b8..753dc3d794c 100644
--- a/configs/config.novacustom_v540tnx
+++ b/configs/config.novacustom_v540tnx
@@ -25,6 +25,8 @@ CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
 CONFIG_SUBSYSTEM_DEVICE_ID=0xa741
 CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
+CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
+CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
 CONFIG_ADD_FSP_BINARIES=y
 CONFIG_FSP_FULL_FD=y
 CONFIG_CBFS_VERIFICATION=y
diff --git a/configs/config.novacustom_v540tu b/configs/config.novacustom_v540tu
index be17b79b753..0f5507a8bae 100644
--- a/configs/config.novacustom_v540tu
+++ b/configs/config.novacustom_v540tu
@@ -27,6 +27,8 @@ 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_DRIVERS_GENERIC_CBFS_SERIAL=y
+CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
 CONFIG_ADD_FSP_BINARIES=y
 CONFIG_FSP_FULL_FD=y
 CONFIG_CBFS_VERIFICATION=y
diff --git a/configs/config.novacustom_v560tnx b/configs/config.novacustom_v560tnx
index e38081eb67c..a3003a1a8ce 100644
--- a/configs/config.novacustom_v560tnx
+++ b/configs/config.novacustom_v560tnx
@@ -25,6 +25,8 @@ CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
 CONFIG_SUBSYSTEM_DEVICE_ID=0xa741
 CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
+CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
+CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
 CONFIG_ADD_FSP_BINARIES=y
 CONFIG_FSP_FULL_FD=y
 CONFIG_CBFS_VERIFICATION=y
diff --git a/configs/config.novacustom_v560tu b/configs/config.novacustom_v560tu
index db58b18cd22..c3c82640415 100644
--- a/configs/config.novacustom_v560tu
+++ b/configs/config.novacustom_v560tu
@@ -27,6 +27,8 @@ 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_DRIVERS_GENERIC_CBFS_SERIAL=y
+CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
 CONFIG_ADD_FSP_BINARIES=y
 CONFIG_FSP_FULL_FD=y
 CONFIG_CBFS_VERIFICATION=y