]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
OMAP850: Fix zImage booting
authorAlistair Buxton <a.j.buxton@gmail.com>
Tue, 22 Sep 2009 09:05:30 +0000 (10:05 +0100)
committerAlistair Buxton <a.j.buxton@gmail.com>
Wed, 7 Oct 2009 22:14:08 +0000 (23:14 +0100)
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>
arch/arm/plat-omap/include/mach/uncompress.h

index 0814c5f210c33a6ba41b2a38f8a2392c2b813cce..ddf7b88dec4d5956a6b34c26f4d16a58106adf85 100644 (file)
@@ -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))