From patchwork Mon Jun 10 09:28:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2696381 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 59FB03FD4E for ; Mon, 10 Jun 2013 09:21:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752038Ab3FJJV3 (ORCPT ); Mon, 10 Jun 2013 05:21:29 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:59436 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751647Ab3FJJV2 (ORCPT ); Mon, 10 Jun 2013 05:21:28 -0400 Received: by mail-pd0-f170.google.com with SMTP id x11so1438673pdj.29 for ; Mon, 10 Jun 2013 02:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:subject; bh=uIZtKcPVYlcA+W8Z+Vxb0x/dpiTZCu/FMZrGtIj0CjY=; b=AHB2bOO3EHMw990LgxNYKT8tJm8vYv7kK/g6dNnNjbrhIJmpTIaHeiCTK9who3/vss 9j/TmbuznuXyn7fSZl2TINxxFR7EqvFh3boQ2NPStLXiCDMW31yYPrwI4tFtxoDyraxp pdAWhTt+f414hm+kSXaata/01bUq9E8o0wF/7LHT6aix+S8IFo5qa4KpFISEiT9fvjfI 0+RjA4Lv64jalKuqM7xmLqclohpzhmrZV4vF51rMbdzIwj4Hz4eio/a/XYBpTrEt2IQj Oa3Xfa9NBvzX1qu1h2dyCwqQ+q/hDsQRtWt0FDvjdHDytyJvt20QoiztZHH+pWRN9cJX I/9w== X-Received: by 10.68.197.33 with SMTP id ir1mr8906333pbc.197.1370856087968; Mon, 10 Jun 2013 02:21:27 -0700 (PDT) Received: from [127.0.0.1] (ac230065.ppp.asahi-net.or.jp. [183.77.230.65]) by mx.google.com with ESMTPSA id fr1sm9783635pbb.26.2013.06.10.02.21.25 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Jun 2013 02:21:26 -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: Mon, 10 Jun 2013 18:28:57 +0900 Message-Id: <20130610092857.19175.25629.sendpatchset@w520> Subject: [PATCH v2] ARM: shmobile: uImage load address rework Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Magnus Damm This is V2 of the mach-shmobile uImage load address rework patch. Rework the mach-shmobile uImage load address calculation by storing the per-board load addresses in Makefile.boot. This removes the CONFIG_MEMORY_START dependency from Makefile.boot, and it also makes it possible to create safe kernel images that boot on multiple boards. This is one of several series of code that reworks code not to rely on CONFIG_MEMORY_START/SIZE which in turn is needed for ARCH_MULTIPLATFORM. Signed-off-by: Magnus Damm Reviewed-by: Laurent Pinchart Reviewed-by: Kuninori Morimoto --- Changes since V1: - On popular request, merged patch 5 and 14 and all other. - Updated the __ZRELADDR calculation, thanks Arnd! - Added Reviewed-by from Laurent and Morimoto-san, thanks! arch/arm/mach-shmobile/Makefile.boot | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) -- 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 --- 0001/arch/arm/mach-shmobile/Makefile.boot +++ work/arch/arm/mach-shmobile/Makefile.boot 2013-06-10 16:15:22.000000000 +0900 @@ -1,6 +1,22 @@ -__ZRELADDR := $(shell /bin/bash -c 'printf "0x%08x" \ - $$[$(CONFIG_MEMORY_START) + 0x8000]') +# per-board load address for uImage +loadaddr-y := +loadaddr-$(CONFIG_MACH_AG5EVM) += 0x40008000 +loadaddr-$(CONFIG_MACH_AP4EVB) += 0x40008000 +loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000 +loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000 +loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000 +loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 +loadaddr-$(CONFIG_MACH_BONITO) += 0x40008000 +loadaddr-$(CONFIG_MACH_KOTA2) += 0x41008000 +loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000 +loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 +loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000 +loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000 +loadaddr-$(CONFIG_MACH_MACKEREL) += 0x40008000 +loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000 +loadaddr-$(CONFIG_MACH_MARZEN_REFERENCE) += 0x60008000 +__ZRELADDR := $(sort $(loadaddr-y)) zreladdr-y += $(__ZRELADDR) # Unsupported legacy stuff