Modules/InitRD - Fixing ARM bug (actually in boot args)
authorJohn Hodge <[email protected]>
Wed, 30 Nov 2011 08:23:34 +0000 (16:23 +0800)
committerJohn Hodge <[email protected]>
Wed, 30 Nov 2011 08:23:34 +0000 (16:23 +0800)
Kernel/arch/armv7/main.c
Modules/Filesystems/InitRD/Makefile
Modules/Filesystems/InitRD/main.c

index 5ef567c..a761d00 100644 (file)
@@ -43,7 +43,7 @@ int kmain(void)
 
        //
        LogF("Moving to arch-independent init\n");
-       System_Init("/Acess=initrd: -VTerm:Video=PL110");
+       System_Init("Acess2.armv7.bin /Acess=initrd: -VTerm:Video=PL110");
 //     System_Init("/Acess=initrd:");
        //TODO: 
        LogF("End of kmain(), for(;;) Threads_Sleep();\n");
index 0c19c0f..5aa0e65 100644 (file)
@@ -4,7 +4,7 @@
 OBJ = main.o files.$(ARCH).o
 EXTRA = files.c
 NAME = InitRD
-EXTRA = files.$(ARCH).c files.$(ARCH).c.dep
+EXTRA = files.$(ARCH).c files.$(ARCH).c.dep files.$(ARCH).c.ldopts
 LDFLAGS += @files.$(ARCH).c.ldopts
 
 -include ../Makefile.tpl
index fa9ded6..b2ed2b3 100644 (file)
@@ -47,7 +47,7 @@ tVFS_Node *InitRD_InitDevice(const char *Device, const char **Arguments)
        #if DUMP_ON_MOUNT
        InitRD_DumpDir( &gInitRD_RootNode, 0 );
        #endif
-       Log_Notice("InitRD", "Mounted");
+       Log_Notice("InitRD", "Mounted (%i files)", giInitRD_NumFiles);
        return &gInitRD_RootNode;
 }
 

UCC git Repository :: git.ucc.asn.au