blob-cvs-commit — blob CVS commit messages list

Re: CVS: blob/src/blob main.c,1.13,1.14

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

oops, it was russ, not erik. I guess I should go to bed and get some
sleep.

Tim Riker wrote:
> 
> Update of /cvsroot/blob/blob/src/blob
> In directory usw-pr-cvs1:/tmp/cvs-serv3109/src/blob
> 
> Modified Files:
>         main.c
> Log Message:
> erik likes commas. ;-)

-- 
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.

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

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

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

Modified Files:
	main.c 
Log Message:
erik likes commas. ;-)

Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- main.c	2001/12/16 07:43:16	1.13
+++ main.c	2001/12/16 08:54:23	1.14
@@ -433,7 +433,7 @@
 	} else {
 		SerialOutputString("downloaded at ");
 		SerialOutputHex(BLOB_RAM_BASE);
-		SerialOutputString(" ");
+		SerialOutputString(", ");
 		SerialOutputDec(blob_status.blobSize);
 		SerialOutputString(" bytes\n");
 	}
@@ -447,7 +447,7 @@
 	} else {
 		SerialOutputString("downloaded at ");
 		SerialOutputHex(PARAM_RAM_BASE);
-		SerialOutputString(" ");
+		SerialOutputString(", ");
 		SerialOutputDec(blob_status.blobSize);
 		SerialOutputString(" bytes\n");
 	}
@@ -463,7 +463,7 @@
 	} else {
 		SerialOutputString("downloaded at ");
 		SerialOutputHex(KERNEL_RAM_BASE);
-		SerialOutputString(" ");
+		SerialOutputString(", ");
 		SerialOutputDec(blob_status.kernelSize);
 		SerialOutputString(" bytes\n");
 	}
@@ -476,7 +476,7 @@
 	} else {
 		SerialOutputString("downloaded at ");
 		SerialOutputHex(RAMDISK_RAM_BASE);
-		SerialOutputString(" ");
+		SerialOutputString(", ");
 		SerialOutputDec(blob_status.ramdiskSize);
 		SerialOutputString(" bytes\n");
 	}

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

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

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

Modified Files:
	main.c 
