Merge with 2.3.99-pre6.

1 files changed, 267 insertions, 229 deletions

diff --git a/arch/arm/kernel/arch.c b/arch/arm/kernel/arch.c
index e9cca7748..717ba4ca9 100644
--- a/arch/arm/kernel/arch.c
+++ b/arch/arm/kernel/arch.c
@@ -1,45 +1,39 @@
 /*
  * linux/arch/arm/kernel/arch.c
  *
- * Architecture specifics
+ * Architecture specific fixups.  This is where any
+ * parameters in the params struct are fixed up, or
+ * any additional architecture specific information
+ * is pulled from the params struct.
  */
 #include <linux/config.h>
 #include <linux/tty.h>
 #include <linux/init.h>
 
+#include <asm/dec21285.h>
 #include <asm/elf.h>
 #include <asm/setup.h>
 #include <asm/system.h>
 
 #include "arch.h"
 
-extern unsigned int system_rev;
-extern unsigned int system_serial_low;
-extern unsigned int system_serial_high;
-
 unsigned int vram_size;
-#ifdef CONFIG_ARCH_ACORN
-unsigned int memc_ctrl_reg;
-unsigned int number_mfm_drives;
-#endif
 
 extern void setup_initrd(unsigned int start, unsigned int size);
 extern void setup_ramdisk(int doload, int prompt, int start, unsigned int rd_sz);
 
