blob-cvs-commit — blob CVS commit messages list

CVS: blob/src/diag accelent_sa.c,NONE,1.1 Makefile.am,1.10,1.11

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

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

Modified Files:
	Makefile.am 
Added Files:
	accelent_sa.c 
Log Message:
Accelent IDP support by Holger Schurig
Also clean up some Makefiles (alphabetic order, etc)


--- NEW FILE: accelent_sa.c ---
/**********************************************************************
 * accelent_sa.c
 *
 * Implements several POST routines for Accelent IDP platform
 *
 * Copyright (C) 2001 Stefan Eletzhofer <ste...@ww...>
 * Copyright (c) 2002 Holger Schurig <h.s...@mn...>
 *
 * 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: accelent_sa.c,v 1.1 2002/02/04 18:02:43 erikm Exp $"

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

#include <blob/types.h>
#include <blob/errno.h>
#include <blob/util.h>
#include <blob/command.h>
#include <blob/init.h>
#include <blob/serial.h>
#include <blob/time.h>
#include <blob/sa1100.h>



#define MEM(adr)	(*((u32*)adr))
#define SET(reg,bit)	((reg) |= (1<<(bit)))
#define CLR(reg,bit)	((reg) &= ~(1<<(bit)))




static void accelent_sa_init_hardware(void)
{
	/* select serial driver */
	serial_driver = &sa11x0_serial_driver;
}

__initlist(accelent_sa_init_hardware, INIT_LEVEL_DRIVER_SELECTION);

Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/diag/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am	2002/02/01 14:38:55	1.10
+++ Makefile.am	2002/02/04 18:02:42	1.11
@@ -45,11 +45,12 @@
 
 EXTRA_diag_elf32_SOURCES		= \
 	lcd.c \
+	accelent_sa.c \
 	assabet.c \
-	frodo.c \
 	badge4.c \
 	brutus.c \
 	clart.c \
+	frodo.c \
 	h3600.c \
 	idr.c \
 	jornada720.c \

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

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

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

Modified Files:
	arch.h 
Log Message:
Accelent IDP support by Holger Schurig
Also clean up some Makefiles (alphabetic order, etc)


Index: arch.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- arch.h	2002/02/01 14:38:55	1.5
+++ arch.h	2002/02/04 18:02:40	1.6
@@ -37,16 +37,18 @@
 
 
 /* architecture specific include files */
-#if defined ASSABET
+#if defined ACCELENT_SA
+# include <blob/arch/accelent_sa.h>
+#elif defined ASSABET
 # include <blob/arch/assabet.h>
-#elif defined FRODO
-# include <blob/arch/frodo.h>
 #elif defined BADGE4
 # include <blob/arch/badge4.h>
 #elif defined BRUTUS
 # include <blob/arch/brutus.h>
 #elif defined CLART
 # include <blob/arch/clart.h>
+#elif defined FRODO
+# include <blob/arch/frodo.h>
 #elif defined H3600
 # include <blob/arch/h3600.h>
 #elif defined IDR

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

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

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

Modified Files:
	linux.h 
Log Message:
Oops, this file is also needed for Accelent IDP support


Index: linux.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/linux.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- linux.h	2002/02/01 14:38:55	1.6
+++ linux.h	2002/02/04 18:09:57	1.7
@@ -32,7 +32,9 @@
  * -- Erik
  */
 
-#if defined ASSABET
+#if defined ACCELENT_SA
+# define ARCH_NUMBER (22)
+#elif defined ASSABET
 # define ARCH_NUMBER (25)
 #elif defined FRODO
 # define ARCH_NUMBER (158)

CVS: blob/utils Makefile.am,1.3,1.4

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

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

Modified Files:
	Makefile.am 
Log Message:
Put upload.sh in the tar file.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/utils/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	2001/08/31 06:21:52	1.3
+++ Makefile.am	2002/02/04 16:49:11	1.4
@@ -10,5 +10,5 @@
 CLEANFILES	= *~
 
 EXTRA_DIST	= \
-	README
-
+	README \
+	upload.sh

CVS: blob/include/blob/arch accelent_sa.h,NONE,1.1 Makefile.am,1.6,1.7

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

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

Modified Files:
	Makefile.am 
Added Files:
	accelent_sa.h 
Log Message:
Accelent IDP support by Holger Schurig
Also clean up some Makefiles (alphabetic order, etc)


