blob-cvs-commit — blob CVS commit messages list

CVS: blob/src/lib reboot.c,1.5,1.6

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

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

Modified Files:
	reboot.c 
Log Message:
Oops, obvious bug


Index: reboot.c
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/reboot.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- reboot.c	4 Jan 2003 02:11:43 -0000	1.5
+++ reboot.c	4 Jan 2003 02:15:07 -0000	1.6
@@ -41,8 +41,10 @@
 
 void reboot_system(void)
 {
-	if(reboot_driver == NULL)
+	if(reboot_driver == NULL) {
 		deprintf("reboot_driver == NULL, can't reboot!\n");
+		return;
+	}
 
 	reboot_driver->reboot();
 }

CVS: blob/src/blob accelent_sa.c,1.2,1.3 assabet.c,1.7,1.8 badge4.c,1.10,1.11 brutus.c,1.6,1.7 cep.c,1.1,1.2 clart.c,1.6,1.7 frodo.c,1.5,1.6 h3600.c,1.6,1.7 hackkit.c,1.2,1.3 idr.c,1.10,1.11 jornada720.c,1.5,1.6 lart.c,1.7,1.8 lubbock.c,1.1,1.2 miniprint.c,1.1,1.2 nesa.c,1.7,1.8 pleb.c,1.6,1.7 pxa_idp.c,1.1,1.2 shannon.c,1.11,1.12 system3.c,1.23,1.24 trizeps.c,1.1,1.2

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

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

Modified Files:
	accelent_sa.c assabet.c badge4.c brutus.c cep.c clart.c 
	frodo.c h3600.c hackkit.c idr.c jornada720.c lart.c lubbock.c 
	miniprint.c nesa.c pleb.c pxa_idp.c shannon.c system3.c 
	trizeps.c 
Log Message:
Make a special reboot driver so SA11x0 and PXA can have different reboot
methods. Note that I don't have the PXA manual with me right here, so 
somebody has to fill out a real PXA reboot driver at a later stage.


Index: accelent_sa.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/accelent_sa.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- accelent_sa.c	13 Feb 2002 00:08:54 -0000	1.2
+++ accelent_sa.c	4 Jan 2003 02:11:42 -0000	1.3
@@ -37,12 +37,12 @@
 #include <blob/errno.h>
 #include <blob/error.h>
 #include <blob/util.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 #include <blob/flash.h>
 #include <blob/init.h>
 #include <blob/command.h>
 #include <blob/uucodec.h>
-#include <blob/serial.h>
 
 
 extern blob_status_t blob_status;
@@ -99,7 +99,8 @@
 
 static void accelent_sa_init_hardware(void)
 {
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 }
 

Index: assabet.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/assabet.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- assabet.c	13 Feb 2002 00:08:54 -0000	1.7
+++ assabet.c	4 Jan 2003 02:11:42 -0000	1.8
@@ -27,6 +27,7 @@
 
 #include <blob/flash.h>
 #include <blob/init.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 
 
@@ -70,7 +71,8 @@
 	/* enable RS232 tranceiver and green LED */
 	*bcr = RS232_ENABLE | GREEN_LED_ENABLE;
 
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 }
 

Index: badge4.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/badge4.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- badge4.c	25 Jul 2002 17:27:51 -0000	1.10
+++ badge4.c	4 Jan 2003 02:11:42 -0000	1.11
@@ -30,6 +30,7 @@
 #include <blob/flash.h>
 #include <blob/init.h>
 #include <blob/sa1100.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 #include <blob/util.h>
 #include <blob/i2c.h>
@@ -77,6 +78,7 @@
 
 static void badge4_select_drivers(void)
 {
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 
 	flash_descriptors = badge4_flash_descriptors;

Index: brutus.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/brutus.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- brutus.c	13 Feb 2002 00:08:54 -0000	1.6
+++ brutus.c	4 Jan 2003 02:11:42 -0000	1.7
@@ -27,6 +27,7 @@
 
 #include <blob/flash.h>
 #include <blob/init.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 
 
@@ -59,7 +60,8 @@
 
 static void brutus_init_hardware(void)
 {
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 }
 

Index: cep.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/cep.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cep.c	14 Oct 2002 13:17:31 -0000	1.1
+++ cep.c	4 Jan 2003 02:11:42 -0000	1.2
@@ -27,6 +27,7 @@
 
 #include <blob/flash.h>
 #include <blob/init.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 
 
@@ -70,7 +71,8 @@
 	/* enable RS232 tranceiver */
 	*bcr = RS232_ENABLE;
 
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 
         /* switch on the LED D3 */

Index: clart.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/clart.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- clart.c	13 Feb 2002 00:08:54 -0000	1.6
+++ clart.c	4 Jan 2003 02:11:42 -0000	1.7
@@ -27,6 +27,7 @@
 
 #include <blob/flash.h>
 #include <blob/init.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 
 
@@ -62,7 +63,8 @@
 
 static void clart_init_hardware(void)
 {
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 }
 

Index: frodo.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/frodo.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- frodo.c	9 Apr 2002 12:30:43 -0000	1.5
+++ frodo.c	4 Jan 2003 02:11:43 -0000	1.6
@@ -27,6 +27,7 @@
 
 #include <blob/flash.h>
 #include <blob/init.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 
 
@@ -79,7 +80,8 @@
 	*ide |= IDERESET;
 	*ide &= ~IDERESET;
 
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 }
 

Index: h3600.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/h3600.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- h3600.c	13 Feb 2002 00:08:54 -0000	1.6
+++ h3600.c	4 Jan 2003 02:11:43 -0000	1.7
@@ -29,6 +29,7 @@
 
 #include <blob/flash.h>
 #include <blob/init.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 
 
@@ -126,7 +127,8 @@
 	/* enable RS232 tranceiver */
 	h3600_set_egpio(EGPIO_H3600_RS232_ON);
 
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 }
 

Index: hackkit.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/hackkit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hackkit.c	3 Dec 2002 16:42:52 -0000	1.2
+++ hackkit.c	4 Jan 2003 02:11:43 -0000	1.3
@@ -36,12 +36,12 @@
 #include <blob/errno.h>
 #include <blob/error.h>
 #include <blob/util.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 #include <blob/flash.h>
 #include <blob/init.h>
 #include <blob/command.h>
 #include <blob/uucodec.h>
-#include <blob/serial.h>
 #include <blob/time.h>
 #include <blob/partition.h>
 
@@ -116,7 +116,8 @@
 	blob_status.boot_delay = -1;
 	//blob_status.terminalSpeed = baud_9600;
 
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 }
 __initlist(hackkit_init_hardware, INIT_LEVEL_DRIVER_SELECTION);

Index: idr.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/idr.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- idr.c	27 Apr 2002 08:10:31 -0000	1.10
+++ idr.c	4 Jan 2003 02:11:43 -0000	1.11
@@ -28,6 +28,7 @@
 #include <blob/main.h>
 #include <blob/flash.h>
 #include <blob/init.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 #include <blob/sa1100.h>
 #include <blob/sa1111.h>
