From be07027fe15a94441202fe0a10228b289dc7e442 Mon Sep 17 00:00:00 2001 From: Travis Geiselbrecht Date: Wed, 1 Oct 2025 23:37:36 -0700 Subject: [PATCH] [project][pc] add minip and all of the fses to all of the PC projects Leave minip out of legacy PC right now since the registration scheme is a bit broken and assumes e1000 is present. --- project/pc-x86-64-test.mk | 2 ++ project/pc-x86-legacy-test.mk | 4 +++- project/pc-x86-test.mk | 2 ++ project/target/pc-legacy.mk | 10 ---------- 4 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 project/target/pc-legacy.mk diff --git a/project/pc-x86-64-test.mk b/project/pc-x86-64-test.mk index 83b82514..e3a31e93 100644 --- a/project/pc-x86-64-test.mk +++ b/project/pc-x86-64-test.mk @@ -4,4 +4,6 @@ ARCH := x86 SUBARCH := x86-64 include project/target/pc.mk +include project/virtual/fs.mk +include project/virtual/minip.mk include project/virtual/test.mk diff --git a/project/pc-x86-legacy-test.mk b/project/pc-x86-legacy-test.mk index 884ebac5..cab58cf9 100644 --- a/project/pc-x86-legacy-test.mk +++ b/project/pc-x86-legacy-test.mk @@ -1,6 +1,8 @@ # top level project rules for the pc-x86-legacy-test project # ARCH := x86 +CPU ?= legacy -include project/target/pc-legacy.mk +include project/target/pc.mk +include project/virtual/fs.mk include project/virtual/test.mk diff --git a/project/pc-x86-test.mk b/project/pc-x86-test.mk index 5adde985..3f22d6bf 100644 --- a/project/pc-x86-test.mk +++ b/project/pc-x86-test.mk @@ -4,4 +4,6 @@ ARCH := x86 SUBARCH := x86-32 include project/target/pc.mk +include project/virtual/fs.mk +include project/virtual/minip.mk include project/virtual/test.mk diff --git a/project/target/pc-legacy.mk b/project/target/pc-legacy.mk deleted file mode 100644 index 82f103da..00000000 --- a/project/target/pc-legacy.mk +++ /dev/null @@ -1,10 +0,0 @@ -# top level project rules for the pc virtual project -# -ARCH ?= x86 -SUBARCH ?= x86-32 -TARGET := pc-x86 - -CPU ?= legacy - -MODULES += \ - app/shell