Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv11461
Modified Files:
system3.c
Log Message:
- conditionally compile parts
Index: system3.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/system3.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- system3.c 9 May 2002 13:29:16 -0000 1.18
+++ system3.c 10 May 2002 14:01:47 -0000 1.19
@@ -126,6 +126,7 @@
},
};
+#if defined(CONFIG_BLOB_PARTITION)
/* default partition table for SYSTEM3
System3 flash layout
@@ -209,6 +210,7 @@
magic: BLOB_PART_LAST_MAGIC
}
};
+#endif
/**********************************************************************
* static functions
@@ -252,16 +254,15 @@
MEM(SYSTEM3_CTRL_1) = 0x04;
-
/* tweak blob config */
blob_status.boot_delay = 1;
-
/* select serial driver */
serial_driver = &sa11x0_serial_driver;
}
__initlist(system3_init_hardware, INIT_LEVEL_DRIVER_SELECTION);
+#if defined(CONFIG_BLOB_PARTITION)
/**********************************************************************
* system3 default partition table
*/
@@ -280,7 +281,9 @@
__initlist(system3_set_partition_table, INIT_LEVEL_OTHER_STUFF);
/* FIXME: need to think if this is the correct init level, we might
* want to have this before the param list stuff starts running */
+#endif
+#if defined(CONFIG_GIO_RAM)
/**********************************************************************
* init system3 ram pools
*/
@@ -312,7 +315,7 @@
if ( ret ) return;
}
__initlist(init_ram_default_io, INIT_LEVEL_OTHER_STUFF + 2);
-
+#endif
/*****************************************************************
* sysver - print system version
@@ -522,6 +525,7 @@
static char tar_help[] = "tar [t|x] src [filename dest]\n";
__commandlist(tar_cmd, "tar", tar_help);
+#if 0
extern int io_test(void);
int io_cmd( int argc, char *argv[] )
{
@@ -599,7 +603,9 @@
}
static char io_help[] = "io test function\n";
__commandlist(io_cmd, "iotest", io_help);
+#endif
+#if defined(CONFIG_GIO_BLOB_PARTITION)
/**********************************************************************
* blob partition io driver
*
@@ -722,7 +728,9 @@
/* defer writing to our child */
return io_write((void *)((u32)dest + part->offset), src, amount, child);
}
+#endif
+#if defined(CONFIG_GIO_FLASH)
/**********************************************************************
* flash io driver
*/
@@ -840,6 +848,7 @@
return flash_write_region( (u32 *)adr, (u32*)src, amount/4 + (amount%4?1:0));
}
+#endif
/*****************************************************************
* misc utility funcs
|