--- NEW FILE: accelent_sa.h ---
/*
 * accelent_sa.h: Accelent IDP specific defines
 *
 * Copyright (C) 2001  Erik Mouw (J.A...@it...)
 * Copyright (C) 2002  Holger Schurig <h.s...@mn...>
 *
 * 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: accelent_sa.h,v 1.1 2002/02/04 18:02:41 erikm Exp $"

#ifndef BLOB_ARCH_ACCELENT_SA_H
#define BLOB_ARCH_ACCELENT_SA_H

#undef  CPU_SPEED_133

/* boot CPU speed */
#ifdef CPU_SPEED_133
#       define CPU_SPEED                (0x05)
#else
#       define CPU_SPEED                (0x0a)
#endif

/* serial port */
#define USE_SERIAL1

/* GPIO for the LED */
#define LED_GPIO		(0x00000002) /* GPIO 1 */


/* 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)


#ifdef BLOB_NEED_MEMCONFIG
#ifdef CPU_SPEED_133

// found in the original Boot-Flash at 0x170fc (133 MHz)
#define MDCNFG_VALUE	0x1b541b54
#define MDCAS00_VALUE	0x55555557
#define MDCAS01_VALUE	0x55555555
#define MDCAS02_VALUE	0x55555555
#define MDCAS20_VALUE	0x55555557
#define MDCAS21_VALUE	0x55555555
#define MDCAS22_VALUE	0x55555555
#define MSC1_VALUE	0x27392738
#define MSC2_VALUE	0x27382739
#define MECR_VALUE	0x14a514a5
#define SMCNFG_VALUE	0x00000000
#define PPCR_VALUE	CPU_SPEED

#else

// found in the original Boot-Flash at 0x17164 (206 MHz)
#define MDCNFG_VALUE	0xf354f354
#define MDCAS00_VALUE	0xaaaaaaaf
#define MDCAS01_VALUE	0xaaaaaaaa
#define MDCAS02_VALUE	0xaaaaaaaa
#define MDCAS20_VALUE	0xaaaaaaaf
#define MDCAS21_VALUE	0xaaaaaaaa
#define MDCAS22_VALUE	0xaaaaaaaa
#define MSC1_VALUE	0x6c616c60
#define MSC2_VALUE	0x6c606c61
#define MECR_VALUE	0x21082108
#define SMCNFG_VALUE	0x00000000
#define PPCR_VALUE	CPU_SPEED

#endif

// MSC0 (nCS0, nCS1) is for Flash
// MSC1 (nCS2, nCS3) is for ?, SA1111
// MSC2 (nCS4, nCS5) is for ExtBus, LCD
#define MSC0_VALUE	0x6c616c60
#endif


// the control-registers in the FPGA
#define CONTROL_REG     __REG(0x42000000)


/* Debugging macros used in accelent code */
#define ACCELENT_DEBUG 1

#ifdef ACCELENT_DEBUG
#	define _DBGU32( x )	SerialOutputString( #x"=0x" ); \
				SerialOutputHex( (u32)x ); \
				serial_write( '\n' );
#else
#	define _DBGU32( x )
#endif


#endif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	2002/02/01 14:38:55	1.6
+++ Makefile.am	2002/02/04 18:02:41	1.7
@@ -11,11 +11,12 @@
 ###########################################################################
 
 noinst_HEADERS	= \
+	accelent_sa.h \
 	assabet.h \
-	frodo.h	\
 	badge4.h \
 	brutus.h \
 	clart.h \
+	frodo.h	\
 	h3600.h \
 	idr.h \
 	jornada720.h \

CVS: blob/utils/build build_Makefile,1.9,1.10 build_all,1.9,1.10

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

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

Modified Files:
	build_Makefile build_all 
Log Message:
Add accelent_sa to list of build archs


Index: build_Makefile
===================================================================
RCS file: /cvsroot/blob/blob/utils/build/build_Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- build_Makefile	2002/02/01 14:38:55	1.9
+++ build_Makefile	2002/02/04 18:11:22	1.10
@@ -13,7 +13,7 @@
 #
 
 archs		= \
-	assabet badge4 brutus creditlart h3600 idr\
+	accelent_sa assabet badge4 brutus creditlart h3600 idr\
 	jornada720 lart neponset nesa pleb shannon\
 	system3 frodo
 debug-archs	= $(foreach a, $(archs), $(a)-debug)

Index: build_all
===================================================================
RCS file: /cvsroot/blob/blob/utils/build/build_all,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- build_all	2002/02/01 14:38:55	1.9
+++ build_all	2002/02/04 18:11:22	1.10
@@ -12,7 +12,7 @@
 # published by the Free Software Foundation.
 #
 
-archs="assabet badge4 brutus creditlart h3600 idr jornada720 lart neponset nesa pleb shannon system3 frodo"
+archs="accelent_sa assabet badge4 brutus creditlart h3600 idr jornada720 lart neponset nesa pleb shannon system3 frodo"
 linux_prefix=~/LART/build/linux/elinux
 blob_src=~/src/sourceforge/blob
 extra_flags="--enable-all-features"

