Merge pull request #1793 from tlaurion/move_nitropad-nv41_to_novacust…

…om-v41 Change board name from nitropad-nv41 -> novacustom_nv4x_adl
linuxboot · Nov 15, 2024 · 045c71e · 045c71e
2 parents cd683b1 + 6746058
commit 045c71e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -250,8 +250,8 @@ workflows:
       # No need to wait further for other board's cache
       # We reuse built modules from x230-hotp-maximized cache only
       - build_and_persist:
-          name: nitropad-nv41
-          target: nitropad-nv41
+          name: novacustom_nv4x_adl
+          target: novacustom_nv4x_adl
           subcommand: ""
           requires:
             - x86-musl-cross-make
@@ -516,7 +516,7 @@ workflows:
           target: nitropad-ns50
           subcommand: ""
           requires:
-            - nitropad-nv41
+            - novacustom_nv4x_adl
 
       # coreboot 4.11
       - build:

diff --git a/boards/nitropad-nv41/nitropad-nv41.config → ...ustom_nv4x_adl/novacustom_nv4x_adl.config b/boards/nitropad-nv41/nitropad-nv41.config → ...ustom_nv4x_adl/novacustom_nv4x_adl.config
@@ -1,11 +1,11 @@
-# Nitrokey Nitropad NV41 board configuration
+# NovaCustom NV4x 12th Gen (nv40pz: Alder Lake) board configuration
 # Note: for reference, other GOP enabled FB board is librem_11
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=dasharo
 export CONFIG_LINUX_VERSION=6.1.8
 
-CONFIG_COREBOOT_CONFIG=config/coreboot-nitropad-nv41.config
+CONFIG_COREBOOT_CONFIG=config/coreboot-novacustom_nv4x_adl.config
 CONFIG_LINUX_CONFIG=config/linux-nitropad-x.config
 
 #Enable DEBUG output
@@ -67,6 +67,6 @@ 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="Nitropad NV41"
+export CONFIG_BOARD_NAME="NovaCustom NV4x 12th Gen"
 export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 export CONFIG_AUTO_BOOT_TIMEOUT=5
diff --git a/config/coreboot-nitropad-nv41.config → config/coreboot-novacustom_nv4x_adl.config b/config/coreboot-nitropad-nv41.config → config/coreboot-novacustom_nv4x_adl.config
@@ -131,7 +131,7 @@ CONFIG_VBOOT_VBNV_OFFSET=0x28
 CONFIG_VARIANT_DIR="nv40pz"
 CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
 # CONFIG_VGA_BIOS is not set
-CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Nitrokey"
+CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Notebook"
 CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
 # CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0x4000
@@ -140,7 +140,7 @@ CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_BOARD_CLEVO_ADLP_COMMON=y
 CONFIG_BOARD_CLEVO_NV40PZ_BASE=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Nitropad NV41"
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="NV4xPZ"
 CONFIG_CONSOLE_POST=y
 # CONFIG_USE_PM_ACPI_TIMER is not set
 CONFIG_TPM_PIRQ=0x27