From a3589a95600d2f57be468a787221bbeff4a31f5c Mon Sep 17 00:00:00 2001 From: Quinn Jensen Date: Fri, 27 Jul 2007 23:30:55 +0100 Subject: [PATCH] --- yaml --- r: 63063 b: refs/heads/master c: 03e5386e1e6e4f19c18c33fb69afd43054d448b2 h: refs/heads/master i: 63061: a3d8a83b2901168ff2d9421edef7d28be8ff7e68 63059: 7c60307675e45084527e5e1e678abedb0ee4957a 63055: 25b9960d3feb2d109d49e255123fa03243917376 v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-mxc/uncompress.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e96cfb5e537c..314d3531b14c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc46f659705c722ae6020dd7411c4ac39cec4408 +refs/heads/master: 03e5386e1e6e4f19c18c33fb69afd43054d448b2 diff --git a/trunk/include/asm-arm/arch-mxc/uncompress.h b/trunk/include/asm-arm/arch-mxc/uncompress.h index ec5787d0e78c..42cc0cb3fefd 100644 --- a/trunk/include/asm-arm/arch-mxc/uncompress.h +++ b/trunk/include/asm-arm/arch-mxc/uncompress.h @@ -26,7 +26,6 @@ #define __MXC_BOOT_UNCOMPRESS #include -#include #define UART(x) (*(volatile unsigned long *)(serial_port + (x))) @@ -62,7 +61,7 @@ static void putc(int ch) } while (!(UART(USR2) & USR2_TXFE)) - cpu_relax(); + barrier(); UART(TXR) = ch; }