CVS: blob/src/diag system3.c,1.8,1.9

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

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

Modified Files:
	system3.c 
Log Message:
barrier() is already defined in include/blob/util.h


Index: system3.c
===================================================================
RCS file: /cvsroot/blob/blob/src/diag/system3.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- system3.c	2002/01/07 19:36:15	1.8
+++ system3.c	2002/02/04 18:12:51	1.9
@@ -50,10 +50,6 @@
 #define SET(reg,bit)	((reg) |= (1<<(bit)))
 #define CLR(reg,bit)	((reg) &= ~(1<<(bit)))
 
-/* Optimization barrier */
-/* The "volatile" is due to gcc bugs */
-#define barrier() __asm__ __volatile__("": : :"memory")
-
 #define	CPLD_BASE	(0x10000000)
 #define	CPLD_ID		(CPLD_BASE + 0x00)
 #define	CPLD_IRQ	(CPLD_BASE + 0x24)

Re: CVS: blob/src/blob main.c,1.27,1.28 xmodem.c,1.2,1.3

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

On Mon, Feb 04, 2002 at 04:14:18AM -0800, Abraham vd Merwe wrote:
> Update of /cvsroot/blob/blob/src/blob
> In directory usw-pr-cvs1:/tmp/cvs-serv25676/src/blob
> 
> Modified Files:
> 	main.c xmodem.c 
> Log Message:
> Changed Xmodem support to be optional (make > 1k difference and I never
> use it).

While you're at it, could you make uuencode support also optional?

(btw, xmodem support with 1K blocks is a *lot* faster than uuencode,
use "sx --1k" on the host for best results)


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/utils upload.sh,NONE,1.1

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

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

Added Files:
	upload.sh 
Log Message:
Added a script to automate uploading/flashing of images. There was a similar
script floating around a couple of months ago - this one is pretty much the
same, just a bit more user friendly and allows more image types, etc.


--- NEW FILE: upload.sh ---
#!/bin/sh

# Written by Abraham van der Merwe
# Last updated: 2002/02/04
#
# This script is based on a script I got from someone
# (Wookey?) a couple of months ago. I just can't remember
# who it is :P
#
# The script does the tedious job of setting serial port
# speeds and uploading files. The sleeps allow blob to keep
# up without screen corruption on serial speed changes.
#
# Todo:
#
#   1. Make flashing optional
#   2. Add optional "boot" parameter

# usage: set_9600 <device>
function set_9600()
{
	sleep 1
	stty 1:0:cbd:0:3:1c:7f:15:4:5:1:0:11:13:1a:0:12:f:17:16:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0 < $1
	sleep 1
}

# usage: set_115200 <device>
function set_115200()
{
	sleep 1
	stty 1:0:1cb2:0:3:1c:7f:15:4:5:1:0:11:13:1a:0:12:f:17:16:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0 < $1
	sleep 1
}

# usage: upload <name> <filename> <device>
function upload()
{
	local uu
	uu=$(tempfile -p upload)
	cat $2 | uuencode $2 > $uu
	echo "Starting $1 upload"
	set_9600 $3
	echo "download $1" > $3
	set_115200 $3
	dd if=$uu > $3
	rm -f $uu
	set_9600 $3
	echo "flash $1" > $3
	set_9600 $3
}

# usage: help
function help()
{
	echo "usage: ${0/*\//} [-d DEVICE] [-k KERNEL] [-r RAMDISK] [-b BLOB] [-p PARAM]"
	echo
	echo "   By default, /dev/ttyS0 is used"
	echo
	exit 1
}

dev=/dev/ttyS0
i=$#

[[ $i -lt 2 || $1 -eq "--help" ]] && help

while [[ $i -ne 0 ]]
do
	[[ $# -lt 2 ]] && help
	case $1 in
		"-d") dev=$2 ;;
		"-k") upload kernel $2 $dev ;;
		"-r") upload ramdisk $2 $dev ;;
		"-b") upload blob $2 $dev ;;
		"-p") upload param $2 $dev ;;
		   *) help ;;
	esac
	shift 2
	i=$(($i-2))
done

CVS: blob ChangeLog,1.16,1.17

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

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

Modified Files:
	ChangeLog 
Log Message:
Added a script to automate uploading/flashing of images. There was a similar
script floating around a couple of months ago - this one is pretty much the
same, just a bit more user friendly and allows more image types, etc.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/blob/blob/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ChangeLog	2002/02/04 12:14:15	1.16
+++ ChangeLog	2002/02/04 13:04:41	1.17
@@ -6,6 +6,7 @@
 blob-2.0.5-pre3:
 - 2d3D SA-1110 Dev Board support			Abraham van der Merwe
 - Changed Xmodem support to be optional		Abraham van der Merwe
+- Added a script to automate uploading of images	Abraham van der Merwe
 
 blob-2.0.5-pre2:
 - MD5 support						Christopher Hoover

CVS: blob/src/blob main.c,1.27,1.28 xmodem.c,1.2,1.3

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

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

Modified Files:
	main.c xmodem.c 
Log Message:
Changed Xmodem support to be optional (make > 1k difference and I never
use it).


Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/main.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- main.c	2002/01/21 19:45:17	1.27
+++ main.c	2002/02/04 12:14:16	1.28
@@ -330,7 +330,7 @@
 
 
 
-
+#ifdef CONFIG_XMODEM_SUPPORT
 static int xdownload(int argc, char *argv[])
 {
 	u32 startAddress;
@@ -411,7 +411,7 @@
 "Download <argument> image to RAM using xmodem\n";
 
 __commandlist(xdownload, "xdownload", xdownloadhelp);
-
+#endif	/* #ifdef CONFIG_XMODEM_SUPPORT */
 
 
 

Index: xmodem.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/xmodem.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xmodem.c	2002/01/06 19:02:29	1.2
+++ xmodem.c	2002/02/04 12:14:16	1.3
@@ -35,6 +35,8 @@
 # include <blob/config.h>
 #endif
 
+#ifdef CONFIG_XMODEM_SUPPORT
+
 #include <blob/errno.h>
 #include <blob/serial.h>
 #include <blob/util.h>
@@ -264,3 +266,6 @@
  done:
 	return length;
 }
+
+#endif	/* #ifdef CONFIG_XMODEM_SUPPORT */
+

CVS: blob ChangeLog,1.15,1.16 acconfig.h,1.14,1.15 configure.in,1.39,1.40

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

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

Modified Files:
	ChangeLog acconfig.h configure.in 
Log Message:
Changed Xmodem support to be optional (make > 1k difference and I never
use it).


Index: ChangeLog
===================================================================
RCS file: /cvsroot/blob/blob/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ChangeLog	2002/01/07 20:27:46	1.15
+++ ChangeLog	2002/02/04 12:14:15	1.16
@@ -4,6 +4,8 @@
 $Id$
 
 blob-2.0.5-pre3:
+- 2d3D SA-1110 Dev Board support			Abraham van der Merwe
+- Changed Xmodem support to be optional		Abraham van der Merwe
 
 blob-2.0.5-pre2:
 - MD5 support						Christopher Hoover

Index: acconfig.h
===================================================================
RCS file: /cvsroot/blob/blob/acconfig.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- acconfig.h	2002/02/01 14:38:55	1.14
+++ acconfig.h	2002/02/04 12:14:15	1.15
@@ -107,6 +107,9 @@
 /* Define if MD5 support is wanted */
 #undef CONFIG_MD5_SUPPORT
 
+/* Define if Xmodem support is wanted */
+#undef CONFIG_XMODEM_SUPPORT
+
 /* Define if JFFS2 support is wanted */
 #undef CONFIG_JFFS2_SUPPORT
 

Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- configure.in	2002/02/01 14:38:55	1.39
+++ configure.in	2002/02/04 12:14:15	1.40
@@ -317,6 +317,11 @@
 [md5_flag=$enable_md5],
 [md5_flag=no])
 
