Skip to content

Commit

Permalink
OMAP850: Fix zImage booting
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alistair Buxton committed Oct 7, 2009
1 parent 1f73b4d commit f8631e7
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/arm/plat-omap/include/mach/uncompress.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))
Expand Down

0 comments on commit f8631e7

Please sign in to comment.