@@ -119,7 +120,8 @@
 
 static void idr_init_hardware(void)
 {
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 
 	/* tweak blob config */

Index: jornada720.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/jornada720.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jornada720.c	13 Feb 2002 00:08:54 -0000	1.5
+++ jornada720.c	4 Jan 2003 02:11:43 -0000	1.6
@@ -29,6 +29,7 @@
 #include <blob/flash.h>
 #include <blob/init.h>
 #include <blob/sa1100.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 #include <blob/time.h>
 
@@ -74,7 +75,8 @@
 	flash_driver->enable_vpp = jornada720_enable_vpp;
 	flash_driver->disable_vpp = jornada720_disable_vpp;
 
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 }
 

Index: lart.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/lart.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- lart.c	13 Feb 2002 00:22:24 -0000	1.7
+++ lart.c	4 Jan 2003 02:11:43 -0000	1.8
@@ -29,10 +29,12 @@
 #include <blob/flash.h>
 #include <blob/init.h>
 #include <blob/partition.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 
 
 
+
 /* flash descriptor for LART flash */
 /* 2x Intel 28F160F3B fast boot block flash (4MB) */
 static const flash_descriptor_t lart_flash_descriptors[] =
@@ -130,7 +132,7 @@
 
 static void lart_select_drivers(void)
 {
-	/* select serial driver */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 
 	/* we could do funky detection over here, because the LART can

Index: lubbock.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/lubbock.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lubbock.c	14 Aug 2002 21:04:23 -0000	1.1
+++ lubbock.c	4 Jan 2003 02:11:43 -0000	1.2
@@ -26,6 +26,7 @@
 
 #include <blob/flash.h>
 #include <blob/init.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 
 
@@ -69,8 +70,9 @@
 	/* enable RS232 tranceiver and green LED */
 	*bcr = RS232_ENABLE | GREEN_LED_ENABLE;
 
-	/* select serial driver */
-	serial_driver = &sa11x0_serial_driver;
+	/* select drivers */
+	reboot_driver = &pxa_reboot_driver;
+	serial_driver = &pxa_serial_driver;
 }
 
 

Index: miniprint.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/miniprint.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- miniprint.c	27 May 2002 13:05:05 -0000	1.1
+++ miniprint.c	4 Jan 2003 02:11:43 -0000	1.2
@@ -27,6 +27,7 @@
 
 #include <blob/flash.h>
 #include <blob/init.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 
 /* flash descriptor for Miniprint flash */
@@ -52,7 +53,8 @@
 
 static void miniprint_init_hardware(void)
 {
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 }
 __initlist(miniprint_init_hardware, INIT_LEVEL_DRIVER_SELECTION);

Index: nesa.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/nesa.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- nesa.c	13 Feb 2002 00:08:54 -0000	1.7
+++ nesa.c	4 Jan 2003 02:11:43 -0000	1.8
@@ -27,6 +27,7 @@
 
 #include <blob/flash.h>
 #include <blob/init.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 
 
@@ -73,7 +74,8 @@
 
 static void nesa_init_hardware(void)
 {
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 }
 

Index: pleb.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/pleb.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pleb.c	13 Feb 2002 00:08:54 -0000	1.6
+++ pleb.c	4 Jan 2003 02:11:43 -0000	1.7
@@ -28,6 +28,7 @@
 #include <blob/flash.h>
 #include <blob/init.h>
 #include <blob/led.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 
 
@@ -76,7 +77,8 @@
 
 static void pleb_init_hardware(void)
 {
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 }
 

Index: pxa_idp.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/pxa_idp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pxa_idp.c	14 Aug 2002 21:04:24 -0000	1.1
+++ pxa_idp.c	4 Jan 2003 02:11:43 -0000	1.2
@@ -35,12 +35,12 @@
 #include <blob/errno.h>
 #include <blob/error.h>
 #include <blob/util.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 #include <blob/flash.h>
 #include <blob/init.h>
 #include <blob/command.h>
 #include <blob/uucodec.h>
-#include <blob/serial.h>
 
 
 extern blob_status_t blob_status;
@@ -96,7 +96,8 @@
 
 static void accelent_sa_init_hardware(void)
 {
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &pxa_reboot_driver;
 	serial_driver = &pxa_serial_driver;
 }
 

Index: shannon.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/shannon.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- shannon.c	27 Apr 2002 10:26:50 -0000	1.11
+++ shannon.c	4 Jan 2003 02:11:43 -0000	1.12
@@ -28,6 +28,7 @@
 #include <blob/main.h>
 #include <blob/flash.h>
 #include <blob/init.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 
 /* flash descriptor for SHANNON flash */
@@ -66,7 +67,8 @@
 
 static void shannon_init_hardware(void)
 {
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 
 	/* tweak blob config */

Index: system3.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/system3.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- system3.c	25 Jul 2002 14:21:02 -0000	1.23
+++ system3.c	4 Jan 2003 02:11:43 -0000	1.24
@@ -36,12 +36,12 @@
 #include <blob/errno.h>
 #include <blob/error.h>
 #include <blob/util.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 #include <blob/flash.h>
 #include <blob/init.h>
 #include <blob/command.h>
 #include <blob/uucodec.h>
-#include <blob/serial.h>
 #include <blob/time.h>
 #include <blob/partition.h>
 
@@ -263,7 +263,8 @@
 	/* tweak blob config */
 	blob_status.boot_delay = 1;
 
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 }
 __initlist(system3_init_hardware, INIT_LEVEL_DRIVER_SELECTION);

Index: trizeps.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/trizeps.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- trizeps.c	23 Apr 2002 13:29:57 -0000	1.1
+++ trizeps.c	4 Jan 2003 02:11:43 -0000	1.2
@@ -37,12 +37,12 @@
 #include <blob/errno.h>
 #include <blob/error.h>
 #include <blob/util.h>
+#include <blob/reboot.h>
 #include <blob/serial.h>
 #include <blob/flash.h>
 #include <blob/init.h>
 #include <blob/command.h>
 #include <blob/uucodec.h>
-#include <blob/serial.h>	/* oops, agen */
 
 /**********************************************************************
  * defines
@@ -106,7 +106,8 @@
 
 static void trizeps_init_hardware(void)
 {
-	/* select serial driver */
+	/* select drivers */
+	reboot_driver = &sa11x0_reboot_driver;
 	serial_driver = &sa11x0_serial_driver;
 }
 

CVS: blob/src/lib reboot-pxa.c,NONE,1.1 reboot-sa11x0.c,NONE,1.1 Makefile.am,1.22,1.23 reboot.c,1.4,1.5

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

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

Modified Files:
	Makefile.am reboot.c 
Added Files:
	reboot-pxa.c reboot-sa11x0.c 
Log Message:
Make a special reboot driver so SA11x0 and PXA can have different reboot
methods. Note that I don't have the PXA manual with me right here, so 
somebody has to fill out a real PXA reboot driver at a later stage.


