diff mbox

Commit 0c8219f0... breaks omap7xx support

Message ID 20100315190842.GZ2900@atomide.com (mailing list archive)
State New, archived
Delegated to: Tony Lindgren
Headers show

Commit Message

Tony Lindgren March 15, 2010, 7:08 p.m. UTC 
None
diff mbox

Patch

From b33f67e61cc45558cfbda86b3e2032ffbcb2f99c Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Mon, 15 Mar 2010 10:47:08 -0700
Subject: [PATCH] omap: Fix uncompress code for boards with no UART

With the recent DEBUG_LL and uncompress code changes, boards
with no UART configured fail to boot as pointed out by
Cory Maccarrone <darkstar6262@gmail.com>.

Some boards may not have UARTs available at all, so add
DEBUG_LL_NONE option for that.

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/plat-omap/include/plat/uncompress.h b/arch/arm/plat-omap/include/plat/uncompress.h
index dc37b2c..7d69d39 100644
--- a/arch/arm/plat-omap/include/plat/uncompress.h
+++ b/arch/arm/plat-omap/include/plat/uncompress.h
@@ -66,6 +66,13 @@  static inline void flush(void)
 /*
  * Macros to configure UART1 and debug UART
  */
+
+#define DEBUG_LL_NONE(mach)						\
+	if (machine_is_##mach()) {					\
+		uart_base = 0;						\
+		break;							\
+	}
+
 #define _DEBUG_LL_ENTRY(mach, uart1_phys, uart1_shft,			\
 			dbg_uart, dbg_shft, dbg_id)			\
 	if (machine_is_##mach()) {					\