patch-2.4.0-test5 linux/include/asm-arm/arch-sa1100/uncompress.h

• Lines: 29
• Date: Tue Jul 18 22:43:25 2000
• Orig file: v2.4.0-test4/linux/include/asm-arm/arch-sa1100/uncompress.h
• Orig date: Fri Jun 23 21:55:11 2000

diff -u --recursive --new-file v2.4.0-test4/linux/include/asm-arm/arch-sa1100/uncompress.h linux/include/asm-arm/arch-sa1100/uncompress.h
@@ -9,6 +9,13 @@
 #include "hardware.h"
 #include "serial_reg.h"
 
+/* Assabet's Status Control "Register" */
+unsigned long SCR_value;
+
+/* sa1100_setup() will perform any special initialization for UART, etc. */
+extern void sa1100_setup( int arch_id );
+#define arch_decomp_setup()	sa1100_setup(arch_id)
+
 /*
  * The following code assumes the serial port has already been
  * initialized by the bootloader or such...
@@ -18,7 +25,7 @@
 	volatile unsigned long *serial_port;
 
 	if (machine_is_assabet()) {
-		if (0/*SA1111 connected*/)
+		if( machine_has_neponset() )
 			serial_port = (unsigned long *)_Ser3UTCR0;
 		else
 			serial_port = (unsigned long *)_Ser1UTCR0;
@@ -48,5 +55,4 @@
 /*
  * Nothing to do for these
  */
-#define arch_decomp_setup()
 #define arch_decomp_wdog()