[FILO] r141 - in trunk/filo: fs i386

[repository service]

Author: stepan
Date: Fri Feb 25 21:34:31 2011
New Revision: 141
URL: http://tracker.coreboot.org/trac/filo/changeset/141

Log:
When using Artec loader and no file system, use dev_name for initrd
instead of "flashb".

Signed-off-by: Nathan Williams

Modified:
   trunk/filo/fs/blockdev.c
   trunk/filo/fs/filesys.h
   trunk/filo/i386/artecboot.c

Modified: trunk/filo/fs/blockdev.c
==============================================================================
--- trunk/filo/fs/blockdev.c	Sat Feb 12 03:01:44 2011	(r140)
+++ trunk/filo/fs/blockdev.c	Fri Feb 25 21:34:31 2011	(r141)
@@ -31,8 +31,7 @@
 static unsigned char buf_cache[NUM_CACHE][DEV_SECTOR_SIZE];
 static unsigned long cache_sect[NUM_CACHE];

-static char dev_name[256];
-
+char dev_name[256];
 int dev_type = -1;
 int dev_drive = -1;
 unsigned long part_start;

Modified: trunk/filo/fs/filesys.h
==============================================================================
--- trunk/filo/fs/filesys.h	Sat Feb 12 03:01:44 2011	(r140)
+++ trunk/filo/fs/filesys.h	Fri Feb 25 21:34:31 2011	(r141)
@@ -86,6 +86,7 @@
 /* Ditto */
 #define current_slice 0

+extern char dev_name[256];
 extern unsigned long part_start;
 extern unsigned long part_length;
 extern int filepos;

Modified: trunk/filo/i386/artecboot.c
==============================================================================
--- trunk/filo/i386/artecboot.c	Sat Feb 12 03:01:44 2011	(r140)
+++ trunk/filo/i386/artecboot.c	Fri Feb 25 21:34:31 2011	(r141)
@@ -107,8 +107,8 @@
    		else
    		{
    			// we are using a 'fake' filesystem, so use the image offset
-				sprintf(initrdParam, " initrd=flashb@0x%x,0x%x", 
-						bootHdr.initrdStart, bootHdr.initrdSize);
+				sprintf(initrdParam, " initrd=%s@0x%x,0x%x",
+						dev_name, bootHdr.initrdStart, bootHdr.initrdSize);
    		}

debug("adding initrd parameter: %s\n", initrdParam);