Skip to content

refactor: remove static platform and axconfig generation, make dynamic platform the only path #1478

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

Merged
ZR233 merged 7 commits into from
Jul 3, 2026
Merged

refactor: remove static platform and axconfig generation, make dynamic platform the only path #1478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e24aa3d
refactor(axbuild): remove static platform and axconfig generation, ma…
ZCShou Jul 2, 2026
12da032
Merge branch 'dev' into clean
ZCShou Jul 2, 2026
9c53109
refactor: remove plat-dyn feature, make dynamic platform the only path
ZCShou Jul 2, 2026
b34f565
Merge remote-tracking branch 'origin/dev' into clean
ZCShou Jul 2, 2026
430ddc6
fix(axhal): stub platform calls for host-test builds
ZCShou Jul 2, 2026
66462c2
docs: establish axplat-dyn as sole platform path across all documenta…
ZCShou Jul 2, 2026
0aedc59
Merge branch 'dev' into clean
ZCShou Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
65 changes: 2 additions & 63 deletions Cargo.lock
View file
Open in desktop

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

6 changes: 0 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ members = [
"components/starry-signal",
"components/starry-vm",
"components/timer_list",
"components/axconfig-gen/axconfig-gen",
"components/axconfig-gen/axconfig-macros",
"platforms/ax-plat",
"platforms/ax-plat-macros",
"platforms/axplat-dyn",
Expand Down Expand Up @@ -96,7 +94,6 @@ members = [
"os/StarryOS/starryos",
"os/arceos/api/*",
"os/arceos/modules/axalloc",
"os/arceos/modules/axconfig",
"os/arceos/modules/axdisplay",
"os/arceos/modules/axdma",
"os/arceos/modules/axfs-ng",
Expand Down Expand Up @@ -141,9 +138,6 @@ ax-alloc = { version = "0.8.7", path = "os/arceos/modules/axalloc", default-feat
ax-allocator = { version = "0.5.5", path = "memory/axallocator" }
ax-api = { version = "0.6.4", path = "os/arceos/api/arceos_api" }
ax-arm-pl031 = { version = "0.4.7", path = "drivers/rtc/arm_pl031" }
ax-config = { version = "0.5.15", path = "os/arceos/modules/axconfig" }
ax-config-gen = { version = "0.4.12", path = "components/axconfig-gen/axconfig-gen" }
ax-config-macros = { version = "0.4.12", path = "components/axconfig-gen/axconfig-macros" }
ax-cpu = { version = "0.8.1", path = "components/axcpu" }
ax-cpumask = { version = "0.3.5", path = "components/cpumask" }
ax-crate-interface = { version = "0.5.7", path = "components/crate_interface" }
Expand Down
2 changes: 0 additions & 2 deletions apps/starry/apache/build-loongarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
target = "loongarch64-unknown-none-softfloat"
env = { AX_IP = "10.0.2.15", AX_GW = "10.0.2.2" }
axconfig_overrides = ["plat.phys-memory-size=0x8000_0000"]
log = "Warn"
features = [
"ax-hal/plat-dyn",
"axplat-dyn/efi",
"ax-driver/virtio-blk",
"ax-driver/virtio-net",
Expand Down
1 change: 0 additions & 1 deletion apps/starry/ebpf/build-loongarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
target = "loongarch64-unknown-none-softfloat"
log = "Warn"
features = [
"ax-hal/plat-dyn",
"axplat-dyn/efi",
"ax-driver/virtio-blk",
"ax-driver/virtio-net",
Expand Down
1 change: 0 additions & 1 deletion apps/starry/gcc/build-loongarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
target = "loongarch64-unknown-none-softfloat"
log = "Warn"
features = [
"ax-hal/plat-dyn",
"axplat-dyn/efi",
"ax-driver/virtio-blk",
"ax-driver/virtio-net",
Expand Down
1 change: 0 additions & 1 deletion apps/starry/gdb-smoke/build-loongarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
target = "loongarch64-unknown-none-softfloat"
log = "Warn"
features = [
"ax-hal/plat-dyn",
"axplat-dyn/efi",
"ax-driver/virtio-blk",
"ax-driver/virtio-net",
Expand Down
1 change: 0 additions & 1 deletion apps/starry/git/build-loongarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
target = "loongarch64-unknown-none-softfloat"
log = "Warn"
features = [
"ax-hal/plat-dyn",
"axplat-dyn/efi",
"ax-driver/virtio-blk",
"ax-driver/virtio-net",
Expand Down
1 change: 0 additions & 1 deletion apps/starry/glibc-dynamic-smoke/build-aarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ features = [
"ax-driver/virtio-socket",
]
log = "Warn"
plat_dyn = false
target = "aarch64-unknown-none-softfloat"
1 change: 0 additions & 1 deletion apps/starry/glibc-dynamic-smoke/build-riscv64gc-unknown-none-elf.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ features = [
"ax-driver/virtio-socket",
]
log = "Warn"
plat_dyn = false
target = "riscv64gc-unknown-none-elf"
1 change: 0 additions & 1 deletion apps/starry/go-lang/build-loongarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
target = "loongarch64-unknown-none-softfloat"
log = "Warn"
features = [
"ax-hal/plat-dyn",
"axplat-dyn/efi",
"ax-driver/virtio-blk",
"ax-driver/virtio-net",
Expand Down
1 change: 0 additions & 1 deletion apps/starry/hdl-lang/build-loongarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
target = "loongarch64-unknown-none-softfloat"
log = "Warn"
features = [
"ax-hal/plat-dyn",
"axplat-dyn/efi",
"ax-feat/display",
"ax-feat/rtc",
Expand Down
1 change: 0 additions & 1 deletion apps/starry/java-lang/build-loongarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
target = "loongarch64-unknown-none-softfloat"
log = "Warn"
features = [
"ax-hal/plat-dyn",
"axplat-dyn/efi",
"ax-feat/display",
"ax-feat/rtc",
Expand Down
11 changes: 1 addition & 10 deletions apps/starry/macos-selfbuild/guest-selfbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ build_package="starryos"
build_bin="starryos"
build_std="core,alloc"
build_std_features="compiler-builtins-mem"
features="${FEATURES:-plat-dyn,ax-driver/virtio-blk,ax-driver/virtio-net,smp}"
features="${FEATURES:-ax-driver/virtio-blk,ax-driver/virtio-net,smp}"
cargo_verbose="${CARGO_VERBOSE:-0}"
artifact_to_bin="${ARTIFACT_TO_BIN:-1}"
kallsyms_reserved="${STARRY_KALLSYMS_RESERVED:-16M}"
Expand Down Expand Up @@ -289,14 +289,6 @@ patch_starry_kallsyms_reserve() {

patch_starry_kallsyms_reserve

if [ -n "${AX_CONFIG_PATH:-}" ]; then
export AX_CONFIG_PATH
elif [ -f "$(pwd)/os/StarryOS/.axconfig.toml" ]; then
export AX_CONFIG_PATH="$(pwd)/os/StarryOS/.axconfig.toml"
else
unset AX_CONFIG_PATH
fi

rustflags="${LINK_RUSTFLAGS:-}"
if [ -n "${EXTRA_RUSTFLAGS:-}" ]; then
rustflags="${rustflags} ${EXTRA_RUSTFLAGS}"
Expand Down Expand Up @@ -332,7 +324,6 @@ echo "target_dir=${target_dir}"
echo "artifact_dir=${artifact_dir}"
echo "work_dir=$(pwd)"
echo "cargo_home=${CARGO_HOME}"
echo "ax_config_path=${AX_CONFIG_PATH:-}"
echo "libclang_path=${LIBCLANG_PATH:-}"
echo "rustflags=${RUSTFLAGS}"
echo "host_rustflags=-C target-feature=-crt-static"
Expand Down
1 change: 0 additions & 1 deletion apps/starry/mariadb/build-aarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
target = "aarch64-unknown-none-softfloat"
axconfig_overrides = ["plat.phys-memory-size=0x4000_0000"]
log = "Warn"
features = [
"qemu",
Expand Down
2 changes: 0 additions & 2 deletions apps/starry/mariadb/build-loongarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
target = "loongarch64-unknown-none-softfloat"
axconfig_overrides = ["plat.phys-memory-size=0x4000_0000"]
log = "Warn"
features = [
"ax-hal/plat-dyn",
"axplat-dyn/efi",
"ax-driver/virtio-blk",
"ax-driver/virtio-net",
Expand Down
1 change: 0 additions & 1 deletion apps/starry/mariadb/build-riscv64gc-unknown-none-elf.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
target = "riscv64gc-unknown-none-elf"
axconfig_overrides = ["plat.phys-memory-size=0x4000_0000"]
log = "Warn"
features = [
"ax-feat/display",
Expand Down
1 change: 0 additions & 1 deletion apps/starry/mariadb/build-x86_64-unknown-none.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
target = "x86_64-unknown-none"
axconfig_overrides = ["plat.phys-memory-size=0x4000_0000"]
log = "Warn"
features = [
"ax-driver/virtio-blk",
Expand Down
1 change: 0 additions & 1 deletion apps/starry/musl-dynamic-smoke/build-aarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ features = [
"ax-driver/virtio-socket",
]
log = "Warn"
plat_dyn = false
target = "aarch64-unknown-none-softfloat"
1 change: 0 additions & 1 deletion apps/starry/musl-dynamic-smoke/build-riscv64gc-unknown-none-elf.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ features = [
"ax-driver/virtio-socket",
]
log = "Warn"
plat_dyn = false
target = "riscv64gc-unknown-none-elf"
1 change: 0 additions & 1 deletion apps/starry/mysql/build-x86_64-unknown-none.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
target = "x86_64-unknown-none"
axconfig_overrides = ["plat.phys-memory-size=0x8000_0000"]
log = "Warn"
features = [
"ax-driver/virtio-blk",
Expand Down
2 changes: 0 additions & 2 deletions apps/starry/nginx/build-loongarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
target = "loongarch64-unknown-none-softfloat"
axconfig_overrides = ["plat.phys-memory-size=0x8000_0000"]
log = "Warn"
features = [
"ax-hal/plat-dyn",
"axplat-dyn/efi",
"ax-driver/virtio-blk",
"ax-driver/virtio-net",
Expand Down
1 change: 0 additions & 1 deletion apps/starry/node-lang/build-loongarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
target = "loongarch64-unknown-none-softfloat"
log = "Warn"
features = [
"ax-hal/plat-dyn",
"axplat-dyn/efi",
"ax-feat/display",
"ax-feat/rtc",
Expand Down
1 change: 0 additions & 1 deletion apps/starry/openrc/build-loongarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
target = "loongarch64-unknown-none-softfloat"
log = "Warn"
features = [
"ax-hal/plat-dyn",
"axplat-dyn/efi",
"ax-driver/virtio-blk",
"ax-driver/virtio-net",
Expand Down
1 change: 0 additions & 1 deletion apps/starry/openssh/build-loongarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
target = "loongarch64-unknown-none-softfloat"
log = "Warn"
features = [
"ax-hal/plat-dyn",
"axplat-dyn/efi",
"ax-driver/virtio-blk",
"ax-driver/virtio-net",
Expand Down
1 change: 0 additions & 1 deletion apps/starry/pip-uv/build-loongarch64-unknown-none-softfloat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ target = "loongarch64-unknown-none-softfloat"
env = { AX_IP = "10.0.2.15", AX_GW = "10.0.2.2" }
log = "Warn"
features = [
"ax-hal/plat-dyn",
"axplat-dyn/efi",
"ax-driver/serial",
"ax-driver/virtio-blk",
Expand Down
Loading