From a5cd741bae07993ab5b954d6c827fb0d5701128c Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Fri, 19 Feb 2010 14:07:37 +0800 Subject: [PATCH] --- yaml --- r: 187478 b: refs/heads/master c: 662b0836a667158284c8a4a091de745fd5637ff1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/include/mach/uncompress.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4c0e9c1e565f..e09b35ed598e 100644 --- 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 index 4888a21947b0..5ef91d9d17e4 100644 --- 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; + } } /*