Log Message:
dump mem locations in PrintStatus

Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- main.c	2001/12/16 04:34:03	1.12
+++ main.c	2001/12/16 07:43:16	1.13
@@ -417,50 +417,66 @@
 {
 	SerialOutputString(version_str);
 
-	SerialOutputString("\nDownload speed: ");
+	SerialOutputString("Download speed  : ");
 	PrintSerialSpeed(blob_status.downloadSpeed);
 	SerialOutputString(" baud\n");
 
-	SerialOutputString("Terminal speed: ");
+	SerialOutputString("Terminal speed  : ");
 	PrintSerialSpeed(blob_status.terminalSpeed);
 	SerialOutputString(" baud\n");
 
-	SerialOutputString("Blob          : ");
+	SerialOutputString("blob    ");
+	SerialOutputHex(BLOB_FLASH_BASE);
+	SerialOutputString(": ");
 	if(blob_status.blobType == fromFlash) {
 		SerialOutputString("from flash\n");
 	} else {
-		SerialOutputString("downloaded, ");
+		SerialOutputString("downloaded at ");
+		SerialOutputHex(BLOB_RAM_BASE);
+		SerialOutputString(" ");
 		SerialOutputDec(blob_status.blobSize);
 		SerialOutputString(" bytes\n");
 	}
 
 #ifdef PARAM_START
-	SerialOutputString("Param Block   : ");
+	SerialOutputString("param  ");
+	SerialOutputHex(PARAMS_FLASH_BASE);
+	SerialOutputString(": ");
 	if(blob_status.paramType == fromFlash) {
 		SerialOutputString("from flash\n");
 	} else {
-		SerialOutputString("downloaded, ");
+		SerialOutputString("downloaded at ");
+		SerialOutputHex(PARAM_RAM_BASE);
+		SerialOutputString(" ");
 		SerialOutputDec(blob_status.blobSize);
 		SerialOutputString(" bytes\n");
 	}
 #else
-	SerialOutputString("Param Block   : Not available\n");
+	SerialOutputString("param           : Not available\n");
 #endif
 
-	SerialOutputString("Kernel        : ");
+	SerialOutputString("kernel  ");
+	SerialOutputHex(KERNEL_FLASH_BASE);
+	SerialOutputString(": ");
 	if(blob_status.kernelType == fromFlash) {
 		SerialOutputString("from flash\n");
 	} else {
-		SerialOutputString("downloaded, ");
+		SerialOutputString("downloaded at ");
+		SerialOutputHex(KERNEL_RAM_BASE);
+		SerialOutputString(" ");
 		SerialOutputDec(blob_status.kernelSize);
 		SerialOutputString(" bytes\n");
 	}
 
-	SerialOutputString("Ramdisk       : ");
+	SerialOutputString("ramdisk ");
+	SerialOutputHex(RAMDISK_FLASH_BASE);
+	SerialOutputString(": ");
 	if(blob_status.ramdiskType == fromFlash) {
 		SerialOutputString("from flash\n");
 	} else {
-		SerialOutputString("downloaded, ");
+		SerialOutputString("downloaded at ");
+		SerialOutputHex(RAMDISK_RAM_BASE);
+		SerialOutputString(" ");
 		SerialOutputDec(blob_status.ramdiskSize);
 		SerialOutputString(" bytes\n");
 	}

CVS: blob/src/blob idr.c,1.1,1.2

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

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

Modified Files:
	idr.c 
Log Message:
intel16 on idr (still does note work?)

Index: idr.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/idr.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- idr.c	2001/12/16 04:34:03	1.1
+++ idr.c	2001/12/16 07:39:22	1.2
@@ -29,12 +29,12 @@
 #include <blob/init.h>
 
 /* flash descriptor for IDR flash */
-/* 1 Intel 28F128J3A strataflash (16MB) */
+/* 1x Intel 28F128J3A strataflash (16MB) */
 static flash_descriptor_t idr_flash_descriptors[] =
 {
 	{
 		size: 128 * 1024,
-		num: 64,
+		num: 128,
 		lockable: 1
 	},
 	{
@@ -45,7 +45,7 @@
 static void init_idr_flash_driver(void)
 {
 	flash_descriptors = idr_flash_descriptors;
-	flash_driver = &intel32_flash_driver;
+	flash_driver = &intel16_flash_driver;
 }
 
 __initlist(init_idr_flash_driver, INIT_LEVEL_OTHER_STUFF);

CVS: blob/include/blob/arch idr.h,1.1,1.2

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

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

Modified Files:
	idr.h 
Log Message:
case

Index: idr.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/idr.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- idr.h	2001/12/16 04:34:03	1.1
+++ idr.h	2001/12/16 07:38:50	1.2
@@ -38,9 +38,9 @@
 
 /* where do various parts live in RAM */
 #define BLOB_RAM_BASE		(0xc0100000)
-#define KERNEL_RAM_BASE		(0xC0008000)
+#define KERNEL_RAM_BASE		(0xc0008000)
 #define PARAM_RAM_BASE		(0xc0110000)
-#define RAMDISK_RAM_BASE	(0xC0400000)
+#define RAMDISK_RAM_BASE	(0xc0400000)
 
 /* and where do they live in flash */
 #define BLOB_FLASH_BASE		(0x00000000)

CVS: blob configure.in,1.28,1.29

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

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

Modified Files:
	configure.in 
Log Message:
intel16 on idr (still does note work?)

Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- configure.in	2001/12/16 04:34:02	1.28
+++ configure.in	2001/12/16 07:37:29	1.29
@@ -129,7 +129,7 @@
 	board_name="Vercel UD-1 (IDR)"
 	AC_DEFINE(IDR)
 	BLOB_PLATFORM_OBJ="idr.o"
-	BLOB_FLASH_OBJS="intel32.o"
+	BLOB_FLASH_OBJS="intel16.o"
 	use_cpu="sa1110"
 	use_lcd="no"
 	;;

CVS: blob/src/blob flash.c,1.8,1.9

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

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

Modified Files:
	flash.c 
Log Message:
error msg

Index: flash.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/flash.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- flash.c	2001/10/31 16:44:18	1.8
+++ flash.c	2001/12/16 07:36:42	1.9
@@ -279,6 +279,7 @@
 			nerase++;
 			if(rv < 0) {
 				/* something is obviously wrong */
+				SerialOutputString(" error\n");
 				flash_driver->disable_vpp();
 
 				return rv;

CVS: blob/include/blob arch.h,1.2,1.3 linux.h,1.2,1.3

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

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

Modified Files:
	arch.h linux.h 
Log Message:
Vercel UD-1 (IDR) support

Index: arch.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- arch.h	2001/10/27 21:04:20	1.2
+++ arch.h	2001/12/16 04:34:03	1.3
@@ -45,6 +45,8 @@
 # include <blob/arch/clart.h>
 #elif defined H3600
 # include <blob/arch/h3600.h>
+#elif defined IDR
+# include <blob/arch/idr.h>
 #elif defined LART
 # include <blob/arch/lart.h>
 #elif defined NESA

Index: linux.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/linux.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- linux.h	2001/10/27 21:04:20	1.2
+++ linux.h	2001/12/16 04:34:03	1.3
@@ -40,6 +40,8 @@
 # define ARCH_NUMBER (68)
 #elif defined H3600
 # define ARCH_NUMBER (22)
+#elif defined IDR
+# define ARCH_NUMBER (147)
 #elif defined LART
 # define ARCH_NUMBER (27)
 #elif defined NESA

CVS: blob ChangeLog,1.10,1.11 RELEASE-NOTES,1.5,1.6 acconfig.h,1.8,1.9 configure.in,1.27,1.28

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

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

Modified Files:
	ChangeLog RELEASE-NOTES acconfig.h configure.in 
Log Message:
Vercel UD-1 (IDR) support

Index: ChangeLog
===================================================================
RCS file: /cvsroot/blob/blob/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ChangeLog	2001/12/08 07:16:46	1.10
+++ ChangeLog	2001/12/16 04:34:02	1.11
@@ -4,6 +4,7 @@
 $Id$
 
 blob-2.0.5-pre1:
+- Vercel UD-1 (IDR) support				Tim Riker
 - new dump command					Tim Riker
 - New flash ROM program code				Erik Mouw
 - Ipaq H3600 port					Erik Mouw

Index: RELEASE-NOTES
===================================================================
RCS file: /cvsroot/blob/blob/RELEASE-NOTES,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- RELEASE-NOTES	2001/11/05 13:56:46	1.5
+++ RELEASE-NOTES	2001/12/16 04:34:02	1.6
@@ -17,13 +17,14 @@
 - Assabet
 - LART
 - Ipaq (only blob-chain)
+- Shannon (aka TuxScreen)
 - System3
+- Vercel UD-1 (IDR)
 
 It should work on:
 
 - NESA
 - PLEB
-- Shannon (aka TuxScreen)
 
 But was never tested on:
 

Index: acconfig.h
===================================================================
RCS file: /cvsroot/blob/blob/acconfig.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- acconfig.h	2001/11/13 13:29:05	1.8
+++ acconfig.h	2001/12/16 04:34:02	1.9
@@ -71,6 +71,9 @@
 /* Define for Ipaq H3600 */
 #undef H3600
 
+/* Define for Vercel UD-1 (IDR) */
+#undef IDR
+
 /* Define for LART boards */
 #undef LART
 

Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- configure.in	2001/12/13 18:58:31	1.27
+++ configure.in	2001/12/16 04:34:02	1.28
@@ -125,6 +125,14 @@
 	use_cpu="sa1110"
 	use_lcd="no"
 	;;
+    idr)
+	board_name="Vercel UD-1 (IDR)"
+	AC_DEFINE(IDR)
+	BLOB_PLATFORM_OBJ="idr.o"
+	BLOB_FLASH_OBJS="intel32.o"
+	use_cpu="sa1110"
+	use_lcd="no"
+	;;
     lart)
 	board_name="Delft University of Technology LART"
 	AC_DEFINE(LART)

CVS: blob/src/blob idr.c,NONE,1.1 Makefile.am,1.10,1.11 main.c,1.11,1.12

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

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

Modified Files:
	Makefile.am main.c 
Added Files:
	idr.c 
Log Message:
Vercel UD-1 (IDR) support

--- NEW FILE: idr.c ---
/*
 * idr.c: Vercel UD-1 (IDR) specific stuff
 *
 * Copyright (C) 2001 Tim Riker <Ti...@Ri...>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 */

#ident "$Id: idr.c,v 1.1 2001/12/16 04:34:03 timriker Exp $"

#ifdef HAVE_CONFIG_H
# include <blob/config.h>
#endif

#include <blob/flash.h>
#include <blob/init.h>

/* flash descriptor for IDR flash */
/* 1 Intel 28F128J3A strataflash (16MB) */
static flash_descriptor_t idr_flash_descriptors[] =
{
	{
		size: 128 * 1024,
		num: 64,
		lockable: 1
	},
	{
		/* NULL block */
	},
};

static void init_idr_flash_driver(void)
{
	flash_descriptors = idr_flash_descriptors;
	flash_driver = &intel32_flash_driver;
}

__initlist(init_idr_flash_driver, INIT_LEVEL_OTHER_STUFF);

Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am	2001/11/04 23:09:17	1.10
+++ Makefile.am	2001/12/16 04:34:03	1.11
@@ -144,6 +144,7 @@
 	brutus.c \
 	clart.c \
 	h3600.c \
+	idr.c \
 	lart.c \
 	nesa.c \
 	pleb.c \

Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/main.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- main.c	2001/11/21 02:14:44	1.11
+++ main.c	2001/12/16 04:34:03	1.12
@@ -95,7 +95,7 @@
 
 	/* call SerialInit() because the default 9k6 speed might not
            be what the user requested */
-#if defined(H3600) || defined(SHANNON)
+#if defined(H3600) || defined(SHANNON) || defined(IDR)
 	blob_status.terminalSpeed = baud115k2; /* DEBUG */
 #endif
 	SerialInit(blob_status.terminalSpeed);

CVS: blob/utils/build build_Makefile,1.4,1.5 build_all,1.4,1.5

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

Update of /cvsroot/blob/blob/utils/build
In directory usw-pr-cvs1:/tmp/cvs-serv2157/utils/build

Modified Files:
	build_Makefile build_all 
Log Message:
Vercel UD-1 (IDR) support

Index: build_Makefile
===================================================================
RCS file: /cvsroot/blob/blob/utils/build/build_Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- build_Makefile	2001/10/27 21:05:37	1.4
+++ build_Makefile	2001/12/16 04:34:03	1.5
@@ -13,7 +13,7 @@
 #
 
 archs		= \
-	assabet brutus creditlart h3600 lart\
+	assabet brutus creditlart h3600 idr lart\
 	nesa pleb system3 shannon
 debug-archs	= $(foreach a, $(archs), $(a)-debug)
 all-archs	= $(archs) $(debug-archs)

Index: build_all
===================================================================
RCS file: /cvsroot/blob/blob/utils/build/build_all,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- build_all	2001/10/27 21:05:37	1.4
+++ build_all	2001/12/16 04:34:03	1.5
@@ -12,7 +12,7 @@
 # published by the Free Software Foundation.
 #
 
-archs="assabet brutus creditlart h3600 lart nesa pleb system3 shannon"
+archs="assabet brutus creditlart h3600 idr lart nesa pleb system3 shannon"
 linux_prefix=~/LART/build/linux/elinux
 blob_src=~/src/sourceforge/blob
 extra_flags="--enable-all-features"

CVS: blob/include/blob/arch idr.h,NONE,1.1 Makefile.am,1.3,1.4

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

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

Modified Files:
	Makefile.am 
Added Files:
	idr.h 
Log Message:
Vercel UD-1 (IDR) support

--- NEW FILE: idr.h ---
/*
 * idr.h: Vercel UD-1 (IDR) specific defines
 *
 * Copyright (C) 2001 Tim Riker <Ti...@Ri...>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 */

#ident "$Id: idr.h,v 1.1 2001/12/16 04:34:03 timriker Exp $"

#ifndef BLOB_ARCH_IDR_H
#define BLOB_ARCH_IDR_H

/* boot CPU speed */
#define CPU_SPEED		(0x05)

/* serial port */
#define USE_SERIAL3

/* GPIO for the LED */
#define LED_GPIO		(0x00000000) /* safe mode: no GPIO, no LED */

/* the base address were BLOB is loaded by the first stage loader */
#define BLOB_ABS_BASE_ADDR	(0xc0200400)

/* where do various parts live in RAM */
#define BLOB_RAM_BASE		(0xc0100000)
#define KERNEL_RAM_BASE		(0xC0008000)
#define PARAM_RAM_BASE		(0xc0110000)
#define RAMDISK_RAM_BASE	(0xC0400000)

/* and where do they live in flash */
#define BLOB_FLASH_BASE		(0x00000000)
#define BLOB_FLASH_LEN		(256 * 1024)
#define PARAM_FLASH_BASE	(BLOB_FLASH_BASE + BLOB_FLASH_LEN)
#define PARAM_FLASH_LEN		(256 * 1024)
#define KERNEL_FLASH_BASE	(PARAM_FLASH_BASE + PARAM_FLASH_LEN)
#define KERNEL_FLASH_LEN	(1024 * 1024)
#define RAMDISK_FLASH_BASE	(KERNEL_FLASH_BASE + KERNEL_FLASH_LEN)
#define RAMDISK_FLASH_LEN	(4 * 1024 * 1024)

/* the position of the kernel boot parameters */
#define BOOT_PARAMS		(0xc0000100)

/* the size (in kbytes) to which the compressed ramdisk expands */
#define RAMDISK_SIZE		(8 * 1024)

/* Memory configuration */
#ifdef BLOB_NEED_MEMCONFIG
#warning "use defines from memsetup.h for better readability"
#	define MDCNFG_VALUE	0x72347235		/* 0x0  MDCNFG */
#	define MDCAS00_VALUE	0x55555557		/* 0x04 MDCAS00 */
#	define MDCAS01_VALUE	0x55555555		/* 0x08 MDCAS01 */
#	define MDCAS02_VALUE	0x55555555		/* 0x0c MDCAS02 */
#	define MSC0_VALUE	0x00004B94		/* 0x10 MCS0 */
#	define MSC1_VALUE	0x22212419		/* 0x14 MCS1 */
#	define MECR_VALUE	0x00000000		/* 0x18 MECR */
#	define MDREFR_VALUE	DO_NOT_USE_THIS_VALUE__GETS_AUTOMAGICALLY_COMPUTED
#	define MDCAS20_VALUE	0x55555557		/* 0x20 MDCAS20 */
#	define MDCAS21_VALUE	0x55555555		/* 0x24 MDCAS21 */
#	define MDCAS22_VALUE	0x55555555		/* 0x28 MDCAS22 */
#	define MSC2_VALUE	0x44396669		/* 0x2C MCS2 */
#	define SMCNFG_VALUE	0xA040A040		/* 0x30 SMCNFG */
#endif

#endif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	2001/10/27 21:04:20	1.3
+++ Makefile.am	2001/12/16 04:34:03	1.4
@@ -15,6 +15,7 @@
 	brutus.h \
 	clart.h \
 	h3600.h \
+	idr.h \
 	lart.h \
 	nesa.h \
 	pleb.h \

jffs2 code for testing

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

ok, I didn't actually commit it yet, but I updated Russ' code to current
CVS and sent the patch here:

http://sourceforge.net/tracker/?group_id=30155&atid=398363
-- 
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.

CVS: blob/doc .cvsignore,NONE,1.1

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

Update of /cvsroot/blob/blob/doc
In directory usw-pr-cvs1:/tmp/cvs-serv31401/doc

Added Files:
	.cvsignore 
Log Message:
cvs ignore list

--- NEW FILE: .cvsignore ---
Makefile.in
Makefile

CVS: blob/src/test - New directory

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

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

Log Message:
Directory /cvsroot/blob/blob/src/test added to the repository

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

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

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

Modified Files:
	shannon.c 
Log Message:
checked

Index: shannon.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/shannon.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- shannon.c	2001/10/21 21:38:34	1.3
+++ shannon.c	2001/12/14 01:33:21	1.4
@@ -35,7 +35,6 @@
 /* 2x AMD *whatever* flash (4MB) */
 static flash_descriptor_t shannon_flash_descriptors[] =
 {
-#warning "Please fix SHANNON flash descriptor"
 	{ 
 		size: 2 * 8 * 1024,
 		num: 8,

CVS: blob Makefile.am,1.3,1.4 configure.in,1.26,1.27

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

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

Modified Files:
	Makefile.am configure.in 
Log Message:
Add doc/ subdirectory to the build process.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	2001/08/29 21:08:50	1.3
+++ Makefile.am	2001/12/13 18:58:31	1.4
@@ -11,6 +11,7 @@
 
 
 SUBDIRS		= \
+	doc \
 	tools \
 	utils \
 	include \

Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- configure.in	2001/11/13 13:29:05	1.26
+++ configure.in	2001/12/13 18:58:31	1.27
@@ -365,6 +365,7 @@
 
 
 AC_OUTPUT(Makefile
+doc/Makefile
 include/Makefile
 include/blob/Makefile
 include/blob/arch/Makefile

CVS: blob/doc Makefile.am,NONE,1.1

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

Update of /cvsroot/blob/blob/doc
In directory usw-pr-cvs1:/tmp/cvs-serv19442/doc

Added Files:
	Makefile.am 
Log Message:
Add doc/ subdirectory to the build process.


--- NEW FILE: Makefile.am ---
# Process this file with automake to produce Makefile.in -*- makefile -*-
#
# $Id: Makefile.am,v 1.1 2001/12/13 18:58:31 erikm Exp $
# 

CLEANFILES	= *~

EXTRA_DIST	= \
	porting.txt

Re: CVS: blob/src/blob debug.c,1.5,1.6

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

On Fri, Dec 07, 2001 at 11:16:49PM -0800, Tim Riker wrote:
> Update of /cvsroot/blob/blob/src/blob
> In directory usw-pr-cvs1:/tmp/cvs-serv22231/src/blob
> 
> Modified Files:
> 	debug.c 
> Log Message:
> dump

Good idea, Jan-Derk also thought about adding such a function. You were
faster :)

> +	for ( ; address < endaddress; address += 0x10) {
> +		SerialOutputHex(address);
> +		SerialOutputString(": ");
> +		for (tmpaddress = address; tmpaddress < address + 0x10; tmpaddress += 4) {
> +			value = (*((u32 *)tmpaddress));
> +			barrier();

Minor clarification: a memory barrier is not necessary if "value" is
used as an argument for a function. Because SerialOutputHex() isn't an
function in the same compilation unit, the compiler doesn't know what
to expect from it. The only option the compiler has is to load the
address before SerialOutputHex() is called. In other words: the
function call serves as an implicit memory barrier.

Besides of that, the compiler does understand that "tmpaddress" is not
an invariant variable, so it will also understand that "value" will
change in every walk through the for loop. The reason I used a memory
barrier in the flash code was that the memory value we read indeed
changes when we read it (that's how flash behaves in non read-array
mode). Same for Stefan's memory tester: the whole issue of it is to
test if the memory contents changed, so we need to be sure that the
compiler doesn't optimise away (in its opinion) redundant memory reads.

> +			SerialOutputHex(value);
> +			SerialOutputByte(' ');
> +		}
> +		for (tmpaddress = address; tmpaddress < address + 0x10; tmpaddress++) {
> +			value = (*((u8 *)tmpaddress)) & 0xff;
> +			barrier();

Same story over here.

> +			if ((value >= ' ') && (value <= '~'))
> +				SerialOutputByte(value);
> +			else
> +				SerialOutputByte('.');
> +		}
> +		SerialOutputByte('\n');
> +	}

[snip]

> +static char dumphelp[] = "dump address [endAddress]\n";
> +__commandlist(dump, "dump", dumphelp );

Hey, I told you that adding commands is simple :)

And now, for something completely different:
I found a tool that adds "changesets" functionality to CVS (a la
BitKeeper): http://www.cobite.com/cvsps/ .


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 ChangeLog,1.9,1.10

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

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

Modified Files:
	ChangeLog 
Log Message:
dump

Index: ChangeLog
===================================================================
RCS file: /cvsroot/blob/blob/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ChangeLog	2001/11/05 13:56:46	1.9
+++ ChangeLog	2001/12/08 07:16:46	1.10
@@ -4,6 +4,7 @@
 $Id$
 
 blob-2.0.5-pre1:
+- new dump command					Tim Riker
 - New flash ROM program code				Erik Mouw
 - Ipaq H3600 port					Erik Mouw
 - Memory tester						Stefan Eletzhofer

CVS: blob/src/blob debug.c,1.5,1.6

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

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

Modified Files:
	debug.c 
Log Message:
dump

Index: debug.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/debug.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- debug.c	2001/11/13 13:24:28	1.5
+++ debug.c	2001/12/08 07:16:47	1.6
@@ -206,13 +206,14 @@
 	}
 	return ret;
 }
+
 /*********************************************************************
  * Peek
  *
- * AUTOR:	Stefan Eletzhofer
+ * AUTHOR:	Stefan Eletzhofer
  * REVISED:
  *
- * Poke values to memory
+ * Peeks values from memory
  *
  */
 int Peek( int argc, char *argv[] )
@@ -272,6 +273,67 @@
 	}
 	return ret;
 }
