git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
[safe/jmp/linux-2.6]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
uncompress.h
diff --git
a/arch/arm/plat-mxc/include/mach/uncompress.h
b/arch/arm/plat-mxc/include/mach/uncompress.h
index
0e12876
..
52e476a
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/uncompress.h
+++ b/
arch/arm/plat-mxc/include/mach/uncompress.h
@@
-1,8
+1,6
@@
/*
* arch/arm/plat-mxc/include/mach/uncompress.h
*
/*
* arch/arm/plat-mxc/include/mach/uncompress.h
*
- *
- *
* Copyright (C) 1999 ARM Limited
* Copyright (C) Shane Nay (shane@minirl.com)
*
* Copyright (C) 1999 ARM Limited
* Copyright (C) Shane Nay (shane@minirl.com)
*
@@
-25,7
+23,6
@@
#define __MXC_BOOT_UNCOMPRESS
#define __MXC_BOOT_UNCOMPRESS
-#include <mach/hardware.h>
#include <asm/mach-types.h>
static unsigned long uart_base;
#include <asm/mach-types.h>
static unsigned long uart_base;
@@
-60,7
+57,9
@@
static void putc(int ch)
UART(TXR) = ch;
}
UART(TXR) = ch;
}
-#define flush() do { } while (0)
+static inline void flush(void)
+{
+}
#define MX1_UART1_BASE_ADDR 0x00206000
#define MX25_UART1_BASE_ADDR 0x43f90000
#define MX1_UART1_BASE_ADDR 0x00206000
#define MX25_UART1_BASE_ADDR 0x43f90000
@@
-83,6
+82,8
@@
static __inline__ void __arch_decomp_setup(unsigned long arch_id)
case MACH_TYPE_MX27ADS:
case MACH_TYPE_PCM038:
case MACH_TYPE_MX21ADS:
case MACH_TYPE_MX27ADS:
case MACH_TYPE_PCM038:
case MACH_TYPE_MX21ADS:
+ case MACH_TYPE_PCA100:
+ case MACH_TYPE_MXT_TD60:
uart_base = MX2X_UART1_BASE_ADDR;
break;
case MACH_TYPE_MX31LITE:
uart_base = MX2X_UART1_BASE_ADDR;
break;
case MACH_TYPE_MX31LITE: