---

yaml --- r: 187478 b: refs/heads/master c: 662b083 h: refs/heads/master v: v3
git-mirror · Mar 1, 2010 · a5cd741 · a5cd741
1 parent e23f308
commit a5cd741
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c95efee13303d9ff9e67f2600174f492039311ce
+refs/heads/master: 662b0836a667158284c8a4a091de745fd5637ff1
diff --git a/trunk/arch/arm/mach-pxa/include/mach/uncompress.h b/trunk/arch/arm/mach-pxa/include/mach/uncompress.h
@@ -60,6 +60,12 @@ static inline void arch_decomp_setup(void)
 	    || machine_is_csb726() || machine_is_stargate2()
 	    || machine_is_cm_x300() || machine_is_balloon3())
 		uart_base = STUART_BASE;
+
+	if (machine_is_arcom_zeus()) {
+		uart_base = 0x10000000;	/* nCS4 */
+		uart_shift = 1;
+		uart_is_pxa = 0;
+	}
 }
 
 /*