+
+/*********************************************************************
+ * dump
+ *
+ * AUTHOR: Tim Riker
+ * REVISED:
+ *
+ * dumps memory
+ *
+ */
+int dump( int argc, char *argv[] )
+{
+	int		ret = 0;
+	u32		address;
+	u32		endaddress;
+	u32		tmpaddress;
+	u32		value;
+
+	if ( argc < 2 )
+		ERR( -EINVAL );
+
+	ret = strtou32(argv[1], &address);
+	if ( ret < 0 )
+		ERR( -EINVAL );
+
+	if ( argc == 3 ) {
+		ret = strtou32(argv[2], &endaddress);
+		if ( ret < 0 )
+			ERR( -EINVAL );
+	} else
+	  endaddress = address + 0x80;
+
+	for ( ; address < endaddress; address += 0x10) {
+		SerialOutputHex(address);
+		SerialOutputString(": ");
+		for (tmpaddress = address; tmpaddress < address + 0x10; tmpaddress += 4) {
+			value = (*((u32 *)tmpaddress));
+			barrier();
+			SerialOutputHex(value);
+			SerialOutputByte(' ');
+		}
+		for (tmpaddress = address; tmpaddress < address + 0x10; tmpaddress++) {
+			value = (*((u8 *)tmpaddress)) & 0xff;
+			barrier();
+			if ((value >= ' ') && (value <= '~'))
+				SerialOutputByte(value);
+			else
+				SerialOutputByte('.');
+		}
+		SerialOutputByte('\n');
+	}
+
+	ret = 0;
+DONE:
+	if ( ret != 0 ) {
+		perror( ret, __FUNCTION__ );
+	}
+	return ret;
+}
+static char dumphelp[] = "dump address [endAddress]\n";
+__commandlist(dump, "dump", dumphelp );
 
 /*********************************************************************
  * BitChange

CVS: blob/include/blob/arch shannon.h,1.4,1.5

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

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

Modified Files:
	shannon.h 
Log Message:
standard location, reblob works now

Index: shannon.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/shannon.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- shannon.h	2001/11/21 02:36:31	1.4
+++ shannon.h	2001/12/08 07:04:30	1.5
@@ -59,8 +59,8 @@
 
 
 /* where do various parts live in RAM */
