From patchwork Wed Jun 5 07:55:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2666011 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 661EE3FD4F for ; Wed, 5 Jun 2013 07:49:26 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uk8SW-0002kf-9F; Wed, 05 Jun 2013 07:48:41 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uk8SK-0000fG-6N; Wed, 05 Jun 2013 07:48:28 +0000 Received: from mail-pb0-x236.google.com ([2607:f8b0:400e:c01::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uk8SF-0000cU-Tf for linux-arm-kernel@lists.infradead.org; Wed, 05 Jun 2013 07:48:24 +0000 Received: by mail-pb0-f54.google.com with SMTP id ro2so1412725pbb.27 for ; Wed, 05 Jun 2013 00:48:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=V/ORaQVnVaHItirM2Ap1o1h8LZG2PmAoDZe0a9jQkP0=; b=OppfgDviI1ZaJYjkWiQZyzKaPHRh9IFYsGvnl2W2R3JSmYM9EMMEHdFT2feZNGN9ol IR4gNARyG/6kWhUja44PAp/xy4alv+7MjFF/RHHpY9BSkYR/jPls/gwaiydjcjm5oWB1 nVqmLJVjHYk+9R4TPx5s9ri7xFaLk3OEuv5O61rcQDVSqqRTcT4JCq0JWr3vPWgGKPRU esZY8FmW7O3QDHrAohWDcdUTFeXrPFRwvPEAj0uDzEBF1TaS0EA5bHcgBJ1lp4W+mGwA B+OvhtJmk1RtenDOQWHi/75aUYRXeEVd4uuYS8GQTJ3UM2mAZuoKXxuUte4RlT6N7C4T /rLw== X-Received: by 10.68.244.5 with SMTP id xc5mr32576227pbc.66.1370418482684; Wed, 05 Jun 2013 00:48:02 -0700 (PDT) Received: from [127.0.0.1] (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id nk2sm12326910pbc.43.2013.06.05.00.48.00 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Jun 2013 00:48:02 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Wed, 05 Jun 2013 16:55:31 +0900 Message-Id: <20130605075531.17653.38073.sendpatchset@w520> In-Reply-To: <20130605075514.17653.77135.sendpatchset@w520> References: <20130605075514.17653.77135.sendpatchset@w520> Subject: [PATCH 02/02] ARM: shmobile: Remove romImage CONFIG_MEMORY_START X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130605_034824_082558_FC90217C X-CRM114-Status: UNSURE ( 9.71 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (magnus.damm[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 Cc: arnd@arndb.de, Magnus Damm , horms@verge.net.au, laurent.pinchart@ideasonboard.com, olof@lixom.net, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Magnus Damm Instead of relying on CONFIG_MEMORY_START for memory base address, let each romImage board header file specify this information. This is reworks code not to rely on CONFIG_MEMORY_START which in turn is needed for ARCH_MULTIPLATFORM. Signed-off-by: Magnus Damm --- arch/arm/boot/compressed/head-shmobile.S | 2 +- arch/arm/mach-shmobile/include/mach/zboot.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) --- 0025/arch/arm/boot/compressed/head-shmobile.S +++ work/arch/arm/boot/compressed/head-shmobile.S 2013-06-05 11:56:07.000000000 +0900 @@ -46,7 +46,7 @@ __image_start: __image_end: .long _got_end __load_base: - .long CONFIG_MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM + .long MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM __loaded: .long __continue .align --- 0001/arch/arm/mach-shmobile/include/mach/zboot.h +++ work/arch/arm/mach-shmobile/include/mach/zboot.h 2013-06-05 11:55:55.000000000 +0900 @@ -12,9 +12,11 @@ #ifdef CONFIG_MACH_AP4EVB #define MACH_TYPE MACH_TYPE_AP4EVB +#define MEMORY_START 0x40000000 #include "mach/head-ap4evb.txt" #elif defined(CONFIG_MACH_MACKEREL) #define MACH_TYPE MACH_TYPE_MACKEREL +#define MEMORY_START 0x40000000 #include "mach/head-mackerel.txt" #else #error "unsupported board."