Skip to content

Ec build #2062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
macpijan wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Ec build #2062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f9a7bf
modules/dasharo-ec: new module
macpijan Feb 27, 2026
03dbe2e
toolchain: add sdcc and xxd
macpijan Feb 27, 2026
32ec30a
Prepare nix based docker image to be bumped to v0.2.9 to include mini…
tlaurion Feb 27, 2026
ea9b4d8
modules/dasharo-ec: fix build system and address review feedback
filipleple Apr 8, 2026
ae03e59
modules/dasharo-ec: address review feedback and add nv4x_adl/ns50 sup…
filipleple Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ commands:
jobs:
prep_env:
docker:
# Docker image: tlaurion/heads-dev-env:v0.2.7
- image: tlaurion/heads-dev-env@sha256:5f890f3d1b6b57f9e567191695df003a2ee880f084f5dfe7a5633e3e8f937479
# Docker image: tlaurion/heads-dev-env:v0.2.9
Copy link
Copy Markdown
Collaborator

@tlaurion tlaurion Mar 13, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's v0.2.9 (commit msg says v0.2.8)

Copy link
Copy Markdown
Contributor

@filipleple filipleple Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed: 32ec30a

- image: tlaurion/heads-dev-env@sha256:96f8f91c6464305c4a990d59f9ef93910c16c7fd0501a46b43b34a4600a368de
resource_class: large
working_directory: ~/heads
steps:
Expand Down Expand Up @@ -124,8 +124,8 @@ jobs:

build_and_persist:
docker:
# Docker image: tlaurion/heads-dev-env:v0.2.7
- image: tlaurion/heads-dev-env@sha256:5f890f3d1b6b57f9e567191695df003a2ee880f084f5dfe7a5633e3e8f937479
# Docker image: tlaurion/heads-dev-env:v0.2.9
- image: tlaurion/heads-dev-env@sha256:96f8f91c6464305c4a990d59f9ef93910c16c7fd0501a46b43b34a4600a368de
resource_class: large
working_directory: ~/heads
parameters:
Expand Down Expand Up @@ -153,8 +153,8 @@ jobs:

build:
docker:
# Docker image: tlaurion/heads-dev-env:v0.2.7
- image: tlaurion/heads-dev-env@sha256:5f890f3d1b6b57f9e567191695df003a2ee880f084f5dfe7a5633e3e8f937479
# Docker image: tlaurion/heads-dev-env:v0.2.9
- image: tlaurion/heads-dev-env@sha256:96f8f91c6464305c4a990d59f9ef93910c16c7fd0501a46b43b34a4600a368de
resource_class: large
working_directory: ~/heads
parameters:
Expand All @@ -175,8 +175,8 @@ jobs:

save_cache:
docker:
# Docker image: tlaurion/heads-dev-env:v0.2.7
- image: tlaurion/heads-dev-env@sha256:5f890f3d1b6b57f9e567191695df003a2ee880f084f5dfe7a5633e3e8f937479
# Docker image: tlaurion/heads-dev-env:v0.2.9
- image: tlaurion/heads-dev-env@sha256:96f8f91c6464305c4a990d59f9ef93910c16c7fd0501a46b43b34a4600a368de
resource_class: large
working_directory: ~/heads
steps:
Expand Down
1 change: 1 addition & 0 deletions boards/novacustom-v540tu/novacustom-v540tu.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=dasharo
export CONFIG_DASHARO_EC=y
export CONFIG_LINUX_VERSION=6.1.8

CONFIG_COREBOOT_CONFIG=config/coreboot-novacustom-v540tu.config
Expand Down
1 change: 1 addition & 0 deletions boards/novacustom-v560tu/novacustom-v560tu.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=dasharo
export CONFIG_DASHARO_EC=y
export CONFIG_LINUX_VERSION=6.1.8