--- NEW FILE: reboot-pxa.c ---
/*
 * reboot-pxa.c: Reboot PXA 250 board
 *
 * Copyright (C) 2003  Erik Mouw (J.A...@it...)
 *
 * $Id: reboot-pxa.c,v 1.1 2003/01/04 02:11:43 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: reboot-pxa.c,v 1.1 2003/01/04 02:11:43 erikm Exp $"

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

#include <blob/util.h>
#include <blob/reboot.h>
#include <blob/serial.h>




void pxa_reboot(void)
{
#warning "FIXME: add real PXA reboot code here! -- Erik"
	printf("FIXME: add PXA-250 reboot code here!\n");
	printf("Going into endless loop, just use your reset button...\n");
	serial_flush_output();

	for(;;);
}




/* export reboot driver */
reboot_driver_t pxa_reboot_driver = {
	reboot:	pxa_reboot
};

--- NEW FILE: reboot-sa11x0.c ---
/*
 * reboot-sa11x0.c: Reboot SA11x0 board
 *
 * Copyright (C) 2001 2003  Erik Mouw (J.A...@it...)
 *
 * $Id: reboot-sa11x0.c,v 1.1 2003/01/04 02:11:43 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: reboot-sa11x0.c,v 1.1 2003/01/04 02:11:43 erikm Exp $"

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

#include <blob/sa1100.h>
#include <blob/reboot.h>




void sa11x0_reboot(void)
{
	RCSR = 0;
	RSRR = 1;
}




/* export reboot driver */
reboot_driver_t sa11x0_reboot_driver = {
	reboot:	sa11x0_reboot
};

Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile.am	14 Aug 2002 21:13:45 -0000	1.22
+++ Makefile.am	4 Jan 2003 02:11:43 -0000	1.23
@@ -50,10 +50,18 @@
 	time.c \
 	util.c
 
+EXTRA_libblob_a_SOURCES = \
+	reboot-pxa.c \
+	reboot-sa11x0.c \
+	serial-pxa.c \
+	serial-sa11x0.c
+
 libblob_a_DEPENDENCIES = \
+	@BLOB_REBOOT_DRIVER_OBJS@ \
 	@BLOB_SERIAL_DRIVER_OBJS@
 
 libblob_a_LIBADD = \
+	@BLOB_REBOOT_DRIVER_OBJS@ \
 	@BLOB_SERIAL_DRIVER_OBJS@
 
 INCLUDES		+= \

Index: reboot.c
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/reboot.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- reboot.c	17 Feb 2002 19:54:47 -0000	1.4
+++ reboot.c	4 Jan 2003 02:11:43 -0000	1.5
@@ -1,7 +1,7 @@
 /*
  * reboot.c: Reboot board
  *
- * Copyright (C) 2001  Erik Mouw (J.A...@it...)
+ * Copyright (C) 2001-2003  Erik Mouw (J.A...@it...)
  *
  * $Id$
  *
@@ -27,14 +27,22 @@
 # include <blob/config.h>
 #endif
 
-#include <blob/sa1100.h>
+#include <blob/debug.h>
 #include <blob/util.h>
+#include <blob/reboot.h>
+
+
+
+
+reboot_driver_t *reboot_driver;
 
 
 
 
 void reboot_system(void)
 {
-	RCSR = 0;
-	RSRR = 1;
+	if(reboot_driver == NULL)
+		deprintf("reboot_driver == NULL, can't reboot!\n");
+
+	reboot_driver->reboot();
 }

CVS: blob/src/commands reboot.c,1.1,1.2

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

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

Modified Files:
	reboot.c 
Log Message:
Make a special reboot driver so SA11x0 and PXA can have different reboot
methods. Note that I don't have the PXA manual with me right here, so 
somebody has to fill out a real PXA reboot driver at a later stage.


Index: reboot.c
===================================================================
RCS file: /cvsroot/blob/blob/src/commands/reboot.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- reboot.c	17 Feb 2002 19:54:47 -0000	1.1
+++ reboot.c	4 Jan 2003 02:11:43 -0000	1.2
@@ -28,7 +28,7 @@
 #endif
 
 #include <blob/serial.h>
-#include <blob/util.h>
+#include <blob/reboot.h>
 
 
 

CVS: blob configure.in,1.57,1.58

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

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

Modified Files:
	configure.in 
Log Message:
Make a special reboot driver so SA11x0 and PXA can have different reboot
methods. Note that I don't have the PXA manual with me right here, so 
somebody has to fill out a real PXA reboot driver at a later stage.


Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- configure.in	4 Jan 2003 00:28:45 -0000	1.57
+++ configure.in	4 Jan 2003 02:11:42 -0000	1.58
@@ -328,18 +328,21 @@
 	dnl SA1100 CPU: EDORAM memory setup code
 	BLOB_STARTCODE_OBJS="start-sa11x0.o"
 	BLOB_MEMSETUP_OBJS="memsetup-sa1100.o"
+	BLOB_REBOOT_DRIVER_OBJS="reboot-sa11x0.o"
 	BLOB_SERIAL_DRIVER_OBJS="serial-sa11x0.o"
 	;;
     sa1110)
 	dnl SA1110 CPU: SDRAM memory setup code
 	BLOB_STARTCODE_OBJS="start-sa11x0.o"
 	BLOB_MEMSETUP_OBJS="memsetup-sa1110.o"
+	BLOB_REBOOT_DRIVER_OBJS="reboot-sa11x0.o"
 	BLOB_SERIAL_DRIVER_OBJS="serial-sa11x0.o"
 	;;
     pxa250)
 	dnl PXA250 CPU: SDRAM memory setup code
 	BLOB_STARTCODE_OBJS="start-pxa.o"
 	BLOB_MEMSETUP_OBJS="memsetup-pxa250.o"
+	BLOB_REBOOT_DRIVER_OBJS="reboot-pxa.o"
 	BLOB_SERIAL_DRIVER_OBJS="serial-pxa.o"
 	;;
     *)
@@ -350,6 +353,7 @@
 dnl Define in configuration
 AC_SUBST(BLOB_STARTCODE_OBJS)
 AC_SUBST(BLOB_MEMSETUP_OBJS)
+AC_SUBST(BLOB_REBOOT_DRIVER_OBJS)
 AC_SUBST(BLOB_SERIAL_DRIVER_OBJS)
 
 

CVS: blob/include/blob reboot.h,1.2,1.3 Makefile.am,1.17,1.18 util.h,1.11,1.12

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

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

Modified Files:
	Makefile.am util.h 
Added Files:
	reboot.h 
Log Message:
Make a special reboot driver so SA11x0 and PXA can have different reboot
methods. Note that I don't have the PXA manual with me right here, so 
somebody has to fill out a real PXA reboot driver at a later stage.



Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile.am	17 Feb 2002 19:54:47 -0000	1.17
+++ Makefile.am	4 Jan 2003 02:11:42 -0000	1.18
@@ -39,6 +39,7 @@
 	mini_inflate.h \
 	param_block.h \
 	partition.h \
+	reboot.h \
 	sa1100.h \
 	sa1111.h \
 	serial.h \

Index: util.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/util.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- util.h	17 Feb 2002 20:03:41 -0000	1.11
+++ util.h	4 Jan 2003 02:11:42 -0000	1.12
@@ -56,8 +56,6 @@
 /* convert a string to an u32 value */
 int strtou32(const char *str, u32 *value);
 
-void reboot_system(void);
-
 /* printf and friends */
 int snprintf(char * buf, size_t size, const char *fmt, ...);
 int printf(const char *fmt, ...);

CVS: blob/src/blob Makefile.am,1.34,1.35

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

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

Modified Files:
	Makefile.am 
Log Message:
Add start-pxa.S to the list of EXTRA sources


Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Makefile.am	26 Nov 2002 18:52:53 -0000	1.34
+++ Makefile.am	4 Jan 2003 02:05:53 -0000	1.35
@@ -65,6 +65,7 @@
 EXTRA_blob_start_elf32_SOURCES	= \
 	memsetup-sa1100.S \
 	memsetup-sa1110.S \
+	start-pxa.S \
 	start-sa11x0.S
 
 blob_start_elf32_DEPENDENCIES	= \

CVS: blob README,1.7,1.8

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

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

Modified Files:
	README 
Log Message:
#blob went from OPN to OFTC


Index: README
===================================================================
RCS file: /cvsroot/blob/blob/README,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- README	7 Jan 2002 20:16:49 -0000	1.7
+++ README	4 Jan 2003 00:29:42 -0000	1.8
@@ -44,9 +44,9 @@
 general blob discussion is done on the LART mailing list, see
 http://www.lart.tudelft.nl/list/ for more information.
 
-There is also a blob IRC channel: log on to irc.openprojects.net and
-join #blob. Note that this is a strictly on-topic development IRC
-channel, not a general blob help channel.
+There is also a blob IRC channel: log on to irc.oftc.net and join #blob.
+Note that this is a strictly on-topic development IRC channel, not a
+general blob help channel.
 
 Blob even has a home page: http://www.lart.tudelft.nl/lartware/blob/ .
 

CVS: blob configure.in,1.56,1.57

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

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

Modified Files:
	configure.in 
Log Message:
Some alphabetic reordering.
Make build_all etc. really build for all architectures (makes testing easier).


Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- configure.in	26 Nov 2002 18:52:52 -0000	1.56
+++ configure.in	4 Jan 2003 00:28:45 -0000	1.57
@@ -82,18 +82,19 @@
                             cep          Iskratel CEP
                             creditlart   CreditLART
                             frodo        2d3D, Inc. SA-1110 Development Board
-                            hackkit       The Hack Kit base board
                             h3600        Compaq Ipaq H36x0
+                            hackkit      The Hack Kit base board
                             idr          Vercel UD-1
                             jornada720   HP Jornada 720 with Flash board
                             lart         LART
                             lubbock      Intel HCDDBCTA1 (Lubbock)
+			    miniprint    FGAG Miniprint
                             nesa         NESA
                             pleb         PLEB
+			    pxa_idp	 Accelent PXA-based IDP
                             shannon      TuxScreen (Shannon)
                             system3      Prueftechnik Digital Board
                             trizeps      Keith & Koep Trizeps Board
-			    pxa_idp	 Accelent PXA-based IDP
                           Default board is lart],
 	board_name="$withval",
 	board_name="lart")
@@ -189,6 +190,15 @@
 	use_cpu="sa1110"
 	use_lcd="no"
 	;;
+    hackkit)
+	board_name="The Hack Kit base cpu board"
+	AC_DEFINE(HKIT)
+	BLOB_PLATFORM_OBJS="hackkit.o"
+	BLOB_FLASH_OBJS="intel32.o"
+	DIAG_PLATFORM_OBJS="hackkit.o"
+	use_cpu="sa1110"
+	use_lcd="no"
+	;;
     idr)
 	board_name="Vercel UD-1 (IDR)"
 	AC_DEFINE(IDR)
@@ -255,6 +265,15 @@
 	use_cpu="sa1100"
 	use_lcd="no"
 	;;
+    pxa_idp)
+	board_name="Accelent PXA250 IDP"
+	AC_DEFINE(PXA_IDP)
+	BLOB_PLATFORM_OBJS="pxa_idp.o"
+	BLOB_FLASH_OBJS="intel32.o"
+	DIAG_PLATFORM_OBJS="pxa_idp.o"
+	use_cpu="pxa250"
+	use_lcd="no"
+	;;
     shannon)
 	board_name="TuxScreen (Shannon)"
 	AC_DEFINE(SHANNON)
@@ -281,24 +300,6 @@
 	AC_MSG_WARN([Please check trizeps memory config in arch/trizeps.h])
 	BLOB_FLASH_OBJS="intel16.o"
 	DIAG_PLATFORM_OBJS="trizeps.o"
-	use_cpu="sa1110"
-	use_lcd="no"
-	;;
-    pxa_idp)
-	board_name="Accelent PXA250 IDP"
-	AC_DEFINE(PXA_IDP)
-	BLOB_PLATFORM_OBJS="pxa_idp.o"
-	BLOB_FLASH_OBJS="intel32.o"
-	DIAG_PLATFORM_OBJS="pxa_idp.o"
-	use_cpu="pxa250"
-	use_lcd="no"
-	;;
-    hackkit)
-	board_name="The Hack Kit base cpu board"
-	AC_DEFINE(HKIT)
-	BLOB_PLATFORM_OBJS="hackkit.o"
-	BLOB_FLASH_OBJS="intel32.o"
-	DIAG_PLATFORM_OBJS="hackkit.o"
 	use_cpu="sa1110"
 	use_lcd="no"
 	;;

CVS: blob/utils/build build_Makefile,1.14,1.15 build_all,1.14,1.15

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

Update of /cvsroot/blob/blob/utils/build
In directory sc8-pr-cvs1:/tmp/cvs-serv27863/utils/build

Modified Files:
	build_Makefile build_all 
Log Message:
Some alphabetic reordering.
Make build_all etc. really build for all architectures (makes testing easier).


Index: build_Makefile
===================================================================
RCS file: /cvsroot/blob/blob/utils/build/build_Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- build_Makefile	14 Oct 2002 13:17:34 -0000	1.14
+++ build_Makefile	4 Jan 2003 00:28:46 -0000	1.15
@@ -13,9 +13,9 @@
 #
 
 archs		= \
-	accelent_sa assabet badge4 brutus cep creditlart h3600 idr\
-	jornada720 lart miniprint neponset nesa pleb shannon\
-	system3 frodo trizeps pxa_idp lubbock
+	accelent_sa assabet neponset badge4 brutus cep creditlart frodo \
+	hackkit h3600 idr jornada720 lart lubbock miniprint nesa pleb \
+	pxa_idp shannon system3 trizeps
 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.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- build_all	14 Aug 2002 21:14:48 -0000	1.14
+++ build_all	4 Jan 2003 00:28:46 -0000	1.15
@@ -12,7 +12,7 @@
 # published by the Free Software Foundation.
 #
 
-archs="accelent_sa assabet badge4 brutus creditlart h3600 idr jornada720 lart lubbock miniprint neponset nesa pleb shannon system3 frodo trizeps pxa_idp"
+archs="accelent_sa assabet neponset badge4 brutus cep creditlart frodo hackkit h3600 idr jornada720 lart lubbock miniprint nesa pleb pxa_idp shannon system3 trizeps"
 linux_prefix=~/LART/build/linux/elinux
 blob_src=~/src/sourceforge/blob
 extra_flags="--enable-all-features --with-commands=all"

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

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

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

Modified Files:
	hackkit.c 
Log Message:
- fixed flash settings