-#define BLOB_RAM_BASE		(0xc8020000)
-#define KERNEL_RAM_BASE		(0xC0008000)
+#define BLOB_RAM_BASE		(0xc0120000)
+#define KERNEL_RAM_BASE		(0xc0008000)
 #define PARAM_RAM_BASE		(0xc8040000)
 #define RAMDISK_RAM_BASE	(0xd0000000)
 

CVS: blob README,1.5,1.6

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

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

Modified Files:
	README 
Log Message:
update install docs

Index: README
===================================================================
RCS file: /cvsroot/blob/blob/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- README	2001/11/07 14:43:17	1.5
+++ README	2001/12/05 21:09:19	1.6
@@ -201,12 +201,22 @@
   up with the output on the serial port.
 
 
-*** SHANNON (TuxScreen phone)
+*** SHANNON (TuxScreen web phone)
 -----------
 
-The idea is to write the SHANNON flash via the jflash utility in much
-the same way as you would do it on LART or Assabet.
+http://TuxScreen.net/
+
+The Shannon comes with Inferno (http://www.vitanuova.com/inferno/)
+installed on it. You can DL and install a hosted version of Inferno
+and then use the sboot remote interface to install blob for the first
+time. Afterwards blob can reinstall itself.
+
+http://TuxScreen.net/wiki/view//InfernoRemote
 
+Alternately, you can use JTAG hardware to do the install if you have
+this equipment.
+
+http://TuxScreen.net/wiki/view/Main/JTAG
 
 ** Making a distribution
 ------------------------

CVS: blob/utils/mkparamblock .cvsignore,1.2,1.3

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

Update of /cvsroot/blob/blob/utils/mkparamblock
In directory usw-pr-cvs1:/tmp/cvs-serv2843/utils/mkparamblock

Modified Files:
	.cvsignore 
Log Message:
cvs ignores

Index: .cvsignore
===================================================================
RCS file: /cvsroot/blob/blob/utils/mkparamblock/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .cvsignore	2001/09/16 15:41:26	1.2
+++ .cvsignore	2001/12/04 00:14:57	1.3
@@ -1,3 +1,4 @@
 Makefile.in
 Makefile
 mkparamblock
+.deps

CVS: blob/src/lib .cvsignore,1.1,1.2

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

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

Modified Files:
	.cvsignore 
Log Message:
cvs ignores

Index: .cvsignore
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	2001/10/07 19:37:07	1.1
+++ .cvsignore	2001/12/04 00:14:57	1.2
@@ -2,3 +2,4 @@
 Makefile
 *.o
 *.a
+.deps