-/*
- * Architecture specific fixups.  This is where any
- * parameters in the params struct are fixed up, or
- * any additional architecture specific information
- * is pulled from the params struct.
- */
+#ifdef CONFIG_ARCH_ACORN
+
+unsigned int memc_ctrl_reg;
+unsigned int number_mfm_drives;
+
 static void __init
 fixup_acorn(struct machine_desc *desc, struct param_struct *params,
 	    char **cmdline, struct meminfo *mi)
 {
-#ifdef CONFIG_ARCH_ACORN
-	int i;
-
 	if (machine_is_riscpc()) {
+		int i;
+
 		/*
 		 * RiscPC can't handle half-word loads and stores
 		 */
@@ -69,9 +63,36 @@ fixup_acorn(struct machine_desc *desc, struct param_struct *params,
 	}
 	memc_ctrl_reg	  = params->u1.s.memc_control_reg;
 	number_mfm_drives = (params->u1.s.adfsdrives >> 3) & 3;
-#endif
 }
 
+#ifdef CONFIG_ARCH_RPC
+MACHINE_START(RISCPC, "Acorn-RiscPC")
+	MAINTAINER("Russell King")
+	BOOT_MEM(0x10000000, 0x03000000, 0xe0000000)
+	BOOT_PARAMS(0x10000100)
+	DISABLE_PARPORT(0)
+	DISABLE_PARPORT(1)
+	FIXUP(fixup_acorn)
+MACHINE_END
+#endif
+#ifdef CONFIG_ARCH_ARC
+MACHINE_START(ARCHIMEDES, "Acorn-Archimedes")
+	MAINTAINER("Dave Gilbert")
+	BOOT_PARAMS(0x0207c000)
+	FIXUP(fixup_acorn)
+MACHINE_END
+#endif
+#ifdef CONFIG_ARCH_A5K
+MACHINE_START(A5K, "Acorn-A5000")
+	MAINTAINER("Russell King")
+	BOOT_PARAMS(0x0207c000)
+	FIXUP(fixup_acorn)
+MACHINE_END
+#endif
+#endif
+
+#ifdef CONFIG_ARCH_EBSA285
+
 static void __init
 fixup_ebsa285(struct machine_desc *desc, struct param_struct *params,
 	      char **cmdline, struct meminfo *mi)
@@ -82,6 +103,16 @@ fixup_ebsa285(struct machine_desc *desc, struct param_struct *params,
 	ORIG_VIDEO_LINES = params->u1.s.video_num_rows;
 }
 
+MACHINE_START(EBSA285, "EBSA285")
+	MAINTAINER("Russell King")
+	BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
+	BOOT_PARAMS(0x00000100)
+	VIDEO(0x000a0000, 0x000bffff)
+	FIXUP(fixup_ebsa285)
+MACHINE_END
+#endif
+
+#ifdef CONFIG_ARCH_NETWINDER
 /*
  * Older NeTTroms either do not provide a parameters
  * page, or they don't supply correct information in
@@ -105,6 +136,18 @@ fixup_netwinder(struct machine_desc *desc, struct param_struct *params,
 	}
 }
 
+MACHINE_START(NETWINDER, "Rebel-NetWinder")
+	MAINTAINER("Russell King/Rebel.com")
+	BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
+	BOOT_PARAMS(0x00000100)
+	VIDEO(0x000a0000, 0x000bffff)
+	DISABLE_PARPORT(0)
+	DISABLE_PARPORT(2)
+	FIXUP(fixup_netwinder)
+MACHINE_END
+#endif
+
+#ifdef CONFIG_ARCH_CATS
 /*
  * CATS uses soft-reboot by default, since
  * hard reboots fail on early boards.
@@ -118,11 +161,20 @@ fixup_cats(struct machine_desc *desc, struct param_struct *params,
 	ORIG_Y = 24;
 }
 
+MACHINE_START(CATS, "Chalice-CATS")
+	MAINTAINER("Philip Blundell")
+	BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
+	SOFT_REBOOT
+	FIXUP(fixup_cats)
+MACHINE_END
+#endif
+
+#ifdef CONFIG_ARCH_CO285
+
 static void __init
 fixup_coebsa285(struct machine_desc *desc, struct param_struct *params,
 		char **cmdline, struct meminfo *mi)
 {
-#if 0
 	extern unsigned long boot_memory_end;
 	extern char boot_command_line[];
 
@@ -131,242 +183,228 @@ fixup_coebsa285(struct machine_desc *desc, struct param_struct *params,
 	mi->bank[0].size  = boot_memory_end;
 
 	*cmdline = boot_command_line;
-#endif
 }
 
+MACHINE_START(CO285, "co-EBSA285")
+	MAINTAINER("Mark van Doesburg")
+	BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0x7cf00000)
+	FIXUP(fixup_coebsa285)
+MACHINE_END
+#endif
+
+#ifdef CONFIG_ARCH_SA1100
+
+extern void select_sa1100_io_desc(void);
+#define SET_BANK(__nr,__start,__size) \
+	mi->bank[__nr].start = (__start), \
+	mi->bank[__nr].size = (__size)
 static void __init
 fixup_sa1100(struct machine_desc *desc, struct param_struct *params,
 	     char **cmdline, struct meminfo *mi)
 {
-#ifdef CONFIG_ARCH_SA1100
-	int i;
-	extern struct mem_desc {
-		unsigned long phys_start;
-		unsigned long length;
-	} mem_desc[];
-	extern unsigned int mem_desc_size;
-
-	for( i = 0; i < mem_desc_size; i++ ) {
-		if( i >= NR_BANKS ) {
-			printk( __FUNCTION__ 
-				": mem_desc too large for meminfo structure\n");
-			break;
-		}
-		mi->bank[i].start = mem_desc[i].phys_start;
-		mi->bank[i].size = mem_desc[i].length;
+	select_sa1100_io_desc();
+
+	if (machine_is_assabet()) {
+		SET_BANK( 0, 0xc0000000, 32*1024*1024 );
+		mi->nr_banks = 1;
+
+		ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+		setup_ramdisk( 1, 0, 0, 8192 );
+		setup_initrd( 0xc0800000, 3*1024*1024 );
 	}
-	mi->nr_banks = i;
-
-#if defined(CONFIG_SA1100_BRUTUS)
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
-	setup_ramdisk( 1, 0, 0, 8192 );
-	setup_initrd( __phys_to_virt(0xd8000000), 3*1024*1024 );
-#elif defined(CONFIG_SA1100_EMPEG)
-	ROOT_DEV = MKDEV( 3, 1 );  /* /dev/hda1 */
-	setup_ramdisk( 1, 0, 0, 4096 );
-	setup_initrd( 0xd0000000+((1024-320)*1024), (320*1024) );
-#elif defined(CONFIG_SA1100_THINCLIENT)
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
-	setup_ramdisk( 1, 0, 0, 8192 );
-	setup_initrd( __phys_to_virt(0xc0800000), 4*1024*1024 );
-#elif defined(CONFIG_SA1100_TIFON)
-	ROOT_DEV = MKDEV(UNNAMED_MAJOR, 0);
-	setup_ramdisk(1, 0, 0, 4096);
-	setup_initrd( 0xd0000000 + 0x1100004, 0x140000 );
-#elif defined(CONFIG_SA1100_VICTOR)
-	ROOT_DEV = MKDEV( 60, 2 );
-
-	/* Get command line parameters passed from the loader (if any) */
-	if( *((char*)0xc0000000) )
-		strcpy( default_command_line, ((char *)0xc0000000) );
-
-	/* power off if any problem */
-	strcat( default_command_line, " panic=1" );
-#elif defined(CONFIG_SA1100_LART)
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
-	setup_ramdisk(1, 0, 0, 8192);
-	setup_initrd(0xc0400000, 0x00400000);
-#endif
-#endif
-}
 