+AC_ARG_ENABLE(xmodem,
+[  --enable-xmodem         Enable Xmodem support ],
+[xmodem_flag=$enable_xmodem],
+[xmodem_flag=no])
+
 AC_ARG_ENABLE(jffs2,
 [  --enable-jffs2          Enable support for loading kernel from jffs2],
 [jffs2_flag=$enable_jffs2],
@@ -340,6 +345,7 @@
 	debug_flag=yes
 	lcd_flag=yes
 	md5_flag=yes
+	xmodem_flag=yes
 	jffs2_flag=yes
 	cramfs_flag=yes
 fi
@@ -395,6 +401,11 @@
         AC_DEFINE(CONFIG_MD5_SUPPORT)
 fi
 
+dnl Check wether or not Xmodem support is wanted
+if test "x$xmodem_flag" = "xyes" ; then
+        AC_DEFINE(CONFIG_XMODEM_SUPPORT)
+fi
+
 dnl Check wether or not JFFS2 support is wanted
 if test "x$jffs2_flag" = "xyes" ; then
 	AC_MSG_WARN("JFFS2 support is only dummy code")
@@ -515,6 +526,7 @@
 echo "Debugging commands support  ${debug_flag}"
 echo "LCD support                 ${lcd_flag}"
 echo "MD5 support                 ${md5_flag}"
+echo "Xmodem support              ${xmodem_flag}"
 echo "JFFS2 support               ${jffs2_flag}"
 echo "cramfs support              ${cramfs_flag}"
 echo "Run-time debug information  ${blob_debug_flag}"

CVS: blob/src/diag frodo.c,NONE,1.1 Makefile.am,1.9,1.10

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

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

Modified Files:
	Makefile.am 
Added Files:
	frodo.c 
Log Message:
Added support for 2d3D, Inc. SA-1110 Development Board.


--- NEW FILE: frodo.c ---
/*
 * frodo.c: FRODO specific stuff
 *
 * Copyright (C) 2002  Abraham van der Merwe <ab...@2d...>
 *
 * $Id: frodo.c,v 1.1 2002/02/01 14:38:55 abz Exp $
 *
 * 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: frodo.c,v 1.1 2002/02/01 14:38:55 abz Exp $"

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

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




static void frodo_init_hardware(void)
{
	/* select serial driver */
	serial_driver = &sa11x0_serial_driver;
}

__initlist(frodo_init_hardware, INIT_LEVEL_DRIVER_SELECTION);

Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/diag/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.am	2002/01/29 17:47:23	1.9
+++ Makefile.am	2002/02/01 14:38:55	1.10
@@ -46,6 +46,7 @@
 EXTRA_diag_elf32_SOURCES		= \
 	lcd.c \
 	assabet.c \
+	frodo.c \
 	badge4.c \
 	brutus.c \
 	clart.c \

CVS: blob AUTHORS,1.4,1.5 acconfig.h,1.13,1.14 configure.in,1.38,1.39

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

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

Modified Files:
	AUTHORS acconfig.h configure.in 
Log Message:
Added support for 2d3D, Inc. SA-1110 Development Board.


Index: AUTHORS
===================================================================
RCS file: /cvsroot/blob/blob/AUTHORS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- AUTHORS	2001/12/27 18:27:37	1.4
+++ AUTHORS	2002/02/01 14:38:55	1.5
@@ -77,3 +77,10 @@
 * Badge4
 ========
 - Christopher Hoover <ch...@hp...>
+
+
+* Frodo port
+============
+- Abraham vd Merwe <ab...@2d...>, <ab...@de...>, <ab...@bl...>, <ab...@fr...>
+
+

Index: acconfig.h
===================================================================
RCS file: /cvsroot/blob/blob/acconfig.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- acconfig.h	2002/01/29 16:27:42	1.13
+++ acconfig.h	2002/02/01 14:38:55	1.14
@@ -59,6 +59,9 @@
 /* Define to enable run-time debug information */
 #undef BLOB_DEBUG
 
+/* Define for FRODO boards */
+#undef FRODO
+
 /* Define for Assabet boards */
 #undef ASSABET
 

Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- configure.in	2002/01/29 17:47:23	1.38
+++ configure.in	2002/02/01 14:38:55	1.39
@@ -86,13 +86,24 @@
                             nesa        NESA
                             pleb        PLEB
                             shannon     TuxScreen (Shannon)
-			    system3     Prueftechnik Digital Board
+                            frodo       2d3D, Inc. SA-1110 Development Board
+                            system3     Prueftechnik Digital Board
                           Default board is lart],
 	board_name="$withval",
 	board_name="lart")
 
 AC_MSG_CHECKING(target board)
 case "$board_name" in
+	frodo)
+	board_name="2d3D, Inc. SA-1110 Development Board"
+	AC_DEFINE(FRODO)
+	BLOB_PLATFORM_OBJ="frodo.o"
+	AC_MSG_WARN([Please check frodo memory config in arch/frodo.h])
+	BLOB_FLASH_OBJS="intel32.o"
+	DIAG_PLATFORM_OBJ="frodo.o"
+	use_cpu="sa1110"
+	use_lcd="no"
+	;;
     assabet)
 	board_name="Intel Assabet"
 	AC_DEFINE(ASSABET)

CVS: blob/include/blob/arch frodo.h,NONE,1.1 Makefile.am,1.5,1.6

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

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

Modified Files:
	Makefile.am 
Added Files:
	frodo.h 
Log Message:
Added support for 2d3D, Inc. SA-1110 Development Board.


