blob-cvs-commit — blob CVS commit messages list

RE: blob...arch specific files

[Yamijala S. <Sri...@si...>]

I got it from a local vendor here in India.He isnt much aware of the other
details.
But the documentation says it is a LART type.but isnt LART too generic?
Pls let me know.

what aspect causes the differentiation between
"Assabet"/"Neponset"/"h3600"/"creditlart"
or any other part?i suppose all are based on SA-1110.so what exactly is the
distinguishing factor?

And, the 'blob' provides system initialisation code.am i right?

-----Original Message-----
From: Russ Dill [mailto:Rus...@as...]
Sent: Friday, September 12, 2003 9:26 AM
To: Yamijala Sridhar
Cc: blo...@li...
Subject: Re: blob...arch specific files


On Wed, 2003-09-10 at 22:02, Yamijala Sridhar wrote:
> Thanks Stefan and Russ...the board is SA-1110 based but how do i know
> which type it is: 
> i.e., how do i know whether it is "Assabet" / "Neponset" / "h3600" /
> "creditlart" / "system3" or any other type?
> Sorry for the confusion.I need another clarification.On what basis are
> the declarations for the 
> various addresses and lengths in <include/blob/arch/arch.h> made ?
> Could anyone pls guide me.

where did you get the board? does it say anything on it?

-- 
Russ Dill <Rus...@as...>

blob...arch specific files

[Yamijala S. <Sri...@si...>]

Thanks Stefan and Russ...the board is SA-1110 based but how do i know which
type it is: 
i.e., how do i know whether it is "Assabet" / "Neponset" / "h3600" /
"creditlart" / "system3" or any other type?
Sorry for the confusion.I need another clarification.On what basis are the
declarations for the 
various addresses and lengths in <include/blob/arch/arch.h> made ?
Could anyone pls guide me.
 
Sridhar

RE: blob...how does it start?

[Yamijala S. <Sri...@si...>]

Thank you.I take your suggestion.
But,i would like to add that my aim is to port not just applications
but also any linux flavour to any custom board.that is why i intend to start
with 'blob' bootloader
for my SA-1110 board.is this approach right?

PS: I missed mentioning this point in my earlier mail.

Nevertheless, thanks once again for guiding me.

Sridhar

-----Original Message-----
From: Russ Dill [mailto:Rus...@as...]
Sent: Wednesday, September 10, 2003 1:14 PM
To: Yamijala Sridhar
Cc: blo...@li...
Subject: RE: blob...how does it start?


On Tue, 2003-09-09 at 23:14, Yamijala Sridhar wrote:
> Thank you Russ for your prompt response.
> Well, yes, I will try to be more specific this time.
> Im a newcomer to Linux based custom board development and am currently
> involved in efforts to build competency in this domain.
> 
> I am aware of the basic Linux commands.But, my interest isnt in
> application development.
> Rather, i want to concentrate on the core stuff that makes porting
> applications to different
> platforms easier and on device driver development.

if you want to "port" applications, then why are you looking at blob, 99
times out of 100, an application will work under linux, regardless of
platform.

> So i wanted to start off with the 'blob' first...the board im using is
> SA-1110 based board.

what board?

> Could you pls guide me as to how to proceed to understand 'blob'
> completely.

did you read the README?

> Start with what? the entire sequence of files to grep to reach the
> stage where the Linux kernel starts,
> and also the documents that i need to refer to do this.

If thats what you want to know, but really, you want to look at the
blob-start stuff. The blob-rest stuff is mainly utilities and such,
although there is stuff in there for setting kernel paramaters and
jumping to the kernel once it is loaded into ram

-- 
Russ Dill <Rus...@as...>

Re: blob...how does it start?

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

On Wed, Sep 10, 2003 at 11:44:49AM +0530, Yamijala Sridhar wrote:
> Thank you Russ for your prompt response.
> Well, yes, I will try to be more specific this time.
> Im a newcomer to Linux based custom board development and am currently
> involved in
> efforts to build competency in this domain.

Well, there's no short path, and no magic way where you suddenly wake
up and grok the blob.

You'll have to read the source.