-#define NO_PARAMS	0
-#define NO_VIDEO	0, 0
+	else if (machine_is_brutus()) {
+		SET_BANK( 0, 0xc0000000, 4*1024*1024 );
+		SET_BANK( 1, 0xc8000000, 4*1024*1024 );
+		SET_BANK( 2, 0xd0000000, 4*1024*1024 );
+		SET_BANK( 3, 0xd8000000, 4*1024*1024 );
+		mi->nr_banks = 4;
 
-/*
- * This is the list of all architectures supported by
- * this kernel.  This should be integrated with the list
- * in head-armv.S.
- */
-static struct machine_desc machine_desc[] __attribute__ ((__section__ (".arch.info"))) = {
-#ifdef CONFIG_ARCH_EBSA110
-	{
-		MACH_TYPE_EBSA110,
-		"EBSA110",	/* RMK			*/
-		0x00000400,
-		NO_VIDEO,
-		1, 0, 1, 0, 1,
-		NULL
-	},
+		ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+		setup_ramdisk( 1, 0, 0, 8192 );
+		setup_initrd( __phys_to_virt(0xd8000000), 3*1024*1024 );
+	}
+
+	else if (machine_is_empeg()) {
+		SET_BANK( 0, 0xc0000000, 4*1024*1024 );
+		SET_BANK( 1, 0xc8000000, 4*1024*1024 );
+		mi->nr_banks = 2;
+
+		ROOT_DEV = MKDEV( 3, 1 );  /* /dev/hda1 */
+		setup_ramdisk( 1, 0, 0, 4096 );
+		setup_initrd( 0xd0000000+((1024-320)*1024), (320*1024) );
+	}
+
+	else if (machine_is_lart()) {
+		/*
+		 * Note that LART is a special case - it doesn't use physical
+		 * address line A23 on the DRAM, so we effectively have 4 * 8MB
+		 * in two SA1100 banks.
+		 */
+		SET_BANK( 0, 0xc0000000, 8*1024*1024 );
+		SET_BANK( 1, 0xc1000000, 8*1024*1024 );
+		SET_BANK( 2, 0xc8000000, 8*1024*1024 );
+		SET_BANK( 3, 0xc9000000, 8*1024*1024 );
+		mi->nr_banks = 4;
+
+		ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+		setup_ramdisk(1, 0, 0, 8192);
+		setup_initrd(0xc0400000, 4*1024*1024);
+	}
+
+	else if (machine_is_thinclient()) {
+		SET_BANK( 0, 0xc0000000, 16*1024*1024 );
+		mi->nr_banks = 1;
+
+		ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+		setup_ramdisk( 1, 0, 0, 8192 );
+		setup_initrd( __phys_to_virt(0xc0800000), 4*1024*1024 );
+	}
+
+	else if (machine_is_tifon()) {
+		SET_BANK( 0, 0xc0000000, 16*1024*1024 );
+		SET_BANK( 1, 0xc8000000, 16*1024*1024 );
+		mi->nr_banks = 2;
+
+		ROOT_DEV = MKDEV(UNNAMED_MAJOR, 0);
+		setup_ramdisk(1, 0, 0, 4096);
+		setup_initrd( 0xd0000000 + 0x1100004, 0x140000 );
+	}
+
+	else if (machine_is_victor()) {
+		SET_BANK( 0, 0xc0000000, 4*1024*1024 );
+		mi->nr_banks = 1;
+
+		ROOT_DEV = MKDEV( 60, 2 );
+
+		/* Get command line parameters passed from the loader (if any) */
+		if( *((char*)0xc0000000) )
+			strcpy( *cmdline, ((char *)0xc0000000) );
+
+		/* power off if any problem */
+		strcat( *cmdline, " panic=1" );
+	}
+
+}
+
+#ifdef CONFIG_SA1100_ASSABET
+MACHINE_START(ASSABET, "Intel-Assabet")
+	BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+	FIXUP(fixup_sa1100)
+MACHINE_END
 #endif
-#ifdef CONFIG_ARCH_RPC
-	{
-		MACH_TYPE_RISCPC,
-		"Acorn-RiscPC",	/* RMK			*/
-		0x10000100,
-		NO_VIDEO,
-		1, 1, 0, 0, 0,
-		fixup_acorn
-	},
+#ifdef CONFIG_SA1100_BITSY
+MACHINE_START(BITSY, "Compaq Bitsy")
+	BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+	BOOT_PARAMS(0xc0000100)
+	FIXUP(fixup_sa1100)
+MACHINE_END
 #endif
