Merge master into StarForth-v4.0.0: the branch's build, master's CI files kept
StarshipOS Build / milkv (pull_request) Failing after 38s
StarshipOS Build / pc (pull_request) Failing after 34s
StarshipOS Build / pi4 (pull_request) Failing after 35s
StarshipOS Build / pi5 (pull_request) Failing after 35s
StarshipOS Build / qemu (pull_request) Failing after 34s
StarshipOS Build / Isabelle/HOL Proofs (pull_request) Failing after 1m30s
StarshipOS Build / Documentation (pull_request) Failing after 37s
StarshipOS Build / milkv (pull_request) Failing after 38s
StarshipOS Build / pc (pull_request) Failing after 34s
StarshipOS Build / pi4 (pull_request) Failing after 35s
StarshipOS Build / pi5 (pull_request) Failing after 35s
StarshipOS Build / qemu (pull_request) Failing after 34s
StarshipOS Build / Isabelle/HOL Proofs (pull_request) Failing after 1m30s
StarshipOS Build / Documentation (pull_request) Failing after 37s
For PR #30. master's 9 commits since the fork (T= board selection, mk/boards.mk, build.yml, the nightly workflows) conflicted in four files; each is resolved to the branch's version: .gitea/workflows/nightly.yml added on both; master's copy named .gitea/workflows/nightly-docs.yml the branch in its checkout, the branch's builds the default branch Makefile master's T= and mk/boards.mk against kernel/Makefile the branch's TARGET=<board> and boards/; master's edits were to Makefile.starkernel, renamed here The two workflows' header comment now says they build master. Merged cleanly from master: build.yml (its board matrix, Nexus publish and 02:00 nightly; it still calls Makefile.starkernel and make T=<board>, which this tree does not have -- #18) and mk/boards.mk (nothing here includes it). Against the branch the merge changes only those CI files and mk/boards.mk: no kernel, v4 or Makefile source, so the build is the one accepted on 2026-11-06. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01GE3SDvQn5EoxdGufk84zz2
This commit is contained in:
+239
-63
File diff suppressed because it is too large
Load Diff
@@ -6,8 +6,7 @@
|
|||||||
# classifier vol1, vol2, vol3 the formal volumes (make -C docs/formal vols)
|
# classifier vol1, vol2, vol3 the formal volumes (make -C docs/formal vols)
|
||||||
# classifier api the API reference (make -C docs/formal doxygen)
|
# classifier api the API reference (make -C docs/formal doxygen)
|
||||||
#
|
#
|
||||||
# Gitea runs a schedule from the default branch. Until StarForth-v4.0.0 is merged to master,
|
# Gitea runs a schedule from the default branch, master, so this builds master.
|
||||||
# master carries a copy of this file whose checkout names that branch.
|
|
||||||
name: Nightly documents
|
name: Nightly documents
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
|||||||
@@ -8,8 +8,7 @@
|
|||||||
# classifier milkv MilkV.img.xz Milk-V Mars
|
# classifier milkv MilkV.img.xz Milk-V Mars
|
||||||
# classifier logs logs.tar.gz this run's serial logs, proof log and DoE CSVs
|
# classifier logs logs.tar.gz this run's serial logs, proof log and DoE CSVs
|
||||||
#
|
#
|
||||||
# Gitea runs a schedule from the default branch. Until StarForth-v4.0.0 is merged to master,
|
# Gitea runs a schedule from the default branch, master, so this builds master.
|
||||||
# master carries a copy of this file whose checkout names that branch.
|
|
||||||
name: Nightly snapshot
|
name: Nightly snapshot
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
# Board target table — T= selects board, sets ARCH + BOARD + BOARD_NAME.
|
||||||
|
# Included early by both Makefile and Makefile.starkernel, before arch
|
||||||
|
# normalization runs. Each Makefile applies board-specific flag overrides
|
||||||
|
# after its own arch block.
|
||||||
|
#
|
||||||
|
# Adding a new board: add an ifeq block here, then add compiler-flag
|
||||||
|
# overrides in the board-override sections of Makefile and
|
||||||
|
# Makefile.starkernel if the board needs tuning beyond the arch default.
|
||||||
|
|
||||||
|
ifdef T
|
||||||
|
|
||||||
|
ifeq ($(T),qemu)
|
||||||
|
ARCH ?= amd64
|
||||||
|
BOARD := qemu
|
||||||
|
BOARD_NAME := QEMU x86_64
|
||||||
|
CROSS_COMPILE :=
|
||||||
|
|
||||||
|
else ifeq ($(T),pc)
|
||||||
|
ARCH ?= amd64
|
||||||
|
BOARD := pc
|
||||||
|
BOARD_NAME := x86_64 PC (native)
|
||||||
|
CROSS_COMPILE :=
|
||||||
|
|
||||||
|
else ifeq ($(T),pi4)
|
||||||
|
ARCH ?= aarch64
|
||||||
|
BOARD := pi4
|
||||||
|
BOARD_NAME := Raspberry Pi 4 (Cortex-A72)
|
||||||
|
CROSS_COMPILE := aarch64-linux-gnu-
|
||||||
|
|
||||||
|
else ifeq ($(T),pi5)
|
||||||
|
ARCH ?= aarch64
|
||||||
|
BOARD := pi5
|
||||||
|
BOARD_NAME := Raspberry Pi 5 (Cortex-A76)
|
||||||
|
CROSS_COMPILE := aarch64-linux-gnu-
|
||||||
|
|
||||||
|
else ifeq ($(T),milkv)
|
||||||
|
ARCH ?= riscv64
|
||||||
|
BOARD := milkv
|
||||||
|
BOARD_NAME := Milk-V Pioneer (SG2042 RISC-V 64)
|
||||||
|
CROSS_COMPILE := riscv64-linux-gnu-
|
||||||
|
|
||||||
|
# ── Future boards (uncomment + add flag overrides in Makefile / Makefile.starkernel) ──
|
||||||
|
# else ifeq ($(T),zynq7020)
|
||||||
|
# ARCH ?= arm
|
||||||
|
# BOARD := zynq7020
|
||||||
|
# BOARD_NAME := Xilinx Zynq-7020 (Cortex-A9, 32-bit)
|
||||||
|
# CROSS_COMPILE := arm-linux-gnueabihf-
|
||||||
|
# # NOTE: requires removing the 32-bit guardrail and adding armhf toolchain support
|
||||||
|
|
||||||
|
else
|
||||||
|
$(error Unknown board target T='$(T)'. Supported: qemu pc pi4 pi5 milkv)
|
||||||
|
endif
|
||||||
|
|
||||||
|
endif # ifdef T
|
||||||
Reference in New Issue
Block a user