Try to port blob to your platform first. Or rather, try to build
blob for a existing platform. Get the newest CVS version for that.

Then read blob/doc/*.txt.

Then try to port it to your platform (using doc/porting.txt). If it is already
ported, then try to modify some parts, and look what changes. Learning by
doing, ok?

> 
> I am aware of the basic Linux commands.But, my interest isnt in application
> development.
> Rather, i want to concentrate on the core stuff that makes porting
> applications to different
> platforms easier and on device driver development.
> 
> So i wanted to start off with the 'blob' first...the board im using is
> SA-1110 based board.

Thats just _very_ generic. There are _many_ SA1110 based boards ....

> Could you pls guide me as to how to proceed to understand 'blob' completely.
> 
> Start with what?the entire sequence of files to grep to reach the stage
> where the Linux kernel starts,
> and also the documents that i need to refer to do this.

Russ gave you already some hints where to look at.

> 
> Thank You
> Sridhar
> 
> 
> -----Original Message-----
> From: Russ Dill [mailto:Rus...@as...]
> Sent: Wednesday, September 10, 2003 11:27 AM
> To: Yamijala Sridhar
> Cc: blo...@li...
> Subject: Re: blob...how does it start?
> 
> 
> On Tue, 2003-09-09 at 21:11, Yamijala Sridhar wrote:
> > Hallo All !!!
> > 
> > Could you pls let me know what invokes the 'blob' or rather where or
> > what is the assembly code that starts the 'blob' for my StrongARM
> > SA-1110 board?
> 
> Just look at the code. Blob has two parts, blob-start and blob-rest.
> 
> blob-start starts with start.S. Check out the linker scripts (.lds
> stuff)
> 
> blob-rest starts with trampoline.S and then jumps to main.c
> 
> 
> Maybe you should be more specific about what you want to know.
> 
> -- 
> Russ Dill <Rus...@as...>

-- 
Eletztrick Computing - Customized Linux Development
Stefan Eletzhofer, Marktstrasse 43, DE-88214 Ravensburg
http://www.eletztrick.de

RE: blob...how does it start?

[Yamijala S. <Sri...@si...>]

Thank you Russ for your prompt response.
Well, yes, I will try to be more specific this time.
Im a newcomer to Linux based custom board development and am currently
involved in
efforts to build competency in this domain.

I am aware of the basic Linux commands.But, my interest isnt in application
development.
Rather, i want to concentrate on the core stuff that makes porting
applications to different
platforms easier and on device driver development.

So i wanted to start off with the 'blob' first...the board im using is
SA-1110 based board.
Could you pls guide me as to how to proceed to understand 'blob' completely.

Start with what?the entire sequence of files to grep to reach the stage
where the Linux kernel starts,
and also the documents that i need to refer to do this.

Thank You
Sridhar


-----Original Message-----
From: Russ Dill [mailto:Rus...@as...]
Sent: Wednesday, September 10, 2003 11:27 AM
To: Yamijala Sridhar
Cc: blo...@li...
Subject: Re: blob...how does it start?


On Tue, 2003-09-09 at 21:11, Yamijala Sridhar wrote:
> Hallo All !!!
> 
> Could you pls let me know what invokes the 'blob' or rather where or
> what is the assembly code that starts the 'blob' for my StrongARM
> SA-1110 board?

Just look at the code. Blob has two parts, blob-start and blob-rest.

blob-start starts with start.S. Check out the linker scripts (.lds
stuff)

blob-rest starts with trampoline.S and then jumps to main.c


Maybe you should be more specific about what you want to know.

-- 
Russ Dill <Rus...@as...>

blob...how does it start?

[Yamijala S. <Sri...@si...>]

Hallo All !!!

Could you pls let me know what invokes the 'blob' or rather where or what is
the assembly code that starts the 'blob' for my StrongARM SA-1110 board?

Thank You
Sridhar

Test Email

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

This is a test.
-- 
Eletztrick Computing - Customized Linux Development
Stefan Eletzhofer, Marktstrasse 43, DE-88214 Ravensburg
http://www.eletztrick.de

CVS: blob/src/commands Makefile.am,1.8,1.9

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

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

Modified Files:
	Makefile.am 
Log Message:
Include always all objects in libcommand.a. The linker will
sort out unneeded commands. Without this, build fails for
--with-commands=all


Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/commands/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	15 Aug 2003 06:18:57 -0000	1.8
+++ Makefile.am	20 Aug 2003 23:14:34 -0000	1.9
@@ -26,9 +26,7 @@
 
 libcommands_a_SOURCES	= \
 	terminal.c \
-	reboot.c
-
-EXTRA_libcommands_a_SOURCES	= \
+	reboot.c \
 	call.c \
 	changebit.c \
 	dummy.c \

CVS: blob/src/blob system3.c,1.32,1.33

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

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

Modified Files:
	system3.c 
Log Message:
system 3 rev 0802 flash defines

Index: system3.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/system3.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- system3.c	21 Aug 2003 00:32:24 -0000	1.32
+++ system3.c	21 Aug 2003 12:43:44 -0000	1.33
@@ -134,7 +134,7 @@
 		magic:	BLOB_DEFAULT_PART_TABLE_MAGIC,
 		next:	sizeof(blob_partition_t),
 		offset:	0x00000000,	/* absolute base address */