Index: hackkit.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/hackkit.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hackkit.c	26 Nov 2002 18:52:53 -0000	1.1
+++ hackkit.c	3 Dec 2002 16:42:52 -0000	1.2
@@ -78,12 +78,12 @@
 #endif
 
 /* flash descriptor for System3 flash. */
-/* System 3 uses 2xINTEL e28F640 Chips */
+/* hackkit uses 2x INTEL 28F128J3A-150 flashes*/
 static const flash_descriptor_t hackkit_flash_descriptors[] =
 {
 	{
 		size: 2 * 128 * 1024,
-		num: 64,
+		num: 128,
 		lockable: 1
 	},
 	{

CVS: blob/src/diag main.c,1.5,1.6

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

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

Modified Files:
	main.c 
Log Message:
- HackKit runs 115k2 baud too


Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/diag/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- main.c	23 Apr 2002 12:36:20 -0000	1.5
+++ main.c	3 Dec 2002 16:41:47 -0000	1.6
@@ -44,7 +44,7 @@
 	/* call subsystems */
 	init_subsystems();
 
-#ifdef H3600
+#if defined(H3600) || defined(HKIT)
 	serial_init(baud_115200); /* DEBUG */
 #endif
 #ifdef TRIZEPS

CVS: blob/src/blob hackkit.c,NONE,1.1 Makefile.am,1.33,1.34

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

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

Modified Files:
	Makefile.am 
Added Files:
	hackkit.c 
Log Message:
- initial port to the Hack Kit core cpu board


--- NEW FILE: hackkit.c ---
/*
 * hackkit.c: PT System3 specific stuff
 *
 * Copyright (C) 2001  Erik Mouw (J.A...@it...)
 * Copyright (C) 2001,2002  Stefan Eletzhofer 
 *                               (ste...@ww...)
 *
 * 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: hackkit.c,v 1.1 2002/11/26 18:52:53 seletz Exp $"

/**********************************************************************
 * includes
 */

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

#include <blob/main.h>
#include <blob/arch.h>
#include <blob/errno.h>
#include <blob/error.h>
#include <blob/util.h>
#include <blob/serial.h>
#include <blob/flash.h>
#include <blob/init.h>
#include <blob/command.h>
#include <blob/uucodec.h>
#include <blob/serial.h>
#include <blob/time.h>
#include <blob/partition.h>

#include <blob/sa1100.h>

/**********************************************************************
 * defines
 */

/* this will send a cold shiver through erik's spine ... */
#define	ERR( x )		{ ret = x; goto DONE; }

/* more readable IMHO */
#define MEM( x )        (*((u32 *)(x)))
#define SET(reg,bit) ((reg) |= (1<<(bit)))
#define RST(reg,bit) ((reg) &= ~(1<<(bit)))

#define HKIT_DEBUG 1

/**********************************************************************
 * globals
 */

extern blob_status_t blob_status;

/**********************************************************************
 * module globals
 */

#if HKIT_DEBUG
static int hkit_dbg = 1;
#else
static int hkit_dbg = 0;
#endif

/* flash descriptor for System3 flash. */
/* System 3 uses 2xINTEL e28F640 Chips */
static const flash_descriptor_t hackkit_flash_descriptors[] =
{
	{
		size: 2 * 128 * 1024,
		num: 64,
		lockable: 1
	},
	{
		/* NULL block */
	},
};


/**********************************************************************
 * static functions
 */
static char module_version[] = "$Id: hackkit.c,v 1.1 2002/11/26 18:52:53 seletz Exp $";

/*********************************************************************
 * init_hackkit_flash - inits system 3 flash driver
 */
static void init_hackkit_flash_driver(void)
{
	flash_descriptors = hackkit_flash_descriptors;
	flash_driver = &intel32_flash_driver;
}
__initlist(init_hackkit_flash_driver, INIT_LEVEL_DRIVER_SELECTION);

/*********************************************************************
 * hackkit_init_hardware - inits system 3 LL hardware stuff
 */
static void hackkit_init_hardware(void)
{
	/* tweak blob config */
	blob_status.boot_delay = -1;
	//blob_status.terminalSpeed = baud_9600;

	/* select serial driver */
	serial_driver = &sa11x0_serial_driver;
}
__initlist(hackkit_init_hardware, INIT_LEVEL_DRIVER_SELECTION);

Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Makefile.am	14 Oct 2002 13:17:30 -0000	1.33
+++ Makefile.am	26 Nov 2002 18:52:53 -0000	1.34
@@ -152,7 +152,7 @@
 	uucodec.c \
 	xmodem.c \
 	accelent_sa.c assabet.c brutus.c badge4.c cep.c clart.c frodo.c \
-	h3600.c idr.c jornada720.c lart.c miniprint.c nesa.c pleb.c \
+	hackkit.c h3600.c idr.c jornada720.c lart.c miniprint.c nesa.c pleb.c \
 	shannon.c system3.c trizeps.c pxa_idp.c
 
 

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

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

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

Modified Files:
	Makefile.am 
Log Message:
- initial port to the Hack Kit core cpu board


Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/diag/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile.am	14 Oct 2002 13:17:32 -0000	1.18
+++ Makefile.am	26 Nov 2002 18:52:53 -0000	1.19
@@ -63,6 +63,7 @@
 	cep.c \
 	clart.c \
 	frodo.c \
+	hackkit.c \
 	h3600.c \
 	idr.c \
 	jornada720.c \

CVS: blob/include/blob/arch hackkit.h,NONE,1.1 Makefile.am,1.11,1.12

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

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

Modified Files:
	Makefile.am 
Added Files:
	hackkit.h 
Log Message:
- initial port to the Hack Kit core cpu board


--- NEW FILE: hackkit.h ---
/*
 * hackkit.h: hw defs for the hack kit.
 *
 * Copyright (C) 2001  Erik Mouw (J.A...@it...)
 * Copyright (C) 2002  Stefan Eletzhofer <ste...@el...>
 *
 * $Id: hackkit.h,v 1.1 2002/11/26 18:52:52 seletz 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: hackkit.h,v 1.1 2002/11/26 18:52:52 seletz Exp $"

#ifndef BLOB_ARCH_HKIT_H
#define BLOB_ARCH_HKIT_H

#define	CPU_SPEED_133
//#undef	CPU_SPEED_133

/* boot CPU speed */
#ifdef CPU_SPEED_133
#	define CPU_SPEED		(CPU_CORE_SPEED_132mhz)
#else
#	define CPU_SPEED		(CPU_CORE_SPEED_206mhz)
#endif

/* serial port */
#define USE_SERIAL1
#define TERMINAL_SPEED baud_115200

#define HKIT_LED_RED	(0x00400000) /* GPIO 22 */
#define HKIT_LED_GRN	(0x00800000) /* GPIO 23 */

/* GPIO for the LED */
#define LED_GPIO		HKIT_LED_GRN


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

#define RAM_START			(0xc1000000)
#define RAM_SIZE			(16*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)

/* let SDRAM run at FULL memclk speed */
#undef MDREFR_MEMCLK_FULLSPEED_0
#undef MDREFR_MEMCLK_FULLSPEED_1
#undef MDREFR_MEMCLK_FULLSPEED_2
#if 0
#define MDREFR_MEMCLK_FULLSPEED_0
#define MDREFR_MEMCLK_FULLSPEED_1
#define MDREFR_MEMCLK_FULLSPEED_2
#endif

/* Memory configuration */
#ifdef BLOB_NEED_MEMCONFIG
#define MSC0_VALUE_66_150	MSC_RT_ROMFLASH | MSC_RBW32 | MSC_RDF(10) | MSC_RDN(2) | MSC_RRR(1)
#define MSC0_VALUE_66_120	MSC_RT_ROMFLASH | MSC_RBW32 | MSC_RDF( 8) | MSC_RDN(2) | MSC_RRR(1)
#define MSC0_VALUE_66_100	MSC_RT_ROMFLASH | MSC_RBW32 | MSC_RDF( 7) | MSC_RDN(2) | MSC_RRR(1)
#define MSC1_VALUE_66		MSC_RT_ROMFLASH | MSC_RBW16 | MSC_RDF(5)  | MSC_RDN(1) | MSC_RRR(1) | ((MSC_RT_VARLAT_345 | MSC_RBW16 | MSC_RDF(30)  | MSC_RDN(30) | MSC_RRR(7))<<16)
#define MSC2_VALUE_66		MSC_RT_VARLAT_345 | MSC_RBW32 | MSC_RDF(13)  | MSC_RDN(6) | MSC_RRR(3)
#define MECR_VALUE_66		MECR_BSIO0(0x1f) | MECR_BSA0(0x1f) | MECR_BSM0(0x1f) | MECR_BSIO1(0x1f) | MECR_BSA1(0x1f) | MECR_BSM1(0x1f)

#define MSC0_VALUE_100_150	MSC_RT_ROMFLASH | MSC_RBW32 | MSC_RDF(16) | MSC_RDN(3) | MSC_RRR(2)
#define MSC0_VALUE_100_120	MSC_RT_ROMFLASH | MSC_RBW32 | MSC_RDF(13) | MSC_RDN(3) | MSC_RRR(2)
#define MSC0_VALUE_100_100	MSC_RT_ROMFLASH | MSC_RBW32 | MSC_RDF(11) | MSC_RDN(3) | MSC_RRR(2)
#define MSC1_VALUE_100		MSC_RT_ROMFLASH | MSC_RBW16 | MSC_RDF(5)  | MSC_RDN(1) | MSC_RRR(1)| ((MSC_RT_VARLAT_345 | MSC_RBW16 | MSC_RDF(30)  | MSC_RDN(30) | MSC_RRR(7))<<16)
#define MSC2_VALUE_100		MSC_RT_VARLAT_345 | MSC_RBW32 | MSC_RDF(13)  | MSC_RDN(6) | MSC_RRR(3)
#define MECR_VALUE_100		MECR_BSIO0(0x1f) | MECR_BSA0(0x1f) | MECR_BSM0(0x1f) | MECR_BSIO1(0x1f) | MECR_BSA1(0x1f) | MECR_BSM1(0x1f)

/* The Hack Kit core cpu board uses:
 *	- SDRAM: 2x Samsung K4S561632C 256Mbit (4Mx16Bitx4banks)
 *	- Flash:
 *		32 bit version: 2x INTEL StrataFlash 28F128J3A
 */

#ifndef CPU_SPEED_133
//	206 Mhz
#define MDCNFG_VALUE	MDCNFG_DTIM0_SDRAM | MDCNFG_DWID0_32B | MDCNFG_DRAC0(6) | MDCNFG_CDB20(0) |\
				MDCNFG_TRP0(2) | MDCNFG_TDL0(3) | MDCNFG_TWR0(2)
#if 0
#define MDCNFG_VALUE	MDCNFG_DTIM0_SDRAM | MDCNFG_DWID0_32B | MDCNFG_DRAC0(6) | MDCNFG_CDB20(0) | MDCNFG_TRP0(2) | MDCNFG_TDL0(3) | MDCNFG_TWR0(1) | \
	MDCNFG_DTIM2_SDRAM | MDCNFG_DWID2_32B | MDCNFG_DRAC2(6) | MDCNFG_CDB22(0) | MDCNFG_TRP2(2) | MDCNFG_TDL2(3) | MDCNFG_TWR2(1)
#endif
#	define MDCAS00_VALUE	0xAAAAAA9F
#	define MDCAS01_VALUE	0xAAAAAAAA
#	define MDCAS02_VALUE	0xAAAAAAAA
#	define MDCAS20_VALUE	0xAAAAAA9F
#	define MDCAS21_VALUE	0xAAAAAAAA
#	define MDCAS22_VALUE	0xAAAAAAAA
#	define MSC0_VALUE	MSC0_VALUE_100_150
#	define MSC1_VALUE	MSC1_VALUE_100
#	define MSC2_VALUE	MSC2_VALUE_100
#	define MECR_VALUE	MECR_VALUE_100
#	define SMCNFG_VALUE	0
#else
/*
133 Mhz
 From the intel calculator:
MDCNFG = 0000000000000000 10 11 0001 0 110 1 1 11 = 0x0000B16F 
 => DRAC=6 TRP=1 TDL=3 TRW=2
SMCNFG = 00000000000000000000000000000000 = 0x00000000 
MDREFR = 0000000001110000 000000000100 0001 = 0x00700041 
 => TRASR=1 DRI=4
MDCAS00 = 01010101010101010101010101010111 = 0x55555557 
MDCAS01 = 01010101010101010101010101010101 = 0x55555555 
MDCAS02 = 01010101010101010101010101010101 = 0x55555555 

MDCNFG = 0000000000000000 10 10 0001 0 110 1 1 11 = 0x0000A16F 
DTIM0=1 DWID0=1 DRAC=6 CDB20=1 TRP=1 TDL=2 TRW=2
SMCNFG = 00000000000000000000000000000000 = 0x00000000 
MDREFR = 0000000001110000000000000100 0001 = 0x00700041 
MDCAS00 = 01010101010101010101010101010111 = 0x55555557 
MDCAS01 = 01010101010101010101010101010101 = 0x55555555 
MDCAS02 = 01010101010101010101010101010101 = 0x55555555 

*/

#	define MDCNFG_VALUE	MDCNFG_DTIM0_SDRAM | MDCNFG_DWID0_32B | MDCNFG_DRAC0(6) | MDCNFG_CDB20(0) |\
				MDCNFG_TRP0(1) | MDCNFG_TDL0(2) | MDCNFG_TWR0(2)
#	define MDCAS00_VALUE	0x55555557
#	define MDCAS01_VALUE	0x55555555
#	define MDCAS02_VALUE	0x55555555
#	define MDCAS20_VALUE	0xAAAAAA9F
#	define MDCAS21_VALUE	0xAAAAAAAA
#	define MDCAS22_VALUE	0xAAAAAAAA
#	define MSC0_VALUE	MSC0_VALUE_66_150
#	define MSC1_VALUE	0
#	define MSC2_VALUE	0
#	define MECR_VALUE	0
#	define SMCNFG_VALUE	0
#endif
#endif

#endif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile.am	14 Oct 2002 13:17:29 -0000	1.11
+++ Makefile.am	26 Nov 2002 18:52:52 -0000	1.12
@@ -18,6 +18,7 @@
 	cep.h \
 	clart.h \
 	frodo.h	\
+	hackkit.h \
 	h3600.h \
 	idr.h \
 	jornada720.h \

CVS: blob/include/blob arch.h,1.11,1.12 linux.h,1.11,1.12

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

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

Modified Files:
	arch.h linux.h 
Log Message:
- initial port to the Hack Kit core cpu board


Index: arch.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- arch.h	14 Oct 2002 13:17:28 -0000	1.11
+++ arch.h	26 Nov 2002 18:52:52 -0000	1.12
@@ -48,6 +48,8 @@
 # include <blob/arch/clart.h>
 #elif defined FRODO
 # include <blob/arch/frodo.h>
+#elif defined HKIT
+# include <blob/arch/hackkit.h>
 #elif defined H3600
 # include <blob/arch/h3600.h>
 #elif defined IDR

Index: linux.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/linux.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- linux.h	14 Oct 2002 13:17:29 -0000	1.11
+++ linux.h	26 Nov 2002 18:52:52 -0000	1.12
@@ -48,6 +48,8 @@
 # define ARCH_NUMBER (151)
 #elif defined CLART
 # define ARCH_NUMBER (68)
+#elif defined HKIT 
+# define ARCH_NUMBER (254)
 #elif defined H3600
 # define ARCH_NUMBER (22)
 #elif defined IDR

CVS: blob acconfig.h,1.22,1.23 configure.in,1.55,1.56

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

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

Modified Files:
	acconfig.h configure.in 
Log Message:
- initial port to the Hack Kit core cpu board


Index: acconfig.h
===================================================================
RCS file: /cvsroot/blob/blob/acconfig.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- acconfig.h	14 Oct 2002 13:17:26 -0000	1.22
+++ acconfig.h	26 Nov 2002 18:52:52 -0000	1.23
@@ -86,6 +86,9 @@
 /* Define for Ipaq H3600 */
 #undef H3600
 
+/* Define for The Hack Kit base CPU board*/
+#undef HKIT
+
 /* Define for Vercel UD-1 (IDR) */
 #undef IDR
 

Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- configure.in	14 Oct 2002 13:17:27 -0000	1.55
+++ configure.in	26 Nov 2002 18:52:52 -0000	1.56
@@ -82,6 +82,7 @@
                             cep          Iskratel CEP
                             creditlart   CreditLART
                             frodo        2d3D, Inc. SA-1110 Development Board
+                            hackkit       The Hack Kit base board
                             h3600        Compaq Ipaq H36x0
                             idr          Vercel UD-1
                             jornada720   HP Jornada 720 with Flash board
@@ -290,6 +291,15 @@
 	BLOB_FLASH_OBJS="intel32.o"
 	DIAG_PLATFORM_OBJS="pxa_idp.o"
 	use_cpu="pxa250"
+	use_lcd="no"
+	;;
+    hackkit)
+	board_name="The Hack Kit base cpu board"
+	AC_DEFINE(HKIT)
+	BLOB_PLATFORM_OBJS="hackkit.o"
+	BLOB_FLASH_OBJS="intel32.o"
+	DIAG_PLATFORM_OBJS="hackkit.o"
+	use_cpu="sa1110"
 	use_lcd="no"
 	;;
     *)

