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;
 }