-		size:	16 * 1024 * 1024 /* total size of the flash */
+		size:	0x02000000  /* total size of the flash */
 	},
 	{
 		/* blob itself */
@@ -191,6 +191,15 @@
 		offset:		DATAFS_FLASH_BASE,
 		size:		DATAFS_FLASH_LEN,
 		name:		"data.img",
+		flags:		BLOB_PART_FLAG_CRAMFS,
+	},
+	{
+		/* xtended data (cramfs) */
+		magic:		BLOB_PART_VALID_MAGIC,
+		next:		sizeof(blob_partition_t),
+		offset:		XDATAFS_FLASH_BASE,
+		size:		XDATAFS_FLASH_LEN,
+		name:		"xdata.img",
 		flags:		BLOB_PART_FLAG_CRAMFS,
 	},
 	{

CVS: blob/src/lib generic_io.c,1.7,1.8

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

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

Modified Files:
	generic_io.c 
Log Message:
check space in copy

Index: generic_io.c
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/generic_io.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- generic_io.c	3 Apr 2003 14:21:23 -0000	1.7
+++ generic_io.c	21 Aug 2003 11:44:34 -0000	1.8
@@ -259,8 +259,15 @@
 	DBGIO( 5, src );
 	DBGIO( 5, dest );
 
+
 	if ( amount == 0 ) {
 		amount = io_get_size( src );
+	}
+
+	if ( amount > io_get_size( dest ) ) {
+		printf( "\n\nio_copy: src size (%d) > dest space (%d)!\n\n",
+				amount, io_get_size( dest ) );
+		return -ETOOLONG; // -ENOSPC ;)
 	}
 
 	blocks = amount / 512 + (amount%512?1:0);

CVS: blob/src/blob memsetup-sa1110.S,1.18,1.19

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

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

Modified Files:
	memsetup-sa1110.S 
Log Message:
include memsetup.h _after_ arch.h due to namespace clashes
between memsetup.h and kernel defines.

NOTE: The real fix is IMNSHO to _remove_ all dependencies from
  linux kernel headers in blob. They change. It's a mess.


Index: memsetup-sa1110.S
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/memsetup-sa1110.S,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- memsetup-sa1110.S	1 Apr 2003 18:58:55 -0000	1.18
+++ memsetup-sa1110.S	20 Aug 2003 23:06:11 -0000	1.19
@@ -54,8 +54,8 @@
  *   - stefan
  */
 #define BLOB_NEED_MEMCONFIG
-#include <blob/memsetup.h>
 #include <blob/arch.h>
+#include <blob/memsetup.h>
 
 .text
 .globl memsetup

CVS: blob/src/commands sysupd.c,1.3,1.4

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

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

Modified Files:
	sysupd.c 
Log Message:
add xdata image. Should be arch dep.

Index: sysupd.c
===================================================================
RCS file: /cvsroot/blob/blob/src/commands/sysupd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sysupd.c	21 Aug 2003 00:28:03 -0000	1.3
+++ sysupd.c	21 Aug 2003 12:48:05 -0000	1.4
@@ -46,6 +46,7 @@
 #include <blob/ide.h>
 #include <blob/tar.h>
 
+/* FIXME: make this arch indep. */
 /* these are the default images */
 static char *update_files[] = {
 	"blob",
@@ -53,7 +54,8 @@
 	"zImage",
 	"initrd.gz",
 	"cramfs",
-	"data.img"
+	"data.img",
+	"xdata.img"
 };
 
 

CVS: blob/src/diag system3.c,1.11,1.12

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

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

Modified Files:
	system3.c 
Log Message:
fix another include. This gets annoying.


Index: system3.c
===================================================================
RCS file: /cvsroot/blob/blob/src/diag/system3.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- system3.c	6 Aug 2003 22:55:41 -0000	1.11
+++ system3.c	20 Aug 2003 23:15:53 -0000	1.12
@@ -39,7 +39,7 @@
 #include <blob/serial.h>
 #include <blob/time.h>
 #include <blob/arch.h>
-#include <blob/sa1111.h>
+#include <blob/proc/sa1111.h>
 
 #include <blob/lcd.h>
 

CVS: blob configure.in,1.66,1.67

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

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

Modified Files:
	configure.in 
Log Message:
only define vars if they weren't set before. Otherwise the
summary is wrong and thus confusing.


Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- configure.in	15 Aug 2003 06:18:57 -0000	1.66
+++ configure.in	21 Aug 2003 00:26:44 -0000	1.67
@@ -739,9 +739,9 @@
 
 
 dnl Initialize flags without --enable/--disable code:
-pcmcia_flag=no
-cf_flag=no
-ide_flag=no
+pcmcia_flag=${pcmcia_flag-no}
+cf_flag=${cf_flag-no}
+ide_flag=${ide_flag-no}
 
 dnl Add C flags to display more warnings
 AC_MSG_CHECKING(for C flags to get more warnings)

CVS: blob/src/commands setip.c,1.2,1.3 sysupd.c,1.2,1.3 tftp.c,1.2,1.3

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

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

Modified Files:
	setip.c sysupd.c tftp.c 
Log Message:
undefine debug


Index: setip.c
===================================================================
RCS file: /cvsroot/blob/blob/src/commands/setip.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setip.c	6 Aug 2003 22:55:41 -0000	1.2
+++ setip.c	21 Aug 2003 00:28:03 -0000	1.3
@@ -43,8 +43,8 @@
 /**********************************************************************
  * defines
  */
-#define SETIP_DEBUG 0
-#if SETIP_DEBUG
+#undef SETIP_DEBUG
+#ifdef SETIP_DEBUG
 static int dbg = 1;
 #	define DBG( x, args... )	if ( dbg>=x ) printf( args )
 #else

Index: sysupd.c
===================================================================
RCS file: /cvsroot/blob/blob/src/commands/sysupd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sysupd.c	6 Aug 2003 22:55:41 -0000	1.2
+++ sysupd.c	21 Aug 2003 00:28:03 -0000	1.3
@@ -60,8 +60,8 @@
 /**********************************************************************
  * defines
  */
-#define SYSUPD_DEBUG 1
-#if SYSUPD_DEBUG
+#undef SYSUPD_DEBUG
+#ifdef SYSUPD_DEBUG
 static int dbg = 1;
 #	define DBG( x, args... )	if ( dbg>=x ) printf( args )
 #else

Index: tftp.c
===================================================================
RCS file: /cvsroot/blob/blob/src/commands/tftp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tftp.c	6 Aug 2003 22:55:41 -0000	1.2
+++ tftp.c	21 Aug 2003 00:28:03 -0000	1.3
@@ -46,8 +46,8 @@
 /**********************************************************************
  * defines
  */
-#define TFTP_DEBUG 0
-#if TFTP_DEBUG
+#undef TFTP_DEBUG
+#ifdef TFTP_DEBUG
 static int dbg = 1;
 #	define DBG( x, args... )	if ( dbg>=x ) printf( args )
 #else

CVS: blob/src/lib tftp.c,1.3,1.4

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

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

Modified Files:
	tftp.c 
Log Message:
undefine debug


Index: tftp.c
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/tftp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tftp.c	18 Mar 2003 16:20:49 -0000	1.3
+++ tftp.c	21 Aug 2003 00:28:03 -0000	1.4
@@ -2,6 +2,7 @@
  *  tftp.c
  *
  *  Copyright 1996-2001 Russell King
+ *  Copyright 2002,2003 Stefan Eletzhofer <ste...@el...>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -15,7 +16,7 @@
 #include <net/arp.h>
 #include <net/tftp.h>
 
-#define TFTP_DEBUG
+#undef TFTP_DEBUG
 #ifdef TFTP_DEBUG
 static int dbg = 1;
 #	define DBG( x, args... )	if ( dbg>=x ) printf( args )

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

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

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

Modified Files:
	smc9196.c 
Log Message:
undefine debug


Index: smc9196.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/smc9196.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- smc9196.c	18 Mar 2003 16:22:09 -0000	1.2
+++ smc9196.c	21 Aug 2003 00:28:03 -0000	1.3
@@ -33,7 +33,7 @@
 /**********************************************************************
  * defines
  */
-#define SMC_DEBUG
+#undef SMC_DEBUG
 
 #ifdef SMC_DEBUG
 #	define DBG( x, args... )	if ( dbg>=x ) printf( args )

CVS: blob/src/blob system3.c,1.31,1.32

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

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

Modified Files:
	system3.c 
Log Message:
startup beep

Index: system3.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/system3.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- system3.c	21 Aug 2003 00:27:26 -0000	1.31
+++ system3.c	21 Aug 2003 00:32:24 -0000	1.32
@@ -242,6 +242,12 @@
 
 	sa1111_init();
 	
+	/* set nSRST */
+	MEM(SYSTEM3_CTRL_1) = 0x04;
+
+	/* issue a short beep */
+	MEM(SYSTEM3_CTRL_1) = 0x14;
+	msleep( 50 );
 	MEM(SYSTEM3_CTRL_1) = 0x04;
 
 	/* tweak blob config */

CVS: blob/src/lib pcmcia.c,1.7,1.8

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

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

Modified Files:
	pcmcia.c 
Log Message:
Fix include (was moved to proc)


Index: pcmcia.c
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/pcmcia.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pcmcia.c	10 May 2002 08:26:15 -0000	1.7
+++ pcmcia.c	20 Aug 2003 23:12:22 -0000	1.8
@@ -42,7 +42,7 @@
 #include <blob/pcmcia.h>
 
 #ifdef SA1111_BASE
-#include <blob/sa1111.h>
+#include <blob/proc/sa1111.h>
 #endif
 
 /**********************************************************************

CVS: blob/src/blob system3.c,1.29,1.30 idr.c,1.13,1.14

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

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

Modified Files:
	system3.c idr.c 
Log Message:
Fix include (was moved to proc)


Index: system3.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/system3.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- system3.c	6 Aug 2003 22:55:41 -0000	1.29
+++ system3.c	20 Aug 2003 23:12:22 -0000	1.30
@@ -47,7 +47,7 @@
 #include <blob/led.h>
 
 #include <blob/arch.h>
-#include <blob/sa1111.h>
+#include <blob/proc/sa1111.h>
 
 #include <blob/generic_io.h>
 

Index: idr.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/idr.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- idr.c	6 Aug 2003 22:55:41 -0000	1.13
+++ idr.c	20 Aug 2003 23:12:23 -0000	1.14
@@ -31,7 +31,7 @@
 #include <blob/reboot.h>
 #include <blob/serial.h>
 #include <blob/arch.h>
-#include <blob/sa1111.h>
+#include <blob/proc/sa1111.h>
 #include <blob/led.h>
 
 /* flash descriptor for IDR flash */

CVS: blob/src/diag trizeps.c,1.2,1.3

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

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

Modified Files:
	trizeps.c 
Log Message:
Fix include (was moved to proc)


Index: trizeps.c
===================================================================
RCS file: /cvsroot/blob/blob/src/diag/trizeps.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- trizeps.c	6 Aug 2003 22:55:41 -0000	1.2
+++ trizeps.c	20 Aug 2003 23:12:23 -0000	1.3
@@ -37,7 +37,7 @@
 
 #include <blob/time.h>
 // #include <blob/arch.h>
-// #include <blob/sa1111.h>
+// #include <blob/proc/sa1111.h>
 
 // #include <blob/lcd.h>
 

CVS: blob/src/lib generic_io.c,1.8,1.9

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

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

Modified Files:
	generic_io.c 
Log Message:
fix missing crlf

Index: generic_io.c
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/generic_io.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- generic_io.c	21 Aug 2003 11:44:34 -0000	1.8
+++ generic_io.c	21 Aug 2003 12:47:10 -0000	1.9
@@ -59,6 +59,8 @@
 #	define DBGIO( x, io )
 #endif
 
+#define ERR( x )	do { ret = x; goto DONE; } while (0)
+
 
 /**********************************************************************
  * Typen
@@ -246,20 +248,19 @@
 			dest_name, src_name, amount  );
 
 	if ( !src_name || !dest_name )
-		return -EINVAL;
+		ERR( -EINVAL );
 
 	src = io_get_byname( src_name );
 	if ( !src )
-		return -EINVAL;
+		ERR( -EINVAL );
 
 	dest = io_get_byname( dest_name );
 	if ( !dest )
-		return -EINVAL;
+		ERR( -EINVAL );
 
 	DBGIO( 5, src );
 	DBGIO( 5, dest );
 
-
 	if ( amount == 0 ) {
 		amount = io_get_size( src );
 	}
@@ -267,7 +268,7 @@
 	if ( amount > io_get_size( dest ) ) {
 		printf( "\n\nio_copy: src size (%d) > dest space (%d)!\n\n",
 				amount, io_get_size( dest ) );
-		return -ETOOLONG; // -ENOSPC ;)
+		ERR( -ETOOLONG );
 	}
 
 	blocks = amount / 512 + (amount%512?1:0);
@@ -289,7 +290,7 @@
 		if ( ret ) {
 			DBG( 1, "\n%s: read failed at block %d (adr %p).\n",
 					__FUNCTION__, block, adr );
-			return -EINVAL;
+			ERR( -EINVAL );
 		}
 
 		/* write to dest */
@@ -297,16 +298,17 @@
 		if ( ret ) {
 			DBG( 1, "\n%s: write failed at block %d (adr %p).\n",
 					__FUNCTION__, block, adr );
-			return -EINVAL;
+			ERR( -EINVAL );
 		}
 
 		amount -= to_copy;
 		adr += to_copy;
 	}
 
