patch-2.4.22 linux-2.4.22/arch/arm/kernel/arch.c

• Lines: 50
• Date: 2003-08-25 04:44:39.000000000 -0700
• Orig file: linux-2.4.21/arch/arm/kernel/arch.c
• Orig date: 2001-08-12 11:13:59.000000000 -0700

diff -urN linux-2.4.21/arch/arm/kernel/arch.c linux-2.4.22/arch/arm/kernel/arch.c
@@ -20,7 +20,7 @@
 
 unsigned int vram_size;
 
-#ifdef CONFIG_ARCH_ACORN
+#if defined(CONFIG_ARCH_ACORN) || defined(CONFIG_ARCH_RISCSTATION)
 
 unsigned int memc_ctrl_reg;
 unsigned int number_mfm_drives;
@@ -49,7 +49,8 @@
 
 __tagtable(ATAG_ACORN, parse_tag_acorn);
 
-#ifdef CONFIG_ARCH_RPC
+
+#if defined(CONFIG_ARCH_RPC) || defined(CONFIG_ARCH_RISCSTATION)
 static void __init
 fixup_riscpc(struct machine_desc *desc, struct param_struct *unusd,
 	    char **cmdline, struct meminfo *mi)
@@ -61,7 +62,9 @@
 }
 
 extern void __init rpc_map_io(void);
+extern void __init riscstation_map_io(void);
 
+#ifdef CONFIG_ARCH_RPC
 MACHINE_START(RISCPC, "Acorn-RiscPC")
 	MAINTAINER("Russell King")
 	BOOT_MEM(0x10000000, 0x03000000, 0xe0000000)
@@ -73,6 +76,20 @@
 	INITIRQ(genarch_init_irq)
 MACHINE_END
 #endif
+
+#ifdef CONFIG_ARCH_RISCSTATION
+/* TODO = check all parameters */
+MACHINE_START(RISCSTATION, "RiscStation-RS7500")
+	MAINTAINER("Ben Dooks, Vincent Sanders")
+	BOOT_MEM(0x10000000, 0x03000000, 0xe0000000)
+	BOOT_PARAMS(0x10000100)
+	FIXUP(fixup_riscpc)
+	MAPIO(riscstation_map_io)
+	INITIRQ(genarch_init_irq)
+MACHINE_END
+#endif
+
+#endif /* CONFIG_ARCH_RPC | CONFIG_ARCH_RISCSTATION */
 #ifdef CONFIG_ARCH_ARC
 MACHINE_START(ARCHIMEDES, "Acorn-Archimedes")
 	MAINTAINER("Dave Gilbert")