CONFIG_COREBOOT_CONFIG=config/coreboot-novacustom-v560tu.config
Expand Down
5 changes: 3 additions & 2 deletions config/coreboot-novacustom-v540tu.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,8 +543,9 @@ CONFIG_RCBA_LENGTH=0x4000
# Embedded Controllers
#
CONFIG_EC_ACPI=y
CONFIG_EC_SYSTEM76_EC=y
# CONFIG_EC_SYSTEM76_EC_UPDATE is not set
CONFIG_EC_DASHARO_EC=y
CONFIG_EC_DASHARO_EC_UPDATE=y
CONFIG_EC_DASHARO_EC_UPDATE_FILE="ec.rom"
Copy link
Copy Markdown
Contributor

@SergiiDmytruk SergiiDmytruk Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 2 board configs (boards/novacustom-v540tu/novacustom-v540tu.config and boards/novacustom-v560tu/novacustom-v560tu.config) are updated, but only one coreboot config (config/coreboot-novacustom-v540tu.config)?

Copy link
Copy Markdown
Contributor

@filipleple filipleple Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated for parity: ae03e59#diff-cd6c77c896e7b2aeb7a304668a2a24286b118a39f2361a14be86655eb891542fR546


#
# Intel Firmware
Expand Down
5 changes: 3 additions & 2 deletions config/coreboot-novacustom-v560tu.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,8 +543,9 @@ CONFIG_RCBA_LENGTH=0x4000
# Embedded Controllers
#
CONFIG_EC_ACPI=y
CONFIG_EC_SYSTEM76_EC=y
# CONFIG_EC_SYSTEM76_EC_UPDATE is not set
CONFIG_EC_DASHARO_EC=y
CONFIG_EC_DASHARO_EC_UPDATE=y
CONFIG_EC_DASHARO_EC_UPDATE_FILE="ec.rom"

#
# Intel Firmware
Expand Down
4 changes: 2 additions & 2 deletions docker/DOCKER_REPRO_DIGEST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