CVS: blob/src/lib led.c,1.6,1.7

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

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

Modified Files:
	led.c 
Log Message:
- re-enable LEDs


Index: led.c
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/led.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- led.c	14 Aug 2002 21:13:45 -0000	1.6
+++ led.c	26 Nov 2002 18:43:43 -0000	1.7
@@ -41,6 +41,7 @@
 #endif
 
 #include <blob/arch.h>
+#include <blob/sa1100.h>
 #include <blob/led.h>
 #include <blob/init.h>
 
@@ -66,7 +67,7 @@
 	if(led_locked)
 		return;
 
-	/* GPSR = LED_GPIO; */
+	GPSR = LED_GPIO;
 	led_state = 1;
 }
 
@@ -78,7 +79,7 @@
 	if(led_locked)
 		return;
 
-	/* GPCR = LED_GPIO; */
+	GPCR = LED_GPIO;
 	led_state = 0;
 }
 

CVS: blob/src/diag hackkit.c,NONE,1.1

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

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

Added Files:
	hackkit.c 
Log Message:
- hackkit's diag part


--- NEW FILE: hackkit.c ---
/*
 * hackkit.c: PT System3 specific stuff
 *
 * Copyright (C) 2001  Erik Mouw (J.A...@it...)
 * Copyright (C) 2001,2002  Stefan Eletzhofer 
 *                               (ste...@ww...)
 *
 * 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: hackkit.c,v 1.1 2002/11/26 18:18:23 seletz Exp $"

/**********************************************************************
 * includes
 */

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

#include <blob/main.h>
#include <blob/arch.h>
#include <blob/serial.h>
#include <blob/init.h>
#include <blob/sa1100.h>

/**********************************************************************
 * defines
 */

/* this will send a cold shiver through erik's spine ... */
#define	ERR( x )		{ ret = x; goto DONE; }

/* more readable IMHO */
#define MEM( x )        (*((u32 *)(x)))
#define SET(reg,bit) ((reg) |= (1<<(bit)))
#define RST(reg,bit) ((reg) &= ~(1<<(bit)))

#define HKIT_DEBUG 1

/**********************************************************************
 * globals
 */

/**********************************************************************
 * module globals
 */
static char module_version[] = "$Id: hackkit.c,v 1.1 2002/11/26 18:18:23 seletz Exp $";

#if HKIT_DEBUG
static int hkit_dbg = 1;
#else
static int hkit_dbg = 0;
#endif

/**********************************************************************
 * static functions
 */

/*********************************************************************
 * hackkit_init_hardware - inits system 3 LL hardware stuff
 */
static void hackkit_init_hardware(void)
{
	/* select serial driver */
	serial_driver = &sa11x0_serial_driver;
}
__initlist(hackkit_init_hardware, INIT_LEVEL_DRIVER_SELECTION);

Re: custom board

[Holger S. <h.s...@mn...>]

> i´m new to the bootloader staff and i want to use blob for my system. It
> is based an the Accelent IDP for PXA. What have i to do to port blob to
> a custom board?

Hi !

I also have an Accelent Board.

First you need a cross-compiler.

Then you need to read README files.

Next you will need time and practice.

A JTAG debugger like the BDI 2000 would be very helpful.


Now you see in src/blob/ that there is already a pxa_idp.c file. Jeff started 
a port, but discontinued it because lack of time. Therefore you can see such 
gems like in start-pxa.S:

        @ loop here infinitely until I can get this to compile and boot
        @ TODO: get this to compile and boot.
crap:
        b crap



The biggest piece of incomplete part is src/blob/memsetup-pxa250.S. As you can 
see, there are lots of values that get stored into PXA internal registers. 
You have to get them all rigth. Maybe you can get those values from my 
memsetup.S (part of armboot-for-Accelent PXA IDP) and store them in 
include/blob/arch/pxa_idp.h from 
http://www.mn-logistik.de/unsupported/pxa250/