--- NEW FILE: frodo.h ---
/*
 * frodo.h: 2d3D, Inc. SA-1110 Development Board
 *
 * Copyright (C) 2001  Abraham van der Merwe <ab...@2d...>
 *
 * $Id: frodo.h,v 1.1 2002/02/01 14:38:55 abz Exp $
 *
 * 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: frodo.h,v 1.1 2002/02/01 14:38:55 abz Exp $"

#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
 */

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

/*
 * Serial port 1 is used for the Serial port w/ flow control.
 */

/* serial port */
#define USE_SERIAL2


/* GPIO for the LED */
#define LED_GPIO		(0x00000000) /* no led (for now) */


/* 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		0x0000a265
#	define MDCAS00_VALUE	0x5555557f
#	define MDCAS01_VALUE	0x55555555
#	define MDCAS02_VALUE	0x55555555
#	define MSC0_VALUE		0x00004770
#	define MSC1_VALUE		0x00000000
#	define MECR_VALUE		0xffffffff
/* MDREFR == 0x00700061 */
#	define MDREFR_VALUE		do_not_use_this_value__gets_automagically_computed
#	define MDCAS20_VALUE	0xaaaaaa7f		/* 0x20 MDCAS20	*/
#	define MDCAS21_VALUE	0xaaaaaaaa		/* 0x24 MDCAS21	*/
#	define MDCAS22_VALUE	0xaaaaaaaa		/* 0x28 MDCAS22	*/
#	define MSC2_VALUE		0x42196669		/* 0x2C MCS2	*/
#	define SMCNFG_VALUE		0x00000000
#endif




#endif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	2001/12/27 18:27:37	1.5
+++ Makefile.am	2002/02/01 14:38:55	1.6
@@ -12,6 +12,7 @@
 
 noinst_HEADERS	= \
 	assabet.h \
+	frodo.h	\
 	badge4.h \
 	brutus.h \
 	clart.h \

CVS: blob/src/lib serial-sa11x0.c,1.2,1.3

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

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

Modified Files:
	serial-sa11x0.c 
Log Message:
Added support for 2d3D, Inc. SA-1110 Development Board.


Index: serial-sa11x0.c
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/serial-sa11x0.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serial-sa11x0.c	2002/01/03 16:07:18	1.2
+++ serial-sa11x0.c	2002/02/01 14:38:55	1.3
@@ -48,8 +48,24 @@
 # define SerialUTCR2 Ser1UTCR2
 # define SerialUTCR3 Ser1UTCR3
 
-#else /* defined USE_SERIAL3 */
+#else /* defined USE_SERIAL1 */
+
+#if defined USE_SERIAL2
+
+# define SerialUTSR0 Ser2UTSR0
+# define SerialUTSR1 Ser2UTSR1
+
+# define SerialUTDR Ser2UTDR
 
+# define SerialUTCR0 Ser2UTCR0
+# define SerialUTCR1 Ser2UTCR1
+# define SerialUTCR2 Ser2UTCR2
+# define SerialUTCR3 Ser2UTCR3
+
+#else /* defined USE_SERIAL2 */
+
+#if defined USE_SERIAL3
+
 /* using an SA11x0 CPU and not having any serial port defined is an
  * error, but because we're using the driver in the library we can't
  * bail out over here
@@ -65,8 +81,11 @@
 # define SerialUTCR2 Ser3UTCR2
 # define SerialUTCR3 Ser3UTCR3
 
-#endif
+#endif /* defined USE_SERIAL3 */
 
+#endif /* defined USE_SERIAL2 */
+
+#endif /* defined USE_SERIAL1 */
 
 
 

CVS: blob/utils/build build_Makefile,1.8,1.9 build_all,1.8,1.9

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

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

Modified Files:
	build_Makefile build_all 
Log Message:
Added support for 2d3D, Inc. SA-1110 Development Board.


Index: build_Makefile
===================================================================
RCS file: /cvsroot/blob/blob/utils/build/build_Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- build_Makefile	2002/01/07 13:30:48	1.8
+++ build_Makefile	2002/02/01 14:38:55	1.9
@@ -15,7 +15,7 @@
 archs		= \
 	assabet badge4 brutus creditlart h3600 idr\
 	jornada720 lart neponset nesa pleb shannon\
-	system3
+	system3 frodo
 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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- build_all	2002/01/07 13:30:48	1.8
+++ build_all	2002/02/01 14:38:55	1.9
@@ -12,7 +12,7 @@
 # published by the Free Software Foundation.
 #
 
-archs="assabet badge4 brutus creditlart h3600 idr jornada720 lart neponset nesa pleb shannon system3"
+archs="assabet badge4 brutus creditlart h3600 idr jornada720 lart neponset nesa pleb shannon system3 frodo"
 linux_prefix=~/LART/build/linux/elinux
 blob_src=~/src/sourceforge/blob
 extra_flags="--enable-all-features"

CVS: blob/src/blob frodo.c,NONE,1.1 Makefile.am,1.19,1.20 flash.c,1.13,1.14

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

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

Modified Files:
	Makefile.am flash.c 
Added Files:
	frodo.c 
Log Message:
Added support for 2d3D, Inc. SA-1110 Development Board.


--- NEW FILE: frodo.c ---
/*
 * frodo.c: FRODO specific stuff
 *
 * Copyright (C) 2001  Abraham van der Merwe <ab...@2d...>
 *
 * 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: frodo.c,v 1.1 2002/02/01 14:38:55 abz Exp $"

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

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




/* flash descriptor for FRODO flash */
/* 2x Intel 28F128J3A strataflash (32MB) */
static flash_descriptor_t frodo_flash_descriptors[] =
{
	{
		size: 2 * 128 * 1024,
		num: 128,
		lockable: 1
	},
	{
		/* NULL block */
	},
};




static void init_frodo_flash_driver(void)
{
	flash_descriptors = frodo_flash_descriptors;
	flash_driver = &intel32_flash_driver;
}

__initlist(init_frodo_flash_driver, INIT_LEVEL_DRIVER_SELECTION);




#define RS232_ENABLE		0x00001000
#define GREEN_LED_ENABLE	0x00000000

static void frodo_init_hardware(void)
{
	u32 *bcr = (u32 *)0x12000000;
	
	/* enable RS232 tranceiver and green LED */
	*bcr = RS232_ENABLE | GREEN_LED_ENABLE;

	/* select serial driver */
	serial_driver = &sa11x0_serial_driver;
}


__initlist(frodo_init_hardware, INIT_LEVEL_DRIVER_SELECTION);

Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile.am	2002/01/29 17:47:23	1.19
+++ Makefile.am	2002/02/01 14:38:55	1.20
@@ -160,7 +160,8 @@
 	nesa.c \
 	pleb.c \
 	shannon.c \
-	system3.c
+	system3.c \
+	frodo.c
 
 
 blob_rest_elf32_DEPENDENCIES = \

Index: flash.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/flash.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- flash.c	2002/01/16 23:19:27	1.13
+++ flash.c	2002/02/01 14:38:55	1.14
@@ -48,8 +48,8 @@
 #include <blob/command.h>
 
 
-/* this is enough for a 16MB flash with 128kB blocks */
-#define NUM_FLASH_BLOCKS	(128)
+/* this is enough for a 32MB flash with 128kB blocks */
+#define NUM_FLASH_BLOCKS	(256)
 
 
 typedef struct {

CVS: blob/include/blob arch.h,1.4,1.5 linux.h,1.5,1.6

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

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

Modified Files:
	arch.h linux.h 
Log Message:
Added support for 2d3D, Inc. SA-1110 Development Board.


Index: arch.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- arch.h	2001/12/27 18:27:37	1.4
+++ arch.h	2002/02/01 14:38:55	1.5
@@ -39,6 +39,8 @@
 /* architecture specific include files */
 #if defined ASSABET
 # include <blob/arch/assabet.h>
+#elif defined FRODO
+# include <blob/arch/frodo.h>
 #elif defined BADGE4
 # include <blob/arch/badge4.h>
 #elif defined BRUTUS

Index: linux.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/linux.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- linux.h	2002/01/15 02:02:18	1.5
+++ linux.h	2002/02/01 14:38:55	1.6
@@ -34,6 +34,8 @@
 
 #if defined ASSABET
 # define ARCH_NUMBER (25)
+#elif defined FRODO
+# define ARCH_NUMBER (158)
 #elif defined BADGE4
 # define ARCH_NUMBER (148)
 #elif defined BRUTUS

Re: null bytes?

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

On Tue, Jan 29, 2002 at 06:36:02PM -0700, Tim Riker wrote:
> got the mapfile patch and rebuild. map file is here:
> 
> http://opensource.lineo.com/~timr/vercel/

OK, I can reproduce your bug. My original 2.95.2 based toolchain uses
binutils 2.9.5 and behaves OK, the 2.95.3 and 3.0 based toolchains use
binutils 2.11.2 and 2.11.90.0.4. All gcc versions issue the same linker
command line (with some differences in the -L flags), but so far only
the 2.9.5 based linker works as expected. I'm trying to track it down
further.

I have a meeting tonight, could you add the following flag to
blob_rest_elf32_LDFLAGS in src/blob/Makefile.am: -Wl,--gc-sections and
try if that gives you a bootable blob image?


Erik
[who really has to go now]

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

Re: null bytes?

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

got the mapfile patch and rebuild. map file is here:

http://opensource.lineo.com/~timr/vercel/
-- 
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/diag Makefile.am,1.8,1.9

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

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

Modified Files:
	Makefile.am 
Log Message:
Add a directory for the commands. The idea is to have a single file per
command so the linker will automatically link in the correct object files
from libcommands.a.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/diag/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	2002/01/29 17:08:21	1.8
+++ Makefile.am	2002/01/29 17:47:23	1.9
@@ -61,6 +61,8 @@
 diag_elf32_DEPENDENCIES	= \
 	@LCD@ \
 	@DIAG_PLATFORM_OBJ@ \
+	${top_builddir}/src/commands/libcommands.a \
+	${top_builddir}/src/lib/libblob.a \
 	ld-script
 
 diag_elf32_LDFLAGS	+= \
@@ -71,7 +73,8 @@
 diag_elf32_LDADD	+= \
 	@LCD@ \
 	@DIAG_PLATFORM_OBJ@ \
-	-L${top_builddir}/src/lib -lblob \
+	-L${top_builddir}/src/commands -L${top_builddir}/src/lib \
+	-lcommands -lblob \
 	-lgcc
 
 

CVS: blob/src/commands Makefile.am,NONE,1.1 dummy.c,NONE,1.1

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

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

Added Files:
	Makefile.am dummy.c 
Log Message:
Add a directory for the commands. The idea is to have a single file per
command so the linker will automatically link in the correct object files
from libcommands.a.


--- NEW FILE: Makefile.am ---
# -*- makefile -*-
#
# Makefile.am
#
# Copyright (C) 2002 Erik Mouw (J.A...@it...)
#
# $Id: Makefile.am,v 1.1 2002/01/29 17:47:23 erikm Exp $
#
# 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


noinst_LIBRARIES	= \
	libcommands.a


libcommands_a_SOURCES	= \
	dummy.c


INCLUDES		+= \
	-I${top_builddir}/include \
	-I${top_srcdir}/include


CLEANFILES	= ${srcdir}/*~


DISTCLEANFILES	= ${builddir}/.deps/*.P

--- NEW FILE: dummy.c ---
/*
 * dummy.c: Dummy command that only shows how things work
 *
 * Copyright (C) 2002  Erik Mouw <J.A...@it...>
 *
 * $Id: dummy.c,v 1.1 2002/01/29 17:47:23 erikm Exp $
 *
 * 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: dummy.c,v 1.1 2002/01/29 17:47:23 erikm Exp $"

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

#include <blob/serial.h>




int dummy_cmd(int argc, char *argv[])
{
	int i;

	for(i = 0; i < argc; i++) {
		SerialOutputString("arg[");
		SerialOutputDec(i);
		SerialOutputString("] = ");
		SerialOutputString(argv[i]);
		serial_write('\n');
	}

	return 0;
}

char dummy_help[] = "dummy\n"
"Dummy command that only shows all arguments and returns\n";


/*
 * To use this command, just add this line somewhere in the
 * application (src/blob/commands, for example):
 *
 *   __commandlist(dummy_cmd, "dummy", dummy_help);
 *
 */

CVS: blob/src/blob Makefile.am,1.18,1.19

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

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

Modified Files:
	Makefile.am 
Log Message:
Add a directory for the commands. The idea is to have a single file per
command so the linker will automatically link in the correct object files
from libcommands.a.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile.am	2002/01/29 17:08:20	1.18
+++ Makefile.am	2002/01/29 17:47:23	1.19
@@ -169,6 +169,7 @@
 	@CHKMEM@ \
 	@DEBUG@ \
 	@CLOCK@ \
+	${top_builddir}/src/commands/libcommands.a \
 	${top_builddir}/src/lib/libblob.a \
 	rest-ld-script
 
@@ -184,7 +185,8 @@
 	@CHKMEM@ \
 	@DEBUG@ \
 	@CLOCK@ \
-	-L${top_builddir}/src/lib -lblob \
+	-L${top_builddir}/src/commands -L${top_builddir}/src/lib \
+	-lcommands -lblob \
 	-lgcc
 
 

CVS: blob/src Makefile.am,1.14,1.15

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

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

Modified Files:
	Makefile.am 
Log Message:
Add a directory for the commands. The idea is to have a single file per
command so the linker will automatically link in the correct object files
from libcommands.a.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.am	2001/10/07 19:04:24	1.14
+++ Makefile.am	2002/01/29 17:47:23	1.15
@@ -11,6 +11,7 @@
 ###########################################################################
 
 SUBDIRS		= \
+	commands \
 	lib \
 	blob \
 	diag