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: 2665971 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 8ED9C3FD4F for ; Wed, 5 Jun 2013 07:48:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752207Ab3FEHsE (ORCPT ); Wed, 5 Jun 2013 03:48:04 -0400 Received: from mail-pb0-f43.google.com ([209.85.160.43]:50254 "EHLO mail-pb0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751723Ab3FEHsD (ORCPT ); Wed, 5 Jun 2013 03:48:03 -0400 Received: by mail-pb0-f43.google.com with SMTP id md12so331852pbc.30 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 Cc: arnd@arndb.de, horms@verge.net.au, laurent.pinchart@ideasonboard.com, olof@lixom.net, Magnus Damm , linux-arm-kernel@lists.infradead.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 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 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."