# Place the digest on the first non-comment line below (remove the leading '#')
# Version: v0.2.7
sha256:5f890f3d1b6b57f9e567191695df003a2ee880f084f5dfe7a5633e3e8f937479
# Version: v0.2.9
sha256:96f8f91c6464305c4a990d59f9ef93910c16c7fd0501a46b43b34a4600a368de
19 changes: 18 additions & 1 deletion flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,23 @@
# Inputs define external dependencies and their sources.
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Using the unstable channel for the latest packages, while flake.lock fixates the commit reused until changed.
# No flake for 3.8.0
# Pinned nixpkgs for sdcc 4.2.0 - matches: https://github.com/Dasharo/ec-sdk/pull/2
# sdcc 4.5.0 has optimizer bug: https://github.com/Dasharo/dasharo-issues/issues/1785
nixpkgs-sdcc.url = "github:nixos/nixpkgs/7a339d87931bba829f68e94621536cad9132971a";
flake-utils.url = "github:numtide/flake-utils"; # Utilities for flake functionality.
};
# Outputs are the result of the flake, including the development environment and Docker image.
outputs = {
self,
flake-utils,
nixpkgs,
nixpkgs-sdcc,
...
}:
flake-utils.lib.eachDefaultSystem (system: let
pkgs = nixpkgs.legacyPackages.${system}; # Accessing the legacy package set.
pkgs-sdcc = nixpkgs-sdcc.legacyPackages.${system}; # Pinned for sdcc 4.2.0
lib = pkgs.lib; # The standard Nix packages library.

# Dependencies are the packages required for the Heads project.
Expand Down Expand Up @@ -63,11 +69,13 @@
psmisc #process tools like killall, pstree, etc
python3 # me_cleaner, coreboot
rsync # coreboot
pkgs-sdcc.sdcc # Dasharo EC build — pinned to 4.2.0 (matches Debian oldstable, 4.5 has optimizer bug)
sharutils
texinfo
unzip
wget
which
xxd # Dasharo EC build
xz
zip
zlib
Expand Down
60 changes: 60 additions & 0 deletions modules/dasharo-ec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
ifeq "$(CONFIG_DASHARO_EC)" "y"

modules-y += dasharo-ec

dasharo-ec_repo := https://github.com/Dasharo/ec
dasharo-ec_commit_hash := d198b641195e60e13afc17be9464e4f402d1c2fa

# Strip UNTESTED_/EOL_ prefix for board model mapping
_DASHARO_EC_BOARD := $(patsubst EOL_%,%,$(patsubst UNTESTED_%,%,$(BOARD)))

# Map BOARD to the EC board model
ifeq "$(_DASHARO_EC_BOARD)" "novacustom-v540tu"
DASHARO_EC_BOARD_MODEL := v540tu
else ifeq "$(_DASHARO_EC_BOARD)" "novacustom-v560tu"
DASHARO_EC_BOARD_MODEL := v560tu
else ifeq "$(_DASHARO_EC_BOARD)" "novacustom-nv4x_adl"
DASHARO_EC_BOARD_MODEL := nv4x_adl
else ifeq "$(_DASHARO_EC_BOARD)" "nitropad-ns50"
DASHARO_EC_BOARD_MODEL := ns5x_adl
else
$(error "$(BOARD): no Dasharo EC board model mapping defined")
endif

dasharo-ec_version := $(dasharo-ec_commit_hash)
dasharo-ec_base_dir := dasharo-ec-$(dasharo-ec_version)-$(BOARD)
dasharo-ec_dir := dasharo-ec-$(dasharo-ec_version)-$(BOARD)

# ec.rom is copied to a stable path by the explicit rule below
dasharo-ec_output := ec.rom

# No-op configure: submodules are handled by the EC Makefile's canary rule
# for git repos
dasharo-ec_configure :=

# Build the EC firmware: only pass make arguments; post-build steps are
# handled by the explicit rule below.
dasharo-ec_target := BOARD=novacustom/$(DASHARO_EC_BOARD_MODEL)

# Copy ec.rom from the dynamic build path to a stable location and pad to
# 128KB as required by coreboot. Runs after the module make completes.
$(build)/$(dasharo-ec_dir)/ec.rom: $(build)/$(dasharo-ec_dir)/.build
cp $(build)/$(dasharo-ec_dir)/build/novacustom/$(DASHARO_EC_BOARD_MODEL)/*/ec.rom $@
truncate --size=128KiB $@

# Copy ec.rom into the coreboot source tree before coreboot builds.
# coreboot_base_dir (coreboot-dasharo) is shared between v540tu and v560tu, so
# a plain timestamp-based rule is racy: whichever board built last wins the mtime
# race and the other board silently keeps the wrong binary. Adding FORCE makes the
# recipe always run so we can do a content check; the actual cp (and the mtime
# update that triggers downstream rebuilds) only happens when the content differs.
$(build)/$(coreboot_base_dir)/ec.rom: $(build)/$(dasharo-ec_dir)/ec.rom FORCE
@if ! cmp -s "$(build)/$(dasharo-ec_dir)/ec.rom" "$@" 2>/dev/null; then \
echo "$(DATE) COPY $(DASHARO_EC_BOARD_MODEL) ec.rom -> coreboot"; \
cp "$(build)/$(dasharo-ec_dir)/ec.rom" "$@"; \
fi

# Ensure coreboot's configure step depends on ec.rom being present
$(build)/$(coreboot_dir)/.configured: $(build)/$(coreboot_base_dir)/ec.rom
Copy link
Copy Markdown
Contributor

@SergiiDmytruk SergiiDmytruk Apr 13, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't you want to set dasharo-ec_depends := coreboot instead of or in addition to this?

EDIT: resolving because coreboot depends on dasharo-ec in #2082.
EDIT2: not resolving because GitHub says "Failed to resolve thread"


endif