From patchwork Sun Oct 23 21:10:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Devai X-Patchwork-Id: 121245 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E855AB6F86 for ; Mon, 24 Oct 2011 08:12:13 +1100 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RI5Kf-0006Ha-QU; Sun, 23 Oct 2011 21:11:50 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RI5Kf-0003n8-Hv; Sun, 23 Oct 2011 21:11:49 +0000 Received: from mail-bw0-f49.google.com ([209.85.214.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RI5Jo-0003dZ-U9 for linux-arm-kernel@lists.infradead.org; Sun, 23 Oct 2011 21:10:59 +0000 Received: by mail-bw0-f49.google.com with SMTP id c12so9291478bkb.36 for ; Sun, 23 Oct 2011 14:10:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=mfvqBCe1qVjC+iNj9ogi+WeW0y9E1UpF8GITQM5TbFo=; b=clbSOgvBuo34g6Q4rxKAQy8UYJSS8vJOAwoA25u3hsNMuOGCDu+S8HgQNmhChUT9ek zFhC7kuHMfBLJoSSQ1FRpGUaoPo/OkLxEdB0c68ifpRDoU1+/9ipJUhMHhNLYUH/4hTl AIGbjzy0bkn2AaR+LfS/PvJFWlFXXsc1PyghQ= Received: by 10.204.7.81 with SMTP id c17mr15457180bkc.25.1319404256527; Sun, 23 Oct 2011 14:10:56 -0700 (PDT) Received: from localhost.localdomain (catv-89-134-202-153.catv.broadband.hu. [89.134.202.153]) by mx.google.com with ESMTPS id e14sm21311798bka.0.2011.10.23.14.10.55 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 23 Oct 2011 14:10:55 -0700 (PDT) From: Zoltan Devai To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 03/15] ARM: uncompress.h: Introduce ARCH_HAVE_DECOMP_SETUP Date: Sun, 23 Oct 2011 23:10:33 +0200 Message-Id: <1319404245-12740-3-git-send-email-zoss@devai.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1319404245-12740-1-git-send-email-zoss@devai.org> References: <1319404245-12740-1-git-send-email-zoss@devai.org> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20111023_171057_270241_6833BC7E X-CRM114-Status: GOOD ( 15.74 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zdevai[at]gmail.com) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 T_TO_NO_BRKTS_FREEMAIL To: misformatted and free email service X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Add this define to machines which really make use of this function. Signed-off-by: Zoltan Devai --- arch/arm/mach-davinci/include/mach/uncompress.h | 1 + arch/arm/mach-ep93xx/include/mach/uncompress.h | 1 + arch/arm/mach-iop32x/include/mach/uncompress.h | 4 +--- arch/arm/mach-iop33x/include/mach/uncompress.h | 4 +--- arch/arm/mach-ixp4xx/include/mach/uncompress.h | 1 + arch/arm/mach-mmp/include/mach/uncompress.h | 2 ++ arch/arm/mach-mxs/include/mach/uncompress.h | 1 + arch/arm/mach-pxa/include/mach/uncompress.h | 2 ++ arch/arm/mach-rpc/include/mach/uncompress.h | 2 ++ arch/arm/mach-s5p64x0/include/mach/uncompress.h | 2 ++ arch/arm/mach-tegra/include/mach/uncompress.h | 2 ++ arch/arm/mach-ux500/include/mach/uncompress.h | 2 ++ arch/arm/plat-mxc/include/mach/uncompress.h | 1 + arch/arm/plat-omap/include/plat/uncompress.h | 1 + arch/arm/plat-samsung/include/plat/uncompress.h | 2 ++ 15 files changed, 22 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-davinci/include/mach/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h index 8d63753..1947ff9 100644 --- a/arch/arm/mach-davinci/include/mach/uncompress.h +++ b/arch/arm/mach-davinci/include/mach/uncompress.h @@ -102,4 +102,5 @@ static inline void __arch_decomp_setup(unsigned long arch_id) } while (0); } +#define ARCH_HAVE_DECOMP_SETUP #define arch_decomp_setup() __arch_decomp_setup(arch_id) diff --git a/arch/arm/mach-ep93xx/include/mach/uncompress.h b/arch/arm/mach-ep93xx/include/mach/uncompress.h index b2ecb98..f1cd638 100644 --- a/arch/arm/mach-ep93xx/include/mach/uncompress.h +++ b/arch/arm/mach-ep93xx/include/mach/uncompress.h @@ -85,6 +85,7 @@ static void ethernet_reset(void) ; } +#define ARCH_HAVE_DECOMP_SETUP static void arch_decomp_setup(void) { diff --git a/arch/arm/mach-iop32x/include/mach/uncompress.h b/arch/arm/mach-iop32x/include/mach/uncompress.h index b3d45fd..c1ff29a 100644 --- a/arch/arm/mach-iop32x/include/mach/uncompress.h +++ b/arch/arm/mach-iop32x/include/mach/uncompress.h @@ -32,7 +32,5 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id) uart_base = (volatile u8 *)0xfe800000; } -/* - * nothing to do - */ +#define ARCH_HAVE_DECOMP_SETUP #define arch_decomp_setup() __arch_decomp_setup(arch_id) diff --git a/arch/arm/mach-iop33x/include/mach/uncompress.h b/arch/arm/mach-iop33x/include/mach/uncompress.h index ed282e1..9537d4b 100644 --- a/arch/arm/mach-iop33x/include/mach/uncompress.h +++ b/arch/arm/mach-iop33x/include/mach/uncompress.h @@ -30,7 +30,5 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id) uart_base = (volatile u32 *)0xfe800000; } -/* - * nothing to do - */ +#define ARCH_HAVE_DECOMP_SETUP #define arch_decomp_setup() __arch_decomp_setup(arch_id) diff --git a/arch/arm/mach-ixp4xx/include/mach/uncompress.h b/arch/arm/mach-ixp4xx/include/mach/uncompress.h index 7b25c02..0a0102c 100644 --- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h +++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h @@ -51,6 +51,7 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id) /* * arch_id is a variable in decompress_kernel() */ +#define ARCH_HAVE_DECOMP_SETUP #define arch_decomp_setup() __arch_decomp_setup(arch_id) #endif diff --git a/arch/arm/mach-mmp/include/mach/uncompress.h b/arch/arm/mach-mmp/include/mach/uncompress.h index 8890fa8..8c58b57 100644 --- a/arch/arm/mach-mmp/include/mach/uncompress.h +++ b/arch/arm/mach-mmp/include/mach/uncompress.h @@ -35,6 +35,8 @@ static inline void flush(void) { } +#define ARCH_HAVE_DECOMP_SETUP + static inline void arch_decomp_setup(void) { /* default to UART2 */ diff --git a/arch/arm/mach-mxs/include/mach/uncompress.h b/arch/arm/mach-mxs/include/mach/uncompress.h index 6ab8972..eded40b 100644 --- a/arch/arm/mach-mxs/include/mach/uncompress.h +++ b/arch/arm/mach-mxs/include/mach/uncompress.h @@ -71,6 +71,7 @@ static inline void __arch_decomp_setup(unsigned long arch_id) } } +#define ARCH_HAVE_DECOMP_SETUP #define arch_decomp_setup() __arch_decomp_setup(arch_id) #endif /* __MACH_MXS_UNCOMPRESS_H__ */ diff --git a/arch/arm/mach-pxa/include/mach/uncompress.h b/arch/arm/mach-pxa/include/mach/uncompress.h index 8c27757..28acded 100644 --- a/arch/arm/mach-pxa/include/mach/uncompress.h +++ b/arch/arm/mach-pxa/include/mach/uncompress.h @@ -54,6 +54,8 @@ static inline void flush(void) { } +#define ARCH_HAVE_DECOMP_SETUP + static inline void arch_decomp_setup(void) { /* initialize to default */ diff --git a/arch/arm/mach-rpc/include/mach/uncompress.h b/arch/arm/mach-rpc/include/mach/uncompress.h index 0fd4b0b..5ea3974 100644 --- a/arch/arm/mach-rpc/include/mach/uncompress.h +++ b/arch/arm/mach-rpc/include/mach/uncompress.h @@ -109,6 +109,8 @@ static inline void flush(void) { } +#define ARCH_HAVE_DECOMP_SETUP + /* * Setup for decompression */ diff --git a/arch/arm/mach-s5p64x0/include/mach/uncompress.h b/arch/arm/mach-s5p64x0/include/mach/uncompress.h index 00b70b8..8d537eb 100644 --- a/arch/arm/mach-s5p64x0/include/mach/uncompress.h +++ b/arch/arm/mach-s5p64x0/include/mach/uncompress.h @@ -151,6 +151,8 @@ static inline void arch_enable_uart_fifo(void) #define arch_enable_uart_fifo() do { } while(0) #endif +#define ARCH_HAVE_DECOMP_SETUP + static void arch_decomp_setup(void) { /* diff --git a/arch/arm/mach-tegra/include/mach/uncompress.h b/arch/arm/mach-tegra/include/mach/uncompress.h index 565daa6..1b07047 100644 --- a/arch/arm/mach-tegra/include/mach/uncompress.h +++ b/arch/arm/mach-tegra/include/mach/uncompress.h @@ -43,6 +43,8 @@ static inline void flush(void) { } +#define ARCH_HAVE_DECOMP_SETUP + static inline void arch_decomp_setup(void) { volatile u8 *uart = (volatile u8 *)TEGRA_DEBUG_UART_BASE; diff --git a/arch/arm/mach-ux500/include/mach/uncompress.h b/arch/arm/mach-ux500/include/mach/uncompress.h index ec957e8..d096c99 100644 --- a/arch/arm/mach-ux500/include/mach/uncompress.h +++ b/arch/arm/mach-ux500/include/mach/uncompress.h @@ -48,6 +48,8 @@ static void flush(void) barrier(); } +#define ARCH_HAVE_DECOMP_SETUP + static inline void arch_decomp_setup(void) { /* Check in run time if we run on an U8500 or U5500 */ diff --git a/arch/arm/plat-mxc/include/mach/uncompress.h b/arch/arm/plat-mxc/include/mach/uncompress.h index d9412a1..6e43f5e 100644 --- a/arch/arm/plat-mxc/include/mach/uncompress.h +++ b/arch/arm/plat-mxc/include/mach/uncompress.h @@ -125,6 +125,7 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id) } } +#define ARCH_HAVE_DECOMP_SETUP #define arch_decomp_setup() __arch_decomp_setup(arch_id) #endif /* __ASM_ARCH_MXC_UNCOMPRESS_H__ */ diff --git a/arch/arm/plat-omap/include/plat/uncompress.h b/arch/arm/plat-omap/include/plat/uncompress.h index c5111bd..860c02b 100644 --- a/arch/arm/plat-omap/include/plat/uncompress.h +++ b/arch/arm/plat-omap/include/plat/uncompress.h @@ -182,4 +182,5 @@ static inline void __arch_decomp_setup(unsigned long arch_id) } while (0); } +#define ARCH_HAVE_DECOMP_SETUP #define arch_decomp_setup() __arch_decomp_setup(arch_id) diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h b/arch/arm/plat-samsung/include/plat/uncompress.h index 94fecf9..b10e0be 100644 --- a/arch/arm/plat-samsung/include/plat/uncompress.h +++ b/arch/arm/plat-samsung/include/plat/uncompress.h @@ -130,6 +130,8 @@ static inline void arch_enable_uart_fifo(void) #define arch_enable_uart_fifo() do { } while(0) #endif +#define ARCH_HAVE_DECOMP_SETUP + static void arch_decomp_setup(void) {