blob-cvs-commit — blob CVS commit messages list

CVS: blob/src/blob frodo.c,1.4,1.5

[Abraham vd M. <ab...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv12990

Modified Files:
	frodo.c 
Log Message:
Not resetting the ethernet controller by toggling SBHE anymore to avoid
8-bit odd byte addressing problem (now going through the CPLD) and I've
rewritten the cs89x0 driver, so I'm doing the reset in there now.


Index: frodo.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/frodo.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- frodo.c	12 Mar 2002 09:25:27 -0000	1.4
+++ frodo.c	9 Apr 2002 12:30:43 -0000	1.5
@@ -63,13 +63,11 @@
 #define RS232_ENABLE	0x00001000
 #define IDERESET		0x80
 #define IDELED			0x40
-#define ETHRESET		0x8000
 
 static void frodo_init_hardware(void)
 {
 	u32 *bcr = (u32 *) 0x12000000;
 	u16 *ide = (u16 *) 0x40008000;
-	u16 *eth = (u16 *) 0x40014000;
 
 	/* enable RS232 tranceiver */
 	*bcr = RS232_ENABLE;
@@ -80,10 +78,6 @@
 	/* reset the drive */
 	*ide |= IDERESET;
 	*ide &= ~IDERESET;
-
-	/* reset the ethernet controller */
-	*eth |= ETHRESET;
-	*eth &= ~ETHRESET;
 
 	/* select serial driver */
 	serial_driver = &sa11x0_serial_driver;

CVS: blob/src/blob linux.c,1.13,1.14

[Stefan E. <se...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv5145

Modified Files:
	linux.c 
Log Message:
BUGFIX: ATAG_INITRD was set up incorrectly. Reversed changes to
	the 2.0.5-pre2 version to make blob boot linux again.


Index: linux.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/linux.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- linux.c	5 Mar 2002 20:17:04 -0000	1.13
+++ linux.c	9 Apr 2002 12:01:28 -0000	1.14
@@ -170,17 +170,8 @@
 	params->hdr.tag = ATAG_INITRD;
 	params->hdr.size = tag_size(tag_initrd);
 
-#ifdef SOMEONE_FIXED_INITRD_FROM_FLASH
-	if (blob_status.load_ramdisk == 1) {
-#endif
-		params->u.initrd.start = RAMDISK_RAM_BASE;
-		params->u.initrd.size = blob_status.ramdiskSize;
-#ifdef SOMEONE_FIXED_INITRD_FROM_FLASH
-	} else {
-		params->u.initrd.start = RAMDISK_FLASH_BASE;
-		params->u.initrd.size = RAMDISK_FLASH_LEN;
-	}
-#endif
+	params->u.initrd.start = RAMDISK_RAM_BASE;
+	params->u.initrd.size = RAMDISK_FLASH_LEN;
 
 	params = tag_next(params);
 }

Re: CVS: blob/include/blob arch.h,1.6,1.7

[Erik M. <J.A...@it...>]

On Tue, Apr 02, 2002 at 09:05:49PM -0800, Tim Riker wrote:
> Update of /cvsroot/blob/blob/include/blob
> In directory usw-pr-cvs1:/tmp/cvs-serv7661/include/blob
> 
> Modified Files:
> 	arch.h 
> Log Message:
> use speed defines for idr as well

Makes sense.


Erik

-- 
J.A.K. (Erik) Mouw, Information and Communication Theory Group, Faculty
of Information Technology and Systems, Delft University of Technology,
PO BOX 5031, 2600 GA Delft, The Netherlands  Phone: +31-15-2783635
Fax: +31-15-2781843  Email: J.A...@it...
WWW: http://www-ict.its.tudelft.nl/~erik/

CVS: blob/include/blob/arch shannon.h,1.9,1.10

[Tim R. <tim...@us...>]

Update of /cvsroot/blob/blob/include/blob/arch
In directory usw-pr-cvs1:/tmp/cvs-serv16601/include/blob/arch

Modified Files:
	shannon.h 
Log Message:
use speed defines for shannon

Index: shannon.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/shannon.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- shannon.h	27 Feb 2002 17:21:47 -0000	1.9
+++ shannon.h	4 Apr 2002 09:07:25 -0000	1.10
@@ -31,7 +31,7 @@
 
 
 /* boot CPU speed */
-#define CPU_SPEED		(0x09)
+#define CPU_SPEED		CPU_CORE_SPEED_191mhz
 
 
 /* serial port */

CVS: blob/src/blob memsetup-sa1100.S,1.3,1.4

[Tim R. <tim...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv16789/src/blob

Modified Files:
	memsetup-sa1100.S 
Log Message:
comment on 11 row shannon config

Index: memsetup-sa1100.S
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/memsetup-sa1100.S,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- memsetup-sa1100.S	3 Apr 2002 05:06:23 -0000	1.3
+++ memsetup-sa1100.S	4 Apr 2002 09:07:58 -0000	1.4
@@ -91,6 +91,8 @@
 mdcas2:		.long	0xffffffff
 /* 10 rows */
 mdcnfg:		.long	0x0334b21f
+/* 11 rows - makes lower memory 8 1M banks */
+/* mdcnfg:		.long	0x0334b22f */
 /* 12 rows - makes lower memory 8 1M banks */
 /* mdcnfg:		.long	0x0334b23f */
 mcs0:		.long	0xfff84458

CVS: blob/src/blob memsetup-sa1100.S,1.2,1.3

[Tim R. <tim...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv7815/src/blob

Modified Files:
	memsetup-sa1100.S 
Log Message:
shannon alt mem config

Index: memsetup-sa1100.S
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/memsetup-sa1100.S,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- memsetup-sa1100.S	4 Nov 2001 23:16:26 -0000	1.2
+++ memsetup-sa1100.S	3 Apr 2002 05:06:23 -0000	1.3
@@ -89,7 +89,10 @@
 mdcas0:		.long	0xc71c703f
 mdcas1:		.long	0xffc71c71
 mdcas2:		.long	0xffffffff
+/* 10 rows */
 mdcnfg:		.long	0x0334b21f
+/* 12 rows - makes lower memory 8 1M banks */
+/* mdcnfg:		.long	0x0334b23f */
 mcs0:		.long	0xfff84458
 #endif
 

CVS: blob/include/blob arch.h,1.6,1.7

[Tim R. <tim...@us...>]

Update of /cvsroot/blob/blob/include/blob
In directory usw-pr-cvs1:/tmp/cvs-serv7661/include/blob

Modified Files:
	arch.h 
Log Message:
use speed defines for idr as well

Index: arch.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- arch.h	4 Feb 2002 18:02:40 -0000	1.6
+++ arch.h	3 Apr 2002 05:05:47 -0000	1.7
@@ -34,6 +34,51 @@
 #define MEMORY_END		(0xe0000000)
 
 
+/*
+ * CPU frequency table.
+ * See Section 8.2 (Core Clock Configuration Register) SA-1110 Developers
+ * Manual for more information.
+ *
+ * We have 3.6864-MHz oscillator.
+ *
+ *	CCF[4:0]	3.6864-MHz Crystal Oscillator	3.5795-MHz Crystal Oscillator
+ *	-------------------------------------------------------------------------
+ *	00			59.0							57.3
+ * 	01			73.7							71.6
+ * 	02			88.5							85.9
+ * 	03			103.2							100.2
+ * 	04			118.0							114.5
+ * 	05			132.7							128.9
+ * 	06			147.5							143.2
+ * 	07			162.2							157.5
+ * 	08			176.9							171.8
+ * 	09			191.7							186.1
+ * 	0a			206.4							200.5
+ * 	0b			221.2							214.8
+ *
+ * these are undocumented.
+ *
+ *  0c			235.9							??
+ *  0d			250.7							??
+ *  0e			265.4							??
+ *  0f			280.2							??
+ */
+#define CPU_CORE_SPEED_59mhz	0x00
+#define CPU_CORE_SPEED_73mhz	0x01
+#define CPU_CORE_SPEED_88mhz	0x02
+#define CPU_CORE_SPEED_103mhz	0x03
+#define CPU_CORE_SPEED_118mhz	0x04
+#define CPU_CORE_SPEED_132mhz	0x05
+#define CPU_CORE_SPEED_147mhz	0x06
+#define CPU_CORE_SPEED_162mhz	0x07
+#define CPU_CORE_SPEED_176mhz	0x08
+#define CPU_CORE_SPEED_191mhz	0x09
+#define CPU_CORE_SPEED_206mhz	0x0a
+#define CPU_CORE_SPEED_221mhz	0x0b
+#define CPU_CORE_SPEED_235mhz	0x0c
+#define CPU_CORE_SPEED_250mhz	0x0d
+#define CPU_CORE_SPEED_265mhz	0x0e
+#define CPU_CORE_SPEED_280mhz	0x0f
 
 
 /* architecture specific include files */

CVS: blob/include/blob/arch frodo.h,1.8,1.9 idr.h,1.8,1.9

[Tim R. <tim...@us...>]

Update of /cvsroot/blob/blob/include/blob/arch
In directory usw-pr-cvs1:/tmp/cvs-serv7661/include/blob/arch

Modified Files:
	frodo.h idr.h 
Log Message:
use speed defines for idr as well

Index: frodo.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/frodo.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- frodo.h	27 Feb 2002 18:41:48 -0000	1.8
+++ frodo.h	3 Apr 2002 05:05:47 -0000	1.9
@@ -26,53 +26,6 @@
 #ifndef BLOB_ARCH_FRODO_H
 #define BLOB_ARCH_FRODO_H
 
-
-/*
- * CPU frequency table.
- * See Section 8.2 (Core Clock Configuration Register) SA-1110 Developers
- * Manual for more information.
- *
- * We have 3.6864-MHz oscillator.
- *
- *	CCF[4:0]	3.6864-MHz Crystal Oscillator	3.5795-MHz Crystal Oscillator
- *	-------------------------------------------------------------------------
- *	00			59.0							57.3
- * 	01			73.7							71.6
- * 	02			88.5							85.9
- * 	03			103.2							100.2
- * 	04			118.0							114.5
- * 	05			132.7							128.9
- * 	06			147.5							143.2
- * 	07			162.2							157.5
- * 	08			176.9							171.8
- * 	09			191.7							186.1
- * 	0a			206.4							200.5
- * 	0b			221.2							214.8
- *
- * these are undocumented.
- *
- *  0c			235.9							??
- *  0d			250.7							??
- *  0e			265.4							??
- *  0f			280.2							??
- */
-#define CPU_CORE_SPEED_59mhz	0x00
-#define CPU_CORE_SPEED_73mhz	0x01
-#define CPU_CORE_SPEED_88mhz	0x02
-#define CPU_CORE_SPEED_103mhz	0x03
-#define CPU_CORE_SPEED_118mhz	0x04
-#define CPU_CORE_SPEED_132mhz	0x05
-#define CPU_CORE_SPEED_147mhz	0x06
-#define CPU_CORE_SPEED_162mhz	0x07
-#define CPU_CORE_SPEED_176mhz	0x08
-#define CPU_CORE_SPEED_191mhz	0x09
-#define CPU_CORE_SPEED_206mhz	0x0a
-#define CPU_CORE_SPEED_221mhz	0x0b
-#define CPU_CORE_SPEED_235mhz	0x0c
-#define CPU_CORE_SPEED_250mhz	0x0d
-#define CPU_CORE_SPEED_265mhz	0x0e
-#define CPU_CORE_SPEED_280mhz	0x0f
-
 /* boot CPU speed */
 #define CPU_SPEED		(CPU_CORE_SPEED_221mhz)
 

Index: idr.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/idr.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- idr.h	27 Feb 2002 17:21:47 -0000	1.8
+++ idr.h	3 Apr 2002 05:05:47 -0000	1.9
@@ -25,7 +25,7 @@
 #define BLOB_ARCH_IDR_H
 
 /* boot CPU speed */
-#define CPU_SPEED		(0x05)
+#define CPU_SPEED		(CPU_CORE_SPEED_132mhz)
 
 /* serial port */
 #define USE_SERIAL3

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

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv26515/src/blob

Modified Files:
	partition.c 
Log Message:
This has been lying around in my CVS sandbox for too long. It's obviously
correct, so why don't commit it :)



Index: partition.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/partition.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- partition.c	13 Feb 2002 00:19:57 -0000	1.3
+++ partition.c	19 Mar 2002 21:08:38 -0000	1.4
@@ -1,7 +1,7 @@
 /*
  * partition.c: flash partitioning
  *
- * Copyright (C) 2001  Erik Mouw <J.A...@it...>
+ * Copyright (C) 2001 2002  Erik Mouw <J.A...@it...>
  *
  * $Id$
  *
@@ -202,7 +202,7 @@
 
 
 
-void ptable_print(const blob_partition_t *t)
+static void ptable_print(const blob_partition_t *t)
 {
 	printf("Partition table for %d kB flash @ 0x%08x:\n",
 	       t->size / 1024, t->offset);
@@ -304,6 +304,70 @@
 }
 
 __initlist(ptable_init, INIT_LEVEL_OTHER_STUFF + 2);
+
+
+
+
+const blob_partition_t *pt_find_by_name(const char *s)
+{
+	blob_partition_t *t = ptable;
+
+	/* first entry is always the descriptor so it's safe to skip
+	 * it */
+
+	for(;;) {
+		t = next_ptable_entry(t);
+
+		switch(t->magic) {
+		case BLOB_PART_LAST_MAGIC:
+			/* this is the last one, we didn't find it :( */
+			return NULL;
+
+		case BLOB_PART_VALID_MAGIC:
+			if(strncmp(t->name, s, BLOB_PART_NAMELEN))
+				return t;
+			break;
+
+		case BLOB_PART_INVALID_MAGIC:
+			/* skip */
+			break;
+
+		default:
+			eprintf("ptable magic failed at 0x%08x\n", (u32)t);
+			return NULL;
+		}
+	}
+}
+
+
+
+
+const blob_partition_t *pt_find_by_address(u32 addr)
+{
+	blob_partition_t *t = ptable;
+
+	for(;;) {
+		t = next_ptable_entry(t);
+
+		switch(t->magic) {
+		case BLOB_PART_LAST_MAGIC:
+			return NULL;
+
+		case BLOB_PART_VALID_MAGIC:
+			if((addr >= t->offset) && 
+			   (addr < (t->offset + t->size)))
+				return t;
+			break;
+
+		case BLOB_PART_INVALID_MAGIC:
+			break;
+
+		default:
+			eprintf("ptable magic failed at 0x%08x\n", (u32)t);
+			return NULL;
+		}
+	}
+}
 
 
 

CVS: blob/include/blob partition.h,1.3,1.4

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob/include/blob
In directory usw-pr-cvs1:/tmp/cvs-serv26515/include/blob

Modified Files:
	partition.h 
Log Message:
This has been lying around in my CVS sandbox for too long. It's obviously
correct, so why don't commit it :)



Index: partition.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/partition.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- partition.h	13 Feb 2002 00:19:57 -0000	1.3
+++ partition.h	19 Mar 2002 21:08:39 -0000	1.4
@@ -113,6 +113,7 @@
 extern const blob_partition_t *default_partition_table;
 extern blob_partition_t *flash_partition_table;
 
-
+const blob_partition_t *pt_find_by_name(const char *s);
+const blob_partition_t *pt_find_by_address(u32 addr);
 
 #endif

Re: blob release?

[Erik M. <J.A...@it...>]

On Tue, Mar 12, 2002 at 05:03:47PM -0800, Christopher Hoover wrote:
> Is there a schedule for the next blob release?  Just asking out of
> curiosity.  The current cvs tree looks quite solid to me -- except
> for serial-typeahead-hang bug.

I usually release a new version when there are no knowm major bugs.
Right now we have the following issues still open:
- serial-typeahead bug fixed
- flash partitioning
- parameter block support

The development snapshots turn out to be very popular[1], and I think
we should release a new snapshot Real Soon Now[tm]. Objections?


Erik

[1] https://sourceforge.net/project/showfiles.php?group_id=30155

-- 
J.A.K. (Erik) Mouw, Information and Communication Theory Group, Faculty
of Information Technology and Systems, Delft University of Technology,
PO BOX 5031, 2600 GA Delft, The Netherlands  Phone: +31-15-2783635
Fax: +31-15-2781843  Email: J.A...@it...
WWW: http://www-ict.its.tudelft.nl/~erik/

CVS: blob/include/blob/arch assabet.h,1.8,1.9

[Stefan E. <se...@us...>]

Update of /cvsroot/blob/blob/include/blob/arch
In directory usw-pr-cvs1:/tmp/cvs-serv4821/include/blob/arch

Modified Files:
	assabet.h 
Log Message:
FIX BUG 528046:
- when neponset attached use UART3 instead of UART1



Index: assabet.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/assabet.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- assabet.h	27 Feb 2002 18:41:48 -0000	1.8
+++ assabet.h	14 Mar 2002 11:41:37 -0000	1.9
@@ -33,8 +33,16 @@
 #define CPU_SPEED		(0x0b)
 
 
-/* serial port */
-#define USE_SERIAL1
+/* serial port
+ * When neponset is attached use UART 3 (J20) to match
+ * the linux kernel
+ */
+#if !defined(NEPONSET)
+#	define USE_SERIAL1
+#else
+#	define USE_SERIAL3
+#endif
+
 #define TERMINAL_SPEED baud_9600
 
 

Re: blob release?

[Abraham vd M. <ab...@2d...>]

Hi Stefan!

> > > Is there a schedule for the next blob release?  Just asking out of
> > > curiosity.  The current cvs tree looks quite solid to me -- except for
> > > serial-typeahead-hang bug. =20
> >=20
> > It still doesn't boot on my board though :P
>=20
> Have you tried the lates CVS version? There was a bug in linux.c which
> Tim Riker _should_ have fixed.

I know about that. Tim Rikers fix doesn't solve the problem (for me at
least) though.

> Do you get any error?

No, it just uncompresses the kernel and gets stuck there

--=20

Regards
 Abraham

Isn't air travel wonderful?  Breakfast in London, dinner in New York,
luggage in Brazil.

__________________________________________________________
 Abraham vd Merwe - 2d3D, Inc.

 Device Driver Development, Outsourcing, Embedded Systems

  Cell: +27 82 565 4451         Snailmail:
   Tel: +27 21 761 7549            Block C, Antree Park
   Fax: +27 21 761 7648            Doncaster Road
 Email: ab...@2d...         Kenilworth, 7700
  Http: http://www.2d3d.com        South Africa

Re: blob release?

[Stefan E. <ste...@el...>]

On Wed, Mar 13, 2002 at 08:22:52AM +0100, Abraham vd Merwe wrote:
> Hi Christopher!
> 
> > Is there a schedule for the next blob release?  Just asking out of
> > curiosity.  The current cvs tree looks quite solid to me -- except for
> > serial-typeahead-hang bug.  
> 
> It still doesn't boot on my board though :P

Have you tried the lates CVS version? There was a bug in linux.c which
Tim Riker _should_ have fixed.

Do you get any error?

> 
> -- 
> 
> Regards
>  Abraham
> 
> Adopted kids are such a pain -- you have to teach them how to look like you
> ...
> 		-- Gilda Radner
> 
> __________________________________________________________
>  Abraham vd Merwe - 2d3D, Inc.
> 
>  Device Driver Development, Outsourcing, Embedded Systems
> 
>   Cell: +27 82 565 4451         Snailmail:
>    Tel: +27 21 761 7549            Block C, Antree Park
>    Fax: +27 21 761 7648            Doncaster Road
>  Email: ab...@2d...         Kenilworth, 7700
>   Http: http://www.2d3d.com        South Africa

Re: blob release?

[Abraham vd M. <ab...@2d...>]

Hi Christopher!

> Is there a schedule for the next blob release?  Just asking out of
> curiosity.  The current cvs tree looks quite solid to me -- except for
> serial-typeahead-hang bug. =20

It still doesn't boot on my board though :P

--=20

Regards
 Abraham

Adopted kids are such a pain -- you have to teach them how to look like you=
 ...
		-- Gilda Radner

__________________________________________________________
 Abraham vd Merwe - 2d3D, Inc.

 Device Driver Development, Outsourcing, Embedded Systems

  Cell: +27 82 565 4451         Snailmail:
   Tel: +27 21 761 7549            Block C, Antree Park
   Fax: +27 21 761 7648            Doncaster Road
 Email: ab...@2d...         Kenilworth, 7700
  Http: http://www.2d3d.com        South Africa

blob release?

[Christopher H. <ch...@mu...>]

Is there a schedule for the next blob release?  Just asking out of =
curiosity.  The current cvs tree looks quite solid to me -- except for =
serial-typeahead-hang bug.

-ch

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

[Abraham vd M. <ab...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv28894

Modified Files:
	frodo.c 
Log Message:
Reset ethernet controller when starting up.


Index: frodo.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/frodo.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- frodo.c	28 Feb 2002 11:59:34 -0000	1.3
+++ frodo.c	12 Mar 2002 09:25:27 -0000	1.4
@@ -63,11 +63,13 @@
 #define RS232_ENABLE	0x00001000
 #define IDERESET		0x80
 #define IDELED			0x40
+#define ETHRESET		0x8000
 
 static void frodo_init_hardware(void)
 {
 	u32 *bcr = (u32 *) 0x12000000;
 	u16 *ide = (u16 *) 0x40008000;
+	u16 *eth = (u16 *) 0x40014000;
 
 	/* enable RS232 tranceiver */
 	*bcr = RS232_ENABLE;
@@ -78,6 +80,10 @@
 	/* reset the drive */
 	*ide |= IDERESET;
 	*ide &= ~IDERESET;
+
+	/* reset the ethernet controller */
+	*eth |= ETHRESET;
+	*eth &= ~ETHRESET;
 
 	/* select serial driver */
 	serial_driver = &sa11x0_serial_driver;

CVS: blob/src/blob intel16.c,1.5,1.6 intel32.c,1.5,1.6

[Christopher H. <ch...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv11137/src/blob

Modified Files:
	intel16.c intel32.c 
Log Message:
clear flash error status before attempting to lock/unlock a block; otherwise past errors may be seen.  this fixes bug 514517 (tested with C3 flash).

Index: intel16.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/intel16.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- intel16.c	15 Jan 2002 01:32:47 -0000	1.5
+++ intel16.c	11 Mar 2002 22:06:55 -0000	1.6
@@ -66,12 +66,6 @@
 
 #define FLASH_TIMEOUT (20)
 
-static void clear_status(u16 *addr)
-{
-	*addr = STATUS_CLEAR;
-	barrier();
-}
-
 static int get_status(u16 *addr)
 {
 	u32 start, end;
@@ -93,6 +87,12 @@
 	}
 }
 
+static void clear_status(u16 *addr)
+{
+	*addr = STATUS_CLEAR;
+	barrier();
+}
+
 static void print_flash_error(const char *what, u16 *addr, int status)
 {
 	serial_write('\n');
@@ -249,6 +249,8 @@
 	u16 *p = (u16 *) blockStart;
 	int status;
 
+	clear_status(p);
+
 	*p = CONFIG_SETUP;
 	barrier();
 	*p = LOCK_SECTOR;
@@ -273,6 +275,8 @@
 	u16 *p = (u16 *) blockStart;
 	int status;
 
+	clear_status(p);
+
 	*p = CONFIG_SETUP;
 	barrier();
 	*p = UNLOCK_SECTOR;
@@ -297,6 +301,8 @@
 {
 	u16 *p = (u16 *) blockStart;
 	u16 result;
+
+	clear_status(p);
 
 	*p = READ_CONFIG;
 	barrier();

Index: intel32.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/intel32.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- intel32.c	15 Jan 2002 01:32:47 -0000	1.5
+++ intel32.c	11 Mar 2002 22:06:55 -0000	1.6
@@ -66,12 +66,6 @@
 
 #define FLASH_TIMEOUT (20)
 
-static void clear_status(u32 *addr)
-{
-	*addr = data_to_flash(STATUS_CLEAR);
-	barrier();
-}
-
 static int get_status(u32 *addr)
 {
 	u32 start, end;
@@ -93,6 +87,12 @@
 	}
 }
 
+static void clear_status(u32 *addr)
+{
+	*addr = data_to_flash(STATUS_CLEAR);
+	barrier();
+}
+
 static void print_flash_error(const char *what, u32 *addr, int status)
 {
 	serial_write('\n');
@@ -199,6 +199,8 @@
 {
 	u32 status;
 
+	clear_status(blockStart);
+
 	*blockStart = data_to_flash(CONFIG_SETUP);
 	barrier();
 	*blockStart = data_to_flash(LOCK_SECTOR);
@@ -222,6 +224,8 @@
 {
 	u32 status;
 
+	clear_status(blockStart);
+
 	*blockStart = data_to_flash(CONFIG_SETUP);
 	barrier();
 	*blockStart = data_to_flash(UNLOCK_SECTOR);
@@ -244,6 +248,8 @@
 static int flash_query_block_lock_intel32(u32 *blockStart)
 {
 	u32 result;
+
+	clear_status(blockStart);
 
 	*blockStart = data_to_flash(READ_CONFIG);
 	barrier();

CVS: blob/src/blob linux.c,1.12,1.13

[Tim R. <tim...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv11587/src/blob

Modified Files:
	linux.c 
Log Message:
disable from flash till we fix it

Index: linux.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/linux.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- linux.c	5 Mar 2002 15:20:23 -0000	1.12
+++ linux.c	5 Mar 2002 20:17:04 -0000	1.13
@@ -170,13 +170,17 @@
 	params->hdr.tag = ATAG_INITRD;
 	params->hdr.size = tag_size(tag_initrd);
 
+#ifdef SOMEONE_FIXED_INITRD_FROM_FLASH
 	if (blob_status.load_ramdisk == 1) {
+#endif
 		params->u.initrd.start = RAMDISK_RAM_BASE;
 		params->u.initrd.size = blob_status.ramdiskSize;
+#ifdef SOMEONE_FIXED_INITRD_FROM_FLASH
 	} else {
 		params->u.initrd.start = RAMDISK_FLASH_BASE;
 		params->u.initrd.size = RAMDISK_FLASH_LEN;
 	}
+#endif
 
 	params = tag_next(params);
 }

CVS: blob/src/blob linux.c,1.11,1.12

[Stefan E. <se...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv9285

Modified Files:
	linux.c 
Log Message:
fixed = / == bug, but does not solve boot problem


Index: linux.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/linux.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- linux.c	27 Feb 2002 18:41:48 -0000	1.11
+++ linux.c	5 Mar 2002 15:20:23 -0000	1.12
@@ -170,7 +170,7 @@
 	params->hdr.tag = ATAG_INITRD;
 	params->hdr.size = tag_size(tag_initrd);
 
-	if (blob_status.load_ramdisk = 1) {
+	if (blob_status.load_ramdisk == 1) {
 		params->u.initrd.start = RAMDISK_RAM_BASE;
 		params->u.initrd.size = blob_status.ramdiskSize;
 	} else {

Re: latest blob CVS problems

[Stefan E. <ste...@el...>]

On Wed, Feb 27, 2002 at 11:39:37AM -0700, Tim Riker wrote:
> Ok, my patch that I thought worked did not really, as it was loading
> initrd from ram. I changed most systems back to loading from ram. idr
> and shannon are set to no load a ramdisk at present. I'll debug further
> why initrd from flash does not work.
> 
> Update from cvs and try again. Should work now.
> 
> Sorry.
> 

Hmmm, I just checked out a fresh CVS version of blob and my kernel
still does not boot. It works with the pre2 CVS version.

Any more ideas?

LOAD_RAMDISK is set to 1

I'll poke around a little ...

Stefan

CVS: blob/src/blob frodo.c,1.2,1.3

[Abraham vd M. <ab...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv11270

Modified Files:
	frodo.c 
Log Message:
Added support for IDE.


Index: frodo.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/frodo.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- frodo.c	13 Feb 2002 00:08:54 -0000	1.2
+++ frodo.c	28 Feb 2002 11:59:34 -0000	1.3
@@ -60,15 +60,24 @@
 
 
 
-#define RS232_ENABLE		0x00001000
-#define GREEN_LED_ENABLE	0x00000000
+#define RS232_ENABLE	0x00001000
+#define IDERESET		0x80
+#define IDELED			0x40
 
 static void frodo_init_hardware(void)
 {
-	u32 *bcr = (u32 *)0x12000000;
-	
-	/* enable RS232 tranceiver and green LED */
-	*bcr = RS232_ENABLE | GREEN_LED_ENABLE;
+	u32 *bcr = (u32 *) 0x12000000;
+	u16 *ide = (u16 *) 0x40008000;
+
+	/* enable RS232 tranceiver */
+	*bcr = RS232_ENABLE;
+
+	/* switch off IDE led */
+	*ide &= ~IDELED;
+
+	/* reset the drive */
+	*ide |= IDERESET;
+	*ide &= ~IDERESET;
 
 	/* select serial driver */
 	serial_driver = &sa11x0_serial_driver;

CVS: blob/src/blob linux.c,1.10,1.11

[Tim R. <tim...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv27006/src/blob

Modified Files:
	linux.c 
Log Message:
ok, decompressing from flash does not work, set most platforms back so they copy to ram

Index: linux.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/linux.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- linux.c	27 Feb 2002 03:28:05 -0000	1.10
+++ linux.c	27 Feb 2002 18:41:48 -0000	1.11
@@ -170,7 +170,7 @@
 	params->hdr.tag = ATAG_INITRD;
 	params->hdr.size = tag_size(tag_initrd);
 
-	if (blob_status.ramdiskType = fromDownload) {
+	if (blob_status.load_ramdisk = 1) {
 		params->u.initrd.start = RAMDISK_RAM_BASE;
 		params->u.initrd.size = blob_status.ramdiskSize;
 	} else {

CVS: blob/include/blob/arch accelent_sa.h,1.3,1.4 assabet.h,1.7,1.8 badge4.h,1.5,1.6 brutus.h,1.5,1.6 clart.h,1.6,1.7 frodo.h,1.7,1.8 h3600.h,1.6,1.7 jornada720.h,1.4,1.5 lart.h,1.5,1.6 nesa.h,1.7,1.8 pleb.h,1.5,1.6 system3.h,1.13,1.14

[Tim R. <tim...@us...>]

Update of /cvsroot/blob/blob/include/blob/arch
In directory usw-pr-cvs1:/tmp/cvs-serv27006/include/blob/arch

Modified Files:
	accelent_sa.h assabet.h badge4.h brutus.h clart.h frodo.h 
	h3600.h jornada720.h lart.h nesa.h pleb.h system3.h 
Log Message:
ok, decompressing from flash does not work, set most platforms back so they copy to ram

Index: accelent_sa.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/accelent_sa.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- accelent_sa.h	27 Feb 2002 17:21:47 -0000	1.3
+++ accelent_sa.h	27 Feb 2002 18:41:47 -0000	1.4
@@ -60,7 +60,7 @@
 #define PARAM_FLASH_LEN		(256 * 1024)
 #define KERNEL_FLASH_BASE	(PARAM_FLASH_BASE + PARAM_FLASH_LEN)
 #define KERNEL_FLASH_LEN	(1024 * 1024)
-#define LOAD_RAMDISK		0 /* leave ramdisk in flash */
+#define LOAD_RAMDISK		1 /* load ramdisk into ram */
 #define RAMDISK_FLASH_BASE	(KERNEL_FLASH_BASE + KERNEL_FLASH_LEN)
 #define RAMDISK_FLASH_LEN	(4 * 1024 * 1024)
 

Index: assabet.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/assabet.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- assabet.h	27 Feb 2002 17:21:47 -0000	1.7
+++ assabet.h	27 Feb 2002 18:41:48 -0000	1.8
@@ -60,7 +60,7 @@
 #define PARAM_FLASH_LEN		(256 * 1024)
 #define KERNEL_FLASH_BASE	(PARAM_FLASH_BASE + PARAM_FLASH_LEN)
 #define KERNEL_FLASH_LEN	(1024 * 1024)
-#define LOAD_RAMDISK		0 /* leave ramdisk in flash */
+#define LOAD_RAMDISK		1 /* load ramdisk into ram */
 #define RAMDISK_FLASH_BASE	(KERNEL_FLASH_BASE + KERNEL_FLASH_LEN)
 #define RAMDISK_FLASH_LEN	(4 * 1024 * 1024)
 

Index: badge4.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/badge4.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- badge4.h	27 Feb 2002 17:21:47 -0000	1.5
+++ badge4.h	27 Feb 2002 18:41:48 -0000	1.6
@@ -61,7 +61,7 @@
 #define PARAM_FLASH_LEN		(0x00002000 * 2)
 #define KERNEL_FLASH_BASE	(PARAM_FLASH_BASE + PARAM_FLASH_LEN)
 #define KERNEL_FLASH_LEN	(0x00010000 * 16)
-#define LOAD_RAMDISK		0 /* leave ramdisk in flash */
+#define LOAD_RAMDISK		1 /* load ramdisk into ram */
 #define RAMDISK_FLASH_BASE	(KERNEL_FLASH_BASE + KERNEL_FLASH_LEN)
 #define RAMDISK_FLASH_LEN	(0x00010000 * 47)
 

Index: brutus.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/brutus.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- brutus.h	27 Feb 2002 17:21:47 -0000	1.5
+++ brutus.h	27 Feb 2002 18:41:48 -0000	1.6
@@ -61,7 +61,7 @@
 #define PARAM_FLASH_LEN		(64 * 1024)
 #define KERNEL_FLASH_BASE	(PARAM_FLASH_BASE + PARAM_FLASH_LEN)
 #define KERNEL_FLASH_LEN	((1024 - 128) * 1024)
-#define LOAD_RAMDISK		0 /* leave ramdisk in flash */
+#define LOAD_RAMDISK		1 /* load ramdisk into ram */
 #define RAMDISK_FLASH_BASE	(KERNEL_FLASH_BASE + KERNEL_FLASH_LEN)
 #define RAMDISK_FLASH_LEN	(4 * 1024 * 1024 - BLOB_FLASH_LEN - PARAM_FLASH_LEN - KERNEL_FLASH_LEN)
 

Index: clart.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/clart.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- clart.h	27 Feb 2002 17:21:47 -0000	1.6
+++ clart.h	27 Feb 2002 18:41:48 -0000	1.7
@@ -60,7 +60,7 @@
 #define PARAM_FLASH_LEN		(128 * 1024)
 #define KERNEL_FLASH_BASE	(PARAM_FLASH_BASE + PARAM_FLASH_LEN)
 #define KERNEL_FLASH_LEN	(1024 * 1024)
-#define LOAD_RAMDISK		0 /* leave ramdisk in flash */
+#define LOAD_RAMDISK		1 /* load ramdisk into ram */
 #define RAMDISK_FLASH_BASE	(KERNEL_FLASH_BASE + KERNEL_FLASH_LEN)
 #define RAMDISK_FLASH_LEN	(4 * 1024 * 1024)
 

Index: frodo.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/frodo.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- frodo.h	27 Feb 2002 17:21:47 -0000	1.7
+++ frodo.h	27 Feb 2002 18:41:48 -0000	1.8
@@ -103,7 +103,7 @@
 #define PARAM_FLASH_LEN		(256 * 1024)
 #define KERNEL_FLASH_BASE	(PARAM_FLASH_BASE + PARAM_FLASH_LEN)
 #define KERNEL_FLASH_LEN	(1024 * 1024)
-#define LOAD_RAMDISK		0 /* leave ramdisk in flash */
+#define LOAD_RAMDISK		1 /* load ramdisk into ram */
 #define RAMDISK_FLASH_BASE	(KERNEL_FLASH_BASE + KERNEL_FLASH_LEN)
 #define RAMDISK_FLASH_LEN	(4 * 1024 * 1024)
 

Index: h3600.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/h3600.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- h3600.h	27 Feb 2002 17:21:47 -0000	1.6
+++ h3600.h	27 Feb 2002 18:41:48 -0000	1.7
@@ -60,7 +60,7 @@
 #define PARAM_FLASH_LEN		(256 * 1024)
 #define KERNEL_FLASH_BASE	(PARAM_FLASH_BASE + PARAM_FLASH_LEN)
 #define KERNEL_FLASH_LEN	(1024 * 1024)
-#define LOAD_RAMDISK		0 /* leave ramdisk in flash */
+#define LOAD_RAMDISK		1 /* load ramdisk into ram */
 #define RAMDISK_FLASH_BASE	(KERNEL_FLASH_BASE + KERNEL_FLASH_LEN)
 #define RAMDISK_FLASH_LEN	(4 * 1024 * 1024)
 

Index: jornada720.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/jornada720.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jornada720.h	27 Feb 2002 17:21:47 -0000	1.4
+++ jornada720.h	27 Feb 2002 18:41:48 -0000	1.5
@@ -61,7 +61,7 @@
 #define PARAM_FLASH_LEN		(1 * 256 * 1024)
 #define KERNEL_FLASH_BASE	(PARAM_FLASH_BASE + PARAM_FLASH_LEN)
 #define KERNEL_FLASH_LEN	(4 * 256 * 1024)
-#define LOAD_RAMDISK		0 /* leave ramdisk in flash */
+#define LOAD_RAMDISK		1 /* load ramdisk into ram */
 #define RAMDISK_FLASH_BASE	(KERNEL_FLASH_BASE + KERNEL_FLASH_LEN)
 #define RAMDISK_FLASH_LEN	(8 * 256 * 1024)
 

Index: lart.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/lart.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- lart.h	27 Feb 2002 17:21:47 -0000	1.5
+++ lart.h	27 Feb 2002 18:41:48 -0000	1.6
@@ -60,7 +60,7 @@
 #define PARAM_FLASH_LEN		(64 * 1024)
 #define KERNEL_FLASH_BASE	(PARAM_FLASH_BASE + PARAM_FLASH_LEN)
 #define KERNEL_FLASH_LEN	((1024 - 128) * 1024)
-#define LOAD_RAMDISK		0 /* leave ramdisk in flash */
+#define LOAD_RAMDISK		1 /* load ramdisk into ram */
 #define RAMDISK_FLASH_BASE	(KERNEL_FLASH_BASE + KERNEL_FLASH_LEN)
 #define RAMDISK_FLASH_LEN	(4 * 1024 * 1024 - BLOB_FLASH_LEN - PARAM_FLASH_LEN - KERNEL_FLASH_LEN)
 

Index: nesa.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/nesa.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- nesa.h	27 Feb 2002 17:21:47 -0000	1.7
+++ nesa.h	27 Feb 2002 18:41:48 -0000	1.8
@@ -63,7 +63,7 @@
 #define NESA_ERASE_BLOCK	(2 * 64 * 1024)
 #define KERNEL_FLASH_BASE	(PARAM_FLASH_BASE + PARAM_FLASH_LEN)
 #define KERNEL_FLASH_LEN	(NESA_ERASE_BLOCK * 3)
-#define LOAD_RAMDISK		0 /* leave ramdisk in flash */
+#define LOAD_RAMDISK		1 /* load ramdisk into ram */
 #define RAMDISK_FLASH_BASE	(KERNEL_FLASH_BASE + KERNEL_FLASH_LEN)
 #define RAMDISK_FLASH_LEN	(NESA_ERASE_BLOCK * (32 - 4))
 

Index: pleb.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/pleb.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pleb.h	27 Feb 2002 17:21:47 -0000	1.5
+++ pleb.h	27 Feb 2002 18:41:48 -0000	1.6
@@ -62,7 +62,7 @@
 #define PARAM_FLASH_LEN		(64 * 1024)
 #define KERNEL_FLASH_BASE	(PARAM_FLASH_BASE + PARAM_FLASH_LEN)
 #define KERNEL_FLASH_LEN	((1024 - 128) * 1024)
-#define LOAD_RAMDISK		0 /* leave ramdisk in flash */
+#define LOAD_RAMDISK		1 /* load ramdisk into ram */
 #define RAMDISK_FLASH_BASE	(KERNEL_FLASH_BASE + KERNEL_FLASH_LEN)
 #define RAMDISK_FLASH_LEN	(4 * 1024 * 1024 - BLOB_FLASH_LEN - PARAM_FLASH_LEN - KERNEL_FLASH_LEN)
 

Index: system3.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/system3.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- system3.h	27 Feb 2002 17:21:47 -0000	1.13
+++ system3.h	27 Feb 2002 18:41:48 -0000	1.14
@@ -64,7 +64,7 @@
 #define PARAM_FLASH_LEN		(256 * 1024)
 #define KERNEL_FLASH_BASE	(0x00080000)
 #define KERNEL_FLASH_LEN	(1024 * 1024)
-#define LOAD_RAMDISK		0 /* leave ramdisk in flash */
+#define LOAD_RAMDISK		1 /* load ramdisk into ram */
 #define RAMDISK_FLASH_BASE	(0x00180000)
 #define RAMDISK_FLASH_LEN	(4 * 1024 * 1024)
 

Re: latest blob CVS problems

[Tim R. <Ti...@Ri...>]

Ok, my patch that I thought worked did not really, as it was loading
initrd from ram. I changed most systems back to loading from ram. idr
and shannon are set to no load a ramdisk at present. I'll debug further
why initrd from flash does not work.

Update from cvs and try again. Should work now.

Sorry.

Tim Riker wrote:
> 
> This would not have any effect until the initrd is accessed, no? That
> happens after most all of the kernel text is displayed.
> 
> Erik Mouw wrote:
> >
> > On Wed, Feb 27, 2002 at 11:54:54AM +0200, Abraham vd Merwe wrote:
> > > I see blob is bootable again after Erik fixed the Makefile, but now blob
> > > doesn't want to boot my linux kernel anymore. It just does this each time:
> > >
> > > ------------< snip <------< snip <------< snip <------------
> > > blob> boot
> > >
> > > Starting kernel ...
> > >
> > > Uncompressing Linux........................................ done, booting
> > > the k.
> > > ------------< snip <------< snip <------< snip <------------
> > >
> > > And get stuck there. Any ideas?
> >
> > Back out Tim's patches (in your sandbox) and see if that solves the
> > problem. I guess it will because I don't expect the kernel to be able
> > to boot with ATAG_INITRD put on a flash address (because there probably
> > isn't a logical-->physical address mapping so early in the boot
> > process).
-- 
Tim Riker - http://rikers.org/ - short SIGs! <g>
All I need to know I could have learned in Kindergarten
... if I'd just been paying attention.