Skip to content

Commit c625b77

Browse files
committed
Revert: Dasharo forks build their own toolchain
Dasharo boards cannot share toolchains with upstream coreboot releases or each other due to FSP header compatibility issues: - Dasharo's custom FSP packages (in 3rdparty/dasharo-blobs/) are missing headers that their coreboot fork code expects (MemInfoHob.h, etc) - Upstream FSP packages have different headers that Dasharo's code includes (FirmwareVersionInfoHob.h vs FirmwareVersionInfo.h) This reverts the toolchain sharing optimization and returns to having each Dasharo fork build its own crossgcc toolchain. Removed coreboot-24.12 and coreboot-25.03 from cache (only needed if Dasharo forks could share toolchains, which they can't).
1 parent 4030da1 commit c625b77

2 files changed

Lines changed: 32 additions & 34 deletions

File tree

.circleci/config.yml

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,8 @@ jobs:
204204
- build/x86/coreboot-4.20.1
205205
- build/x86/coreboot-4.22.01
206206
- build/x86/coreboot-24.02.01
207-
- build/x86/coreboot-24.12
208-
- build/x86/coreboot-25.03
209207
- build/x86/coreboot-25.09
210-
# Dasharo forks (coreboot git checkouts, not releases)
208+
# Dasharo forks (each builds its own toolchain from the Dasharo coreboot fork)
211209
- build/x86/coreboot-dasharo_v56
212210
- build/x86/coreboot-dasharo_nv4x
213211
- build/x86/coreboot-dasharo_msi_z790
@@ -263,18 +261,21 @@ workflows:
263261
requires:
264262
- x86-musl-cross-make
265263

266-
# Toolchain: 24.12 (used by dasharo_nv4x, dasharo_msi_z690, dasharo_msi_z790)
264+
# Dasharo forks each build their own crossgcc toolchain from the Dasharo coreboot fork.
265+
# They cannot reuse upstream toolchains due to FSP header compatibility issues.
266+
267+
# Dasharo v56 (V540TU/V560TU) - builds its own toolchain
267268
- build_and_persist:
268-
name: novacustom-nv4x_adl
269-
target: novacustom-nv4x_adl
269+
name: novacustom-v560tu
270+
target: novacustom-v560tu
270271
subcommand: ""
271272
requires:
272273
- x86-musl-cross-make
273274

274-
# Toolchain: 25.03 (used by dasharo_v56)
275+
# Dasharo nv4x (NV4x ADL/NS50) - builds its own toolchain
275276
- build_and_persist:
276-
name: novacustom-v560tu
277-
target: novacustom-v560tu
277+
name: novacustom-nv4x_adl
278+
target: novacustom-nv4x_adl
278279
subcommand: ""
279280
requires:
280281
- x86-musl-cross-make
@@ -582,19 +583,28 @@ workflows:
582583
- EOL_t480-hotp-maximized
583584

584585
#----------------------------------------
585-
# Toolchain 24.12 (dasharo_nv4x, dasharo_msi_z690, dasharo_msi_z790)
586+
# Dasharo forks - each builds its own toolchain
586587
#----------------------------------------
587-
# These boards share the 24.12 toolchain from novacustom-nv4x_adl
588+
# Note: Dasharo boards cannot share toolchains with upstream coreboot releases
589+
# because their custom FSP headers are incompatible with upstream FSP packages.
590+
591+
# dasharo_v56: V560TU builds its own toolchain, V540TU depends on it
592+
- build:
593+
name: novacustom-v540tu
594+
target: novacustom-v540tu
595+
subcommand: ""
596+
requires:
597+
- novacustom-v560tu
588598

589-
# dasharo_nv4x: NV4x ADL / NS50
599+
# dasharo_nv4x: NV4x ADL builds its own toolchain
590600
- build:
591601
name: UNTESTED_nitropad-ns50
592602
target: UNTESTED_nitropad-ns50
593603
subcommand: ""
594604
requires:
595605
- novacustom-nv4x_adl
596606

597-
# dasharo_msi_z690: MSI Z690 boards
607+
# dasharo_msi_z690: builds on nv4x toolchain (both based on same Dasharo fork)
598608
- build:
599609
name: UNTESTED_msi_z690a_ddr4
600610
target: UNTESTED_msi_z690a_ddr4
@@ -609,7 +619,7 @@ workflows:
609619
requires:
610620
- UNTESTED_msi_z690a_ddr4
611621

612-
# dasharo_msi_z790: MSI Z790 boards
622+
# dasharo_msi_z790: builds on nv4x toolchain (both based on same Dasharo fork)
613623
- build:
614624
name: UNTESTED_msi_z790p_ddr4
615625
target: UNTESTED_msi_z790p_ddr4
@@ -623,15 +633,3 @@ workflows:
623633
subcommand: ""
624634
requires:
625635
- UNTESTED_msi_z790p_ddr4
626-
627-
#----------------------------------------
628-
# Toolchain 25.03 (dasharo_v56)
629-
#----------------------------------------
630-
# These boards share the 25.03 toolchain from novacustom-v560tu
631-
632-
- build:
633-
name: novacustom-v540tu
634-
target: novacustom-v540tu
635-
subcommand: ""
636-
requires:
637-
- novacustom-v560tu

modules/coreboot

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,33 +104,33 @@ $(eval $(call coreboot_module,purism,24.02.01))
104104

105105
# NovaCustom V560TU/V540TU (Meteor Lake)
106106
# Tag: novacustom_v56x_mtl_igpu_v1.0.1 (SHA: 6de027d1)
107-
# Based on coreboot 25.03, uses 25.03 toolchain
107+
# Based on coreboot 25.03
108108
coreboot-dasharo_v56_repo := https://github.com/dasharo/coreboot
109109
coreboot-dasharo_v56_commit_hash := 6de027d1f0a62753182237ce3d793e5ba0395139
110-
$(eval $(call coreboot_module,dasharo_v56,25.03))
110+
$(eval $(call coreboot_module,dasharo_v56,))
111111
coreboot-dasharo_v56_patch_version := unreleased
112112

113113
# NovaCustom NV4x ADL / NS50
114114
# Tag: novacustom_nv4x_adl_v1.8.0 (SHA: 281a7fec)
115-
# Based on coreboot 24.12, uses 24.12 toolchain
115+
# Based on coreboot 24.12
116116
coreboot-dasharo_nv4x_repo := https://github.com/dasharo/coreboot
117117
coreboot-dasharo_nv4x_commit_hash := 281a7fec1a1e7aed781b12a096c2fc0f87dc51b5
118-
$(eval $(call coreboot_module,dasharo_nv4x,24.12))
118+
$(eval $(call coreboot_module,dasharo_nv4x,))
119119
#coreboot-dasharo_nv4x_patch_version := unreleased
120120

121121
# MSI Z790 boards
122122
# Tag: msi_ms7e06_v0.9.4 (SHA: a5a05f13)
123-
# Based on coreboot 24.12, uses 24.12 toolchain
123+
# Based on coreboot 24.12
124124
coreboot-dasharo_msi_z790_repo := https://github.com/dasharo/coreboot
125125
coreboot-dasharo_msi_z790_commit_hash := a5a05f133471c0463609631b599cdd88a623561f
126-
$(eval $(call coreboot_module,dasharo_msi_z790,24.12))
126+
$(eval $(call coreboot_module,dasharo_msi_z790,))
127127

128128
# MSI Z690 boards
129129
# Tag: msi_ms7d25_v1.1.6 (SHA: be7d58da)
130-
# Based on coreboot 24.12, uses 24.12 toolchain
130+
# Based on coreboot 24.12
131131
coreboot-dasharo_msi_z690_repo := https://github.com/dasharo/coreboot
132132
coreboot-dasharo_msi_z690_commit_hash := be7d58dac9365d8981dbb1f5c6bbbcce35df8636
133-
$(eval $(call coreboot_module,dasharo_msi_z690,24.12))
133+
$(eval $(call coreboot_module,dasharo_msi_z690,))
134134

135135
# T480 is based on coreboot ~25.09 release
136136
# coreboot 25.09 doesn't include Thunderbolt support and support of the lower USB-C port which is still under review at https://review.coreboot.org/c/coreboot/+/75286 and https://review.coreboot.org/c/coreboot/+/88490

0 commit comments

Comments
 (0)