From patchwork Mon Mar 15 19:08:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 86013 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2FJ7KUP027999 for ; Mon, 15 Mar 2010 19:07:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965682Ab0COTHU (ORCPT ); Mon, 15 Mar 2010 15:07:20 -0400 Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:53323 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965673Ab0COTHS (ORCPT ); Mon, 15 Mar 2010 15:07:18 -0400 Received: from muru.com ([72.249.23.125] helo=localhost.localdomain) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.68) (envelope-from ) id 1NrFdF-0003uE-Ge; Mon, 15 Mar 2010 19:07:17 +0000 Received: from Mutt by mutt-smtp-wrapper.pl 1.2 (www.zdo.com/articles/mutt-smtp-wrapper.shtml) X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 72.249.23.125 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1/0o6XNUCB6fm31T4vt9lRN Date: Mon, 15 Mar 2010 12:08:43 -0700 From: Tony Lindgren To: Cory Maccarrone Cc: linux-omap@vger.kernel.org, miknix@gmail.com, a.j.buxton@gmail.com, linwizard-devel@lists.sf.net Subject: Re: Commit 0c8219f0... breaks omap7xx support Message-ID: <20100315190842.GZ2900@atomide.com> References: <6cb013311003062056v3ed83a53u2636838348bf4845@mail.gmail.com> <20100309004832.GK2900@atomide.com> <6cb013311003081751u2c7cd8c6v59472ee85ac90e77@mail.gmail.com> <20100309024602.GQ2900@atomide.com> <6cb013311003081906n751bedb4k2794ed40ed68d7ec@mail.gmail.com> <20100309155636.GS2900@atomide.com> <6cb013311003091541k6a18c16bv4bb3d35f101e5bab@mail.gmail.com> <20100315182939.GV2900@atomide.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100315182939.GV2900@atomide.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 15 Mar 2010 19:07:21 +0000 (UTC) From b33f67e61cc45558cfbda86b3e2032ffbcb2f99c Mon Sep 17 00:00:00 2001 From: Tony Lindgren 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 . Some boards may not have UARTs available at all, so add DEBUG_LL_NONE option for that. Signed-off-by: Tony Lindgren 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()) { \