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; }