diff options
| author | Alistair Buxton <a.j.buxton@gmail.com> | 2009-09-22 13:05:30 +0400 |
|---|---|---|
| committer | Alistair Buxton <a.j.buxton@gmail.com> | 2009-10-08 02:14:08 +0400 |
| commit | f8631e7bba34d46d6ccea4cd90f7a0482770ff70 (patch) | |
| tree | 5bac3a31c97fac132708e45bf5bcf2076320a61e /arch/arm | |
| parent | 1f73b4de93e06d18c28cb282761c8507bc476489 (diff) | |
| download | linux-f8631e7bba34d46d6ccea4cd90f7a0482770ff70.tar.xz | |
OMAP850: Fix zImage booting
This adds the OMAP850 JTAG ID to the IDs checked by OMAP uncompress.h putc.
Without this putc hangs up trying to check the uarts and zImage crashes.
Signed-off-by: Alistair Buxton <a.j.buxton@gmail.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/uncompress.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/mach/uncompress.h b/arch/arm/plat-omap/include/mach/uncompress.h index 0814c5f210c3..ddf7b88dec4d 100644 --- a/arch/arm/plat-omap/include/mach/uncompress.h +++ b/arch/arm/plat-omap/include/mach/uncompress.h @@ -25,6 +25,7 @@ unsigned int system_rev; #define UART_OMAP_MDR1 0x08 /* mode definition register */ #define OMAP_ID_730 0x355F +#define OMAP_ID_850 0x362C #define ID_MASK 0x7fff #define check_port(base, shift) ((base[UART_OMAP_MDR1 << shift] & 7) == 0) #define omap_get_id() ((*(volatile unsigned int *)(0xfffed404)) >> 12) & ID_MASK @@ -53,7 +54,7 @@ static void putc(int c) /* MMU is not on, so cpu_is_omapXXXX() won't work here */ unsigned int omap_id = omap_get_id(); - if (omap_id == OMAP_ID_730) + if (omap_id == OMAP_ID_730 || omap_id == OMAP_ID_850) shift = 0; if (check_port(uart, shift)) |