+	ret = 0;
+DONE:
 #if !defined(IO_QUIET)
 	printf("\n");
 #endif
-
-	return 0;
+	return ret;
 }

CVS: blob/include/blob/arch system3.h,1.19,1.20

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

Update of /cvsroot/blob/blob/include/blob/arch
In directory sc8-pr-cvs1:/tmp/cvs-serv31104/include/blob/arch

Modified Files:
	system3.h 
Log Message:
system 3 rev 0802 flash defines

Index: system3.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/system3.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- system3.h	1 Apr 2003 19:04:07 -0000	1.19
+++ system3.h	21 Aug 2003 12:43:44 -0000	1.20
@@ -59,23 +59,27 @@
 #define PARAM_RAM_BASE		(0xc0110000)
 #define RAMDISK_RAM_BASE	(0xC0400000)
 
+/* hmm, do i need these ? */
+#define PARAM_FLASH_BASE	(0x00040000)
+#define PARAM_FLASH_LEN		(256 * 1024)
+
 
 /* and where do they live in flash */
 #define BLOB_FLASH_BASE		(0x00000000)
-#define BLOB_FLASH_LEN		(256 * 1024)
-#define PARAM_FLASH_BASE	(0x00040000)
-#define PARAM_FLASH_LEN		(256 * 1024)
-#define CONFIG_FLASH_BASE	(0x00040000)
-#define CONFIG_FLASH_LEN	(256 * 1024)
-#define KERNEL_FLASH_BASE	(0x00080000)
-#define KERNEL_FLASH_LEN	(1024 * 1024)
+#define BLOB_FLASH_LEN		(0x00040000)
+#define CONFIG_FLASH_BASE	(BLOB_FLASH_BASE + BLOB_FLASH_LEN)
+#define CONFIG_FLASH_LEN	(0x00040000)
+#define KERNEL_FLASH_BASE	(CONFIG_FLASH_BASE + CONFIG_FLASH_LEN)
+#define KERNEL_FLASH_LEN	(0x00100000)
+#define RAMDISK_FLASH_BASE	(KERNEL_FLASH_BASE + KERNEL_FLASH_LEN)
+#define RAMDISK_FLASH_LEN	(0x00180000)
+#define ROOTFS_FLASH_BASE	(RAMDISK_FLASH_BASE + RAMDISK_FLASH_LEN)
+#define ROOTFS_FLASH_LEN	(0x00700000)
+#define DATAFS_FLASH_BASE	(ROOTFS_FLASH_BASE + ROOTFS_FLASH_LEN)
+#define DATAFS_FLASH_LEN	(0x015c0000)
+#define XDATAFS_FLASH_BASE	(DATAFS_FLASH_BASE + DATAFS_FLASH_LEN)
+#define XDATAFS_FLASH_LEN	(0x00040000)
 #define LOAD_RAMDISK		1 /* load ramdisk into ram */
-#define RAMDISK_FLASH_BASE	(0x00180000)
-#define RAMDISK_FLASH_LEN	(1536 * 1024)
-#define ROOTFS_FLASH_BASE	(0x00300000)
-#define ROOTFS_FLASH_LEN	(0x00600000) /* 6M */
-#define DATAFS_FLASH_BASE	(0x00900000)
-#define DATAFS_FLASH_LEN	(0x00700000) /* 7M */
 
 /* system3 RAM pool for up/downloading */
 #if !defined(CONFIG_SYSTEM3_REV0802)
@@ -83,7 +87,7 @@
 #define RAM_SIZE			(16*1024*1024)
 #else
 #define RAM_START			(0xc1000000)
-#define RAM_SIZE			(16*1024*1024)
+#define RAM_SIZE			(0x03000000)
 #endif
 
 

CVS: blob/src/blob system3.c,1.30,1.31

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

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

Modified Files:
	system3.c 
Log Message:
remove obsolete define

Index: system3.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/system3.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- system3.c	20 Aug 2003 23:12:22 -0000	1.30
+++ system3.c	21 Aug 2003 00:27:26 -0000	1.31
@@ -105,7 +105,6 @@
 	},
 };
 
-#if defined(CONFIG_BLOB_PARTITION)
 /* default partition table for SYSTEM3
 
 System3 flash layout
@@ -199,7 +198,6 @@
 		magic:	BLOB_PART_LAST_MAGIC
 	}
 };
-#endif
 
 /**********************************************************************
  * static functions
@@ -453,7 +451,6 @@
 char arp_help[] = "arp test command. No args.\n";;
 __commandlist(arp_cmd, "arp", arp_help);
 
-#if defined(CONFIG_BLOB_PARTITION)
 /**********************************************************************
  * system3 default partition table
  */
@@ -472,5 +469,3 @@
 __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
-

CVS: blob blob.vimproject,NONE,1.1

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

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

Added Files:
	blob.vimproject 
Log Message:
A project file for use with vim's Project plugin. See
http://www.vim.org/scripts/script.php?script_id=69

VIM rules! ;)

Note: Some Automake/conf guru is needed who replaces the top level
  path with the actual directory when configuring. Its _not_
  needed to change the file names, vim does this dynamically ;)


--- NEW FILE: blob.vimproject ---
blob=/tmp/blob_head CD=. filter="AUTHORS COPYING ChangeLog INSTALL NEWS README RELEASE-NOTES configure.in *.am *.[chS] *.sh"{
 AUTHORS
 COPYING
 ChangeLog
 INSTALL
 NEWS
 README
 RELEASE-NOTES
 configure.in
 Makefile.am
 include=include CD=. {
  Makefile.am
  registers.h
  blob=blob CD=. {
   Makefile.am
   arch.h
   bitfield.h
   cf.h
   command.h
   command_hist.h
   compr_rubin.h
   config.h
   crc32.h
   debug.h
   errno.h
   error.h
   flash.h
   generic_io.h
   gio_drivers.h
   i2c-gpio.h
   i2c.h
   icache.h
   ide.h
   init.h
   jffs2.h
   lcd.h
   led.h
   linux.h
   load_kernel.h
   main.h
   md5.h
   md5support.h
   memory.h
   memsetup.h
   mini_inflate.h
   param_block.h
   partition.h
   pcmcia.h
   reboot.h
   serial.h
   spd.h
   tar.h
   time.h
   types.h
   util.h
   uucodec.h
   xmodem.h
  }
 }
 doc=doc CD=. filter="*.am *.txt" {
  Makefile.am
  commandlist.txt
  diag.txt
  motto.txt
  porting.txt
 }
 src=src CD=. {
  Makefile.am
  blob=blob CD=. {
   Makefile.am
   accelent_sa.c
   amd32.c
   assabet.c
   badge4.c
   bootldrpart.c
   brutus.c
   cep.c
   chain.S
   chkmem.c
   clart.c
   clock.c
   commands.c
   compr_rtime.c
   compr_rubin.c
   cramfs.c
   csir_ims.c
   dafit.c
   flash-commands.c
   flash.c
   flashasm.S
   frodo.c
   gpio-pxa.S
   h3600.c
   hackkit.c
   idr.c
   initcalls.c
   intel16.c
   intel32.c
   jffs2.c
   jornada720.c
   lart.c
   ledasm-mmap.S
   ledasm-sa11x0.S
   linux.c
   load_kernel.c
   lubbock.c
   main.c
   memory.c
   memsetup-pxa.S
   memsetup-sa1100.S
   memsetup-sa1110.S
   miniprint.c
   nesa.c
   nullflash.c
   param_block.c
   partition.c
   pleb.c
   pxa_idp.c
   ramses.c
   reboot.c
   shannon.c
   smc9196.c
   start-pxa.S
   start-sa11x0.S
   start.S
   system3.c
   testmem.S
   testmem2.S
   trampoline.S
   trizeps.c
   uucodec.c
   xmodem.c
   zImage.c
  }
  commands=commands CD=. {
   Makefile.am
   call.c
   changebit.c
   dlfile.c
   dummy.c
   dump.c
   ferase.c
   fwrite.c
   md5chk.c
   memcpy.c
   peek.c
   poke.c
   reboot.c
   setip.c
   sysupd.c
   terminal.c
   tftp.c
   make_commands.sh
  }
  lib=lib CD=. {
   Makefile.am
   arp.c
   bootp.c
   cf.c
   command.c
   crc32.c
   error.c
   ext2fs.c
   generic_io.c
   gio_flash.c
   gio_part_blob.c
   gio_ram.c
   i2c-gpio.c
   i2c.c
   icache.c
   ide.c
   init.c
   ip_bits.c
   led-mmap.c
   led-sa11x0.c
   led.c
   md5.c
   md5support.c
   memcmp.c
   memcpy.c
   memset.c
   mini_inflate.c
   pcmcia.c
   printf.c
   reboot-pxa.c
   reboot-sa11x0.c
   reboot.c
   serial-pxa.c
   serial-sa11x0.c
   serial.c
   strlen.c
   strncmp.c
   strncpy.c
   strtou32.c
   tar.c
   tftp.c
   time.c
   util.c
  }
  diag=diag CD=. {
   Makefile.am
   accelent_sa.c
   assabet.c
   badge4.c
   brutus.c
   cep.c
   clart.c
   command_hist.c
   csir_ims.c
   frodo.c
   getcommand.c
   h3600.c
   hackkit.c
   idr.c
   initcalls.c
   jornada720.c
   lart.c
   lcd.c
   lubbock.c
   main.c
   miniprint.c
   nesa.c
   pleb.c
   pxa_idp.c
   ramses.c
   regs-pxa.c
   regs-sa11x0.c
   shannon.c
   start.S
   system3.c
   trizeps.c
  }
 }
}