From dc61298213da2fb2b67d9dc1346e74d7a15d5d6c Mon Sep 17 00:00:00 2001 From: John Hodge Date: Wed, 30 Nov 2011 16:23:34 +0800 Subject: [PATCH] Modules/InitRD - Fixing ARM bug (actually in boot args) --- Kernel/arch/armv7/main.c | 2 +- Modules/Filesystems/InitRD/Makefile | 2 +- Modules/Filesystems/InitRD/main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Kernel/arch/armv7/main.c b/Kernel/arch/armv7/main.c index 5ef567c8..a761d007 100644 --- a/Kernel/arch/armv7/main.c +++ b/Kernel/arch/armv7/main.c @@ -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"); diff --git a/Modules/Filesystems/InitRD/Makefile b/Modules/Filesystems/InitRD/Makefile index 0c19c0f7..5aa0e653 100644 --- a/Modules/Filesystems/InitRD/Makefile +++ b/Modules/Filesystems/InitRD/Makefile @@ -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 diff --git a/Modules/Filesystems/InitRD/main.c b/Modules/Filesystems/InitRD/main.c index fa9ded62..b2ed2b31 100644 --- a/Modules/Filesystems/InitRD/main.c +++ b/Modules/Filesystems/InitRD/main.c @@ -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; } -- 2.20.1