-#ifdef CONFIG_ARCH_NEXUSPCI
-	{
-		MACH_TYPE_NEXUSPCI,
-		"FTV/PCI",	/* Philip Blundell	*/
-		NO_PARAMS,
-		NO_VIDEO,
-		0, 0, 0, 0, 0,
-		NULL
-	},
+#ifdef CONFIG_SA1100_BRUTUS
+MACHINE_START(BRUTUS, "Intel Brutus (SA1100 eval board)")
+	BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+	FIXUP(fixup_sa1100)
+MACHINE_END
 #endif
-#ifdef CONFIG_ARCH_EBSA285
-	{
-		MACH_TYPE_EBSA285,
-		"EBSA285",		/* RMK			*/
-		0x00000100,
-		0x000a0000, 0x000bffff,
-		0, 0, 0, 0, 0,
-		fixup_ebsa285
-	},
+#ifdef CONFIG_SA1100_EMPEG
+MACHINE_START(EMPEG, "empeg MP3 Car Audio Player")
+	BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+	FIXUP(fixup_sa1100)
+MACHINE_END
 #endif
-#ifdef CONFIG_ARCH_NETWINDER
-	{
-		MACH_TYPE_NETWINDER,
-		"Rebel-NetWinder",	/* RMK			*/
-		0x00000100,
-		0x000a0000, 0x000bffff,
-		1, 0, 1, 0, 0,
-		fixup_netwinder
-	},
+#ifdef CONFIG_SA1100_ITSY
+MACHINE_START(ITSY, "Compaq Itsy")
+	BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+	BOOT_PARAMS(0xc0000100
+	FIXUP(fixup_sa1100)
+MACHINE_END
 #endif
-#ifdef CONFIG_ARCH_CATS
-	{
-		MACH_TYPE_CATS,
-		"Chalice-CATS",	/* Philip Blundell	*/
-		NO_PARAMS,
-		0x000a0000, 0x000bffff,
-		0, 0, 0, 0, 1,
-		fixup_cats
-	},
+#ifdef CONFIG_SA1100_LART
+MACHINE_START(LART, "LART")
+	BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+	FIXUP(fixup_sa1100)
+MACHINE_END
 #endif
-#ifdef CONFIG_ARCH_TBOX
-	{
-		MACH_TYPE_TBOX,
-		"unknown-TBOX",	/* Philip Blundell	*/
-		NO_PARAMS,
-		NO_VIDEO,
-		0, 0, 0, 0, 0,
-		NULL
-	},
+#ifdef CONFIG_SA1100_PLEB
+MACHINE_START(PLEB, "PLEB")
+	BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+	FIXUP(fixup_sa1100)
+MACHINE_END
 #endif
-#ifdef CONFIG_ARCH_CO285
-	{
-		MACH_TYPE_CO285,
-		"co-EBSA285",	/* Mark van Doesburg	*/
-		NO_PARAMS,
-		NO_VIDEO,
-		0, 0, 0, 0, 0,
-		fixup_coebsa285
-	},
+#ifdef CONFIG_SA1100_THINCLIENT
+MACHINE_START(THINCLIENT, "ADS ThinClient")
+	BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+	FIXUP(fixup_sa1100)
+MACHINE_END
 #endif
-#ifdef CONFIG_ARCH_CLPS7110
-	{
-		MACH_TYPE_CLPS7110,
-		"CL-PS7110",	/* Werner Almesberger	*/
-		NO_PARAMS,
-		NO_VIDEO,
-		0, 0, 0, 0, 0,
-		NULL
-	},
+#ifdef CONFIG_SA1100_TIFON
+MACHINE_START(TIFON, "Tifon")
+	BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+	FIXUP(fixup_sa1100)
+MACHINE_END
 #endif
-#ifdef CONFIG_ARCH_ARC
-	{
-		MACH_TYPE_ARCHIMEDES,
-		"Acorn-Archimedes",/* RMK/DAG		*/
-		0x0207c000,
-		NO_VIDEO,
-		0, 0, 0, 0, 0,
-		fixup_acorn
-	},
+#ifdef CONFIG_SA1100_VICTOR
+MACHINE_START(VICTOR, "VisuAide Victor")
+	BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+	FIXUP(fixup_sa1100)
+MACHINE_END
 #endif
-#ifdef CONFIG_ARCH_A5K
-	{
-		MACH_TYPE_A5K,
-		"Acorn-A5000",	/* RMK/PB		*/
-		0x0207c000,
-		NO_VIDEO,
-		0, 0, 0, 0, 0,
-		fixup_acorn
-	},
+#endif
+
+#ifdef CONFIG_ARCH_EBSA110
+MACHINE_START(EBSA110, "EBSA110")
+	MAINTAINER("Russell King")
+	BOOT_MEM(0x00000000, 0xe0000000, 0xe0000000)
+	BOOT_PARAMS(0x00000400)
+	DISABLE_PARPORT(0)
+	DISABLE_PARPORT(2)
+	SOFT_REBOOT
+MACHINE_END
+#endif
+#ifdef CONFIG_ARCH_NEXUSPCI
+MACHINE_START(NEXUSPCI, "FTV/PCI")
+	MAINTAINER("Philip Blundell")
+	BOOT_MEM(0x40000000, 0x10000000, 0xe0000000)
+MACHINE_END
+#endif
+#ifdef CONFIG_ARCH_TBOX
+MACHINE_START(TBOX, "unknown-TBOX")
+	MAINTAINER("Philip Blundell")
+	BOOT_MEM(0x80000000, 0x00400000, 0xe0000000)
+MACHINE_END
+#endif
+#ifdef CONFIG_ARCH_CLPS7110
+MACHINE_START(CLPS7110, "CL-PS7110")
+	MAINTAINER("Werner Almesberger")
+MACHINE_END
 #endif
 #ifdef CONFIG_ARCH_ETOILE
-	{
-		MACH_TYPE_ETOILE,
-		"Etoile",		/* Alex de Vries	*/
-		NO_PARAMS,
-		NO_VIDEO,
-		0, 0, 0, 0, 0,
-		NULL
-	},
+MACHINE_START(ETOILE, "Etoile")
+	MAINTAINER("Alex de Vries")
+MACHINE_END
 #endif
 #ifdef CONFIG_ARCH_LACIE_NAS
-	{
-		MACH_TYPE_LACIE_NAS,
-		"LaCie_NAS",	/* Benjamin Herrenschmidt */
-		NO_PARAMS,
-		NO_VIDEO,
-		0, 0, 0, 0, 0,
-		NULL
-	},
+MACHINE_START(LACIE_NAS, "LaCie_NAS")
+	MAINTAINER("Benjamin Herrenschmidt")
+MACHINE_END
 #endif
 #ifdef CONFIG_ARCH_CLPS7500
-	{
-		MACH_TYPE_CLPS7500,
-		"CL-PS7500",	/* Philip Blundell	*/
-		NO_PARAMS,
-		NO_VIDEO,
-		0, 0, 0, 0, 0,
-		NULL
-	},
+MACHINE_START(CLPS7500, "CL-PS7500")
+	MAINTAINER("Philip Blundell")
+	BOOT_MEM(0x10000000, 0x03000000, 0xe0000000)
+MACHINE_END
 #endif
 #ifdef CONFIG_ARCH_SHARK
-	{
-		MACH_TYPE_SHARK,
-		"Shark",		/* Alexander Schulz	*/
-		NO_PARAMS,
-		0x06000000, 0x06000000+0x001fffff,
-		0, 0, 0, 0, 0,
-		NULL
-	},
-#endif
-#ifdef CONFIG_ARCH_SA1100
-	{
-		MACH_TYPE_SA1100,
-		"SA1100-based",	/* Nicolas Pitre	*/
-		NO_PARAMS,
-		NO_VIDEO,
-		0, 0, 0, 0, 0,
-		fixup_sa1100
-	},
+MACHINE_START(SHARK, "Shark")
+	MAINTAINER("Alexander Schulz")
+	BOOT_MEM(0x08000000, 0x40000000, 0xe0000000)
+	VIDEO(0x06000000, 0x061fffff)
+MACHINE_END
 #endif
 #ifdef CONFIG_ARCH_PERSONAL_SERVER
-	{
-		MACH_TYPE_PERSONAL_SERVER,
-		"Compaq Personal Server",
-		NO_PARAMS,
-		NO_VIDEO,
-		0, 0, 0, 0, 0,
-		NULL
-	}
+MACHINE_START(PERSONAL_SERVER, "Compaq Personal Server")
+	MAINTAINER("Jamey Hicks / George France")
+	BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
+	BOOT_PARAMS(0x00000100)
+MACHINE_END
 #endif
-};