New build system

5 files changed, 2 insertions, 28 deletions

diff --git a/arch/riscv/init-link.S b/arch/riscv/conf/init-link.S
index db18822..db18822 100644
--- a/arch/riscv/init-link.S
+++ b/arch/riscv/conf/init-link.S
diff --git a/arch/riscv/kernel-link.S b/arch/riscv/conf/kernel-link.S
index 873c7de..873c7de 100644
--- a/arch/riscv/kernel-link.S
+++ b/arch/riscv/conf/kernel-link.S
diff --git a/arch/riscv/kernel.its b/arch/riscv/conf/kernel.its
index f984d40..f984d40 100644
--- a/arch/riscv/kernel.its
+++ b/arch/riscv/conf/kernel.its
diff --git a/arch/riscv/riscv-link.S b/arch/riscv/riscv-link.S
deleted file mode 100644
index 0950850..0000000
--- a/arch/riscv/riscv-link.S
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <apos/link.lds.h>
-#include <vmap.h>
-
-OUTPUT_ARCH(riscv)
-ENTRY(_start)
-
-SECTIONS {
-	. = ABSOLUTE(PM_KERN);
-	.init ALIGN(4K) : AT(0) {
-		*(.init.start);
-		*(.init.text);
-		*(.init.data);
-		. = ALIGN(4K);
-	}
-
-	. = ABSOLUTE(VM_KERN);
-	.text ALIGN(4K) : AT(SIZEOF(.init)) {
-		*(.text.start);
-		*(.text.text);
-		*(.text.data);
-	}
-}
diff --git a/arch/riscv/source.mk b/arch/riscv/source.mk
index 8bd67ee..626ecd2 100644
--- a/arch/riscv/source.mk
+++ b/arch/riscv/source.mk
@@ -1,9 +1,5 @@
-KERNEL_LOCAL	!= ./scripts/prepend arch/riscv/ main.c
+KERNEL_LOCAL	!= echo arch/riscv/*.[cS]
 KERNEL_SOURCES	+= $(KERNEL_LOCAL)
 
-INIT_LOCAL	!= ./scripts/prepend arch/riscv/init/ init.c head.S
+INIT_LOCAL	!= echo arch/riscv/init/*.[cS]
 INIT_SOURCES	+= $(INIT_LOCAL)
-
-INCLUDE_DIRS	+= arch/riscv/include
-KERNEL_LINK	:= arch/riscv/kernel-link.S
-INIT_LINK	:= arch/riscv/init-link.S