X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Farm7%2Fmain.c;h=b6186bbe54970ee0c0646b3a433f08e19d52c58e;hb=bc55dc5d60469521269a41928d3d15809e2c8134;hp=891501d1c5b997735744509102a4f49882224d69;hpb=e4ccf568b07857a36382433ed73ea38874843b24;p=tpg%2Facess2.git

diff --git a/Kernel/arch/arm7/main.c b/Kernel/arch/arm7/main.c
index 891501d1..b6186bbe 100644
--- a/Kernel/arch/arm7/main.c
+++ b/Kernel/arch/arm7/main.c
@@ -4,10 +4,14 @@
  * ARM7 Entrypoint
  * arch/arm7/main.c
  */
+#include <acess.h>
 
 // === IMPORTS ===
 extern void	Interrupts_Setup(void);
-extern void	MM_SetupPhys(void);
+extern void	Arch_LoadBootModules(void);
+extern void	Heap_Install(void);
+extern void	Threads_Init(void);
+extern void	System_Init(const char *Commandline);
 
 // === PROTOTYPES ===
  int	kmain(void);
@@ -15,10 +19,32 @@ extern void	MM_SetupPhys(void);
 // === CODE ===
 int kmain(void)
 {
-	Interrupts_Setup();
+	LogF("Acess2 ARMv7 v"EXPAND_STR(KERNEL_VERSION)"\n");
+	LogF(" Build %i\n", BUILD_NUM);
+//	Interrupts_Setup();
 	
 	MM_SetupPhys();
+
+	LogF("Heap Setup...\n");
+	Heap_Install();
+
+	LogF("Threads Init...\n");
+	Threads_Init();
 	
+	LogF("VFS Init...\n");
+	VFS_Init();
+
+	// Boot modules?
+
+	//
+	LogF("Moving to arch-independent init\n");
+	System_Init("");
 	//TODO: 
+	LogF("End of kmain(), for(;;);\n");
 	for(;;);
 }
+
+void Arch_LoadBootModules(void)
+{
+}
+