When using Artec loader and no file system, use dev_name for initrd instead of "flashb".
Signed-off-by: Nathan Williams nathan@traverse.com.au
Index: fs/filesys.h =================================================================== --- fs/filesys.h (revision 140) +++ fs/filesys.h (working copy) @@ -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; Index: fs/blockdev.c =================================================================== --- fs/blockdev.c (revision 140) +++ fs/blockdev.c (working copy) @@ -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; Index: i386/artecboot.c =================================================================== --- i386/artecboot.c (revision 140) +++ i386/artecboot.c (working copy) @@ -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);