Skip to content

Commit 0dd84fe

Browse files
committed
TARGET_PLATFORM -> EXTRA_MAKEFILE
Instead of specifiying a target platform that then picks the corresponding Makefile to include, this commit changes it to a EXTRA_MAKEFILE argument. That is a bit more general and not limited to baremetal targets. Signed-off-by: Matthias J. Kannwischer <[email protected]>
1 parent aae707b commit 0dd84fe

File tree

4 files changed

+6
-15
lines changed

4 files changed

+6
-15
lines changed

.github/workflows/baremetal.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
target:
1818
- runner: ubuntu-latest
1919
name: 'M55-AN547'
20-
platform: m55-an547
20+
makefile: test/baremetal/platform/m55-an547/platform.mk
2121
nix-shell: arm-embedded
2222
runs-on: ${{ matrix.target.runner }}
2323
steps:
2424
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2525
- name: baremetal build + test
2626
uses: ./.github/actions/functest
2727
env:
28-
TARGET_PLATFORM: ${{ matrix.target.platform }}
28+
EXTRA_MAKEFILE: ${{ matrix.target.makefile }}
2929
with:
3030
nix-shell: ${{ matrix.target.nix-shell }}
3131
gh_token: ${{ secrets.GITHUB_TOKEN }}

Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ SHELL := /bin/bash
2424

2525
all: build
2626

27-
# Target platform for baremetal targets
28-
TARGET_PLATFORM ?=
29-
ifneq ($(TARGET_PLATFORM),)
30-
include test/mk/platform.mk
27+
# Extra Makefile to include, e.g., for baremetal targets
28+
ifneq ($(EXTRA_MAKEFILE),)
29+
include $(EXTRA_MAKEFILE)
3130
endif
3231

3332
W := $(EXEC_WRAPPER)

test/baremetal/platform/m55-an547/platform.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Copyright (c) The mldsa-native project authors
22
# SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT
33

4+
PLATFORM_PATH:=test/baremetal/platform/m55-an547
45
HAL_SRC_DIR=$(PLATFORM_PATH)/src
56
HAL_INC_DIR=$(PLATFORM_PATH)/inc
67

test/mk/platform.mk

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)