openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Alistair Buxton 2009-09-22 10:05:30 +01:00
parent 1f73b4de93
commit f8631e7bba
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/plat-omap/include/mach/uncompress.h
View File

@ -25,6 +25,7 @@ unsigned int system_rev;
#define UART_OMAP_MDR1 0x08 /* mode definition register */ #define UART_OMAP_MDR1 0x08 /* mode definition register */
#define OMAP_ID_730 0x355F #define OMAP_ID_730 0x355F
#define OMAP_ID_850 0x362C
#define ID_MASK 0x7fff #define ID_MASK 0x7fff
#define check_port(base, shift) ((base[UART_OMAP_MDR1 << shift] & 7) == 0) #define check_port(base, shift) ((base[UART_OMAP_MDR1 << shift] & 7) == 0)
#define omap_get_id() ((*(volatile unsigned int *)(0xfffed404)) >> 12) & ID_MASK #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 */ /* MMU is not on, so cpu_is_omapXXXX() won't work here */
unsigned int omap_id = omap_get_id(); 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; shift = 0;
if (check_port(uart, shift)) if (check_port(uart, shift))