Please note: when I once tried quickly to get blob running, arm-linux-objdump 
-D src/blob/blob-start revealed that some X!%MFP stuff it did use virtual 
addresses (the ones from Linux) for the PXA internal registers. This is of 
course total crap (but might be an issue of the used kernel, I tried it with 
Linux 2.4.19-rmkX-pxaY). You always need to access stuff at physical 
addresses (blob run's without the MMU enabled). Please take care of that.

Greetings, Holger

-- 
MN-Logistik GmbH         http://www.mn-logistik.de
Holger Schurig
Dieselstr. 18
61191 Rosbach v.d.Höhe
Tel: 06003/9141-0        Fax: 06003/9141-49

custom board

[S. <sti...@gm...>]

Hello,

i´m new to the bootloader staff and i want to use blob for my system. It 
is based an the Accelent IDP for PXA. What have i to do to port blob to 
a custom board?

Andre

CVS: blob/src/blob chkmem.c,1.9,1.10

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

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

Modified Files:
	chkmem.c 
Log Message:
squelch __FUNCTION__ pasting warnings

Index: chkmem.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/chkmem.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- chkmem.c	2 Oct 2002 12:02:56 -0000	1.9
+++ chkmem.c	28 Oct 2002 21:32:49 -0000	1.10
@@ -63,16 +63,25 @@
 #define CHKMEM_OK		(0)
 
 #if CHKMEM_DEBUG
-#	define SHOWFUNC()		SerialOutputString("chkmem: method: "__FUNCTION__ "\n" ); \
-							SerialOutputString("	p1=0x"); \
-							SerialOutputHex((u32)bp1); \
-							SerialOutputString(" p2=0x"); \
-							SerialOutputHex((u32)bp2); \
-							SerialOutputString(" count=0x"); \
-							SerialOutputHex((u32)count); \
-							SerialOutputString("\n");
+#  define SHOWFUNC() \
+	do { \
+		SerialOutputString("chkmem: method: "); \
+		SerialOutputString(__FUNCTION__); \
+		SerialOutputString("\n	p1=0x"); \
+		SerialOutputHex((u32)bp1); \
+		SerialOutputString(" p2=0x"); \
+		SerialOutputHex((u32)bp2); \
+		SerialOutputString(" count=0x"); \
+		SerialOutputHex((u32)count); \
+		SerialOutputString("\n"); \
+	} while (0)
 #else
-#	define SHOWFUNC()		SerialOutputString("chkmem: method: "__FUNCTION__ "\n" );
+#  define SHOWFUNC() \
+	do { \
+		SerialOutputString("chkmem: method: "); \
+		SerialOutputString(__FUNCTION__); \
+		SerialOutputString("\n" ); \
+	} while (0)
 #endif
 
 #define SKIPBLOBMEM(x) if ((x) < BLOB_RAM_BASE + 0x00100000) x = BLOB_RAM_BASE + 0x00100000

CVS: blob/include/blob/arch frodo.h,1.10,1.11

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

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

Modified Files:
	frodo.h 
Log Message:
Fix obvious MDRFER typo (should be MDREFR)
Submitted by Marcel Telka (te...@us...)


Index: frodo.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/frodo.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- frodo.h	9 Apr 2002 12:35:57 -0000	1.10
+++ frodo.h	25 Oct 2002 17:24:14 -0000	1.11
@@ -72,9 +72,9 @@
 #define SMCNFG_VALUE	0x00000000
 #define MDCNFG_VALUE	0x0000a265
 
-#ifdef MDRFER_DONT_BELIEVE_IN_MAGIC
+#ifdef MDREFR_DONT_BELIEVE_IN_MAGIC
 #define MDREFR_VALUE	0x00700061
-#endif	/* #ifdef MDRFER_DONT_BELIEVE_IN_MAGIC */
+#endif	/* #ifdef MDREFR_DONT_BELIEVE_IN_MAGIC */
 
 #define MDCAS00_VALUE	0x5555557f
 #define MDCAS01_VALUE	0x55555555

CVS: blob/src/blob memsetup-sa1110.S,1.15,1.16

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

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

Modified Files:
	memsetup-sa1110.S 
Log Message:
Fix obvious MDRFER typo (should be MDREFR)
Submitted by Marcel Telka (te...@us...)


Index: memsetup-sa1110.S
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/memsetup-sa1110.S,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- memsetup-sa1110.S	2 Oct 2002 11:25:08 -0000	1.15
+++ memsetup-sa1110.S	25 Oct 2002 17:24:14 -0000	1.16
@@ -92,7 +92,7 @@
 	.long	MSC0_VALUE		/* 0x10 MSC0 */
 	.long	MSC1_VALUE		/* 0x14 MSC1 */
 	.long	MECR_VALUE		/* 0x18 MECR */
-#ifdef MDRFER_DONT_BELIEVE_IN_MAGIC
+#ifdef MDREFR_DONT_BELIEVE_IN_MAGIC
 	.long	MDREFR_VALUE
 #else
 	.long	0xdeadbeef		/* 0x1C MDREFR */

CVS: blob/src/blob cep.c,NONE,1.1 Makefile.am,1.32,1.33

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

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

Modified Files:
	Makefile.am 
Added Files:
	cep.c 
Log Message:
- integrated CEP patch sent by "Matej Sekoranja" <mat...@co...>


--- NEW FILE: cep.c ---
/*
 * cep.c: Cep specific stuff
 *
 * Copyright (C) 2001  Erik Mouw (J.A...@it...)
 *
 * 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: cep.c,v 1.1 2002/10/14 13:17:31 seletz 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 Cep flash */
/* 2x Intel 28F128J3A strataflash (16MB) */
static const flash_descriptor_t cep_flash_descriptors[] =
{
	{
		size: 2 * 128 * 1024,
		num: 64,
		lockable: 1
	},
	{
		/* NULL block */
	},
};




static void init_cep_flash_driver(void)
{
	flash_descriptors = cep_flash_descriptors;
	flash_driver = &intel32_flash_driver;
}

__initlist(init_cep_flash_driver, INIT_LEVEL_DRIVER_SELECTION);




#define RS232_ENABLE		0x00001000
#define GREEN_LED_ENABLE	0x00004000

static void cep_init_hardware(void)
{
	u32 *bcr = (u32 *)0x12000000;
	
	/* enable RS232 tranceiver */
	*bcr = RS232_ENABLE;

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

        /* switch on the LED D3 */
        *((volatile u8*)(0x40000004))= 0x02;
	
}


__initlist(cep_init_hardware, INIT_LEVEL_DRIVER_SELECTION);

Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Makefile.am	14 Aug 2002 21:04:23 -0000	1.32
+++ Makefile.am	14 Oct 2002 13:17:30 -0000	1.33
@@ -151,7 +151,7 @@
 	compr_rtime.c compr_rubin.c jffs2.c \
 	uucodec.c \
 	xmodem.c \
-	accelent_sa.c assabet.c brutus.c badge4.c clart.c frodo.c \
+	accelent_sa.c assabet.c brutus.c badge4.c cep.c clart.c frodo.c \
 	h3600.c idr.c jornada720.c lart.c miniprint.c nesa.c pleb.c \
 	shannon.c system3.c trizeps.c pxa_idp.c