CVS: blob/src/blob smdk2500.c,1.3,1.4

[Russ D. <ru...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory sc8-pr-cvs1:/tmp/cvs-serv9911

Modified Files:
	smdk2500.c 
Log Message:
update board file

Index: smdk2500.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/smdk2500.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- smdk2500.c	27 Nov 2003 03:34:37 -0000	1.3
+++ smdk2500.c	27 Nov 2003 08:04:16 -0000	1.4
@@ -34,73 +34,43 @@
 #include <blob/time.h>
 #include <blob/partition.h>
 #include <blob/arch.h>
+#include <blob/cfi.h>
 #include <net/ether.h>
 
 
-/* flash descriptor for smdk2500 flash */
-/* 1x Am29LV160DB (2MB) */
-static const flash_descriptor_t smdk2500_flash_descriptors[] =
-{
-	{
-		size: 16 * 1024,
-		num: 1,
-		lockable: 1
-	},
-	{
-		size: 8 * 1024,
-		num: 2,
-		lockable: 1
-	},
-	{
-		size: 32 * 1024,
-		num: 1,
-		lockable: 1
-	},
-	{
-		size: 64 * 1024,
-		num: 31,
-		lockable: 1
-	},
-	{
-		/* NULL block */
-	},
-};
-
-
 /* default partition table for the SMDK2500 */
 static const blob_partition_t smdk2500_default_partition_table[] = {
 	{
 		/* start of table */
 		magic:	BLOB_DEFAULT_PART_TABLE_MAGIC,
 		next:	sizeof(blob_partition_t),
-		offset:	0x80000000,	/* absolute base address */
+		offset: 0x80000000,     /* absolute base address */
 		size:	2 * 1024 * 1024 /* total size of the flash */
 	},
 	{
 		/* blob itself */
 		magic:		BLOB_PART_VALID_MAGIC,
 		next:		sizeof(blob_partition_t),
-		offset:		BLOB_FLASH_BASE,
 		size:		BLOB_FLASH_LEN,
 		name:		"blob",
 		mem_base:	BLOB_RAM_BASE
 	},
 	{
 		/* parameter block */
-		magic:	BLOB_PART_VALID_MAGIC,
-		next:	sizeof(blob_partition_t),
-		offset:	PARAM_FLASH_BASE,
-		size:	PARAM_FLASH_LEN,
-		name:	"param",
+		magic:		BLOB_PART_VALID_MAGIC,
+		next:		sizeof(blob_partition_t),
+		offset:		BLOB_PART_OFS_APPEND,
+		size:		PARAM_FLASH_LEN,
+		name:		"param",
 		mem_base:	PARAM_RAM_BASE,
-		flags:	BLOB_PART_FLAG_PTABLE
+		flags:		BLOB_PART_FLAG_PTABLE
 	},
 	{
 		/* kernel */
 		magic:		BLOB_PART_VALID_MAGIC,
 		next:		sizeof(blob_partition_t),
-		offset: 	KERNEL_FLASH_BASE,
-		size:		KERNEL_FLASH_LEN,
+		offset:		BLOB_PART_OFS_APPEND,
+		size:		BLOB_PART_SIZ_FULL,
 		name:		"kernel",
 		flags:		BLOB_PART_FLAG_LOAD | 
 				BLOB_PART_FLAG_CRAMFS,
@@ -117,8 +87,9 @@
 static void smdk2500_init_hardware(void)
 {
 	/* setup flash stuff */
-	flash_descriptors = smdk2500_flash_descriptors;
 	flash_driver = &amd16_flash_driver;
+	flash_driver->query_descriptors = flash_query_descriptors_cfi16;
+	flash_base = 0x80000000;
 
 	/* the default partition table */
 	default_partition_table = smdk2500_default_partition_table;