From patchwork Fri Sep 2 18:06:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 1122872 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p82I7H0C001110 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 2 Sep 2011 18:07:37 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QzY8r-0006DT-9L; Fri, 02 Sep 2011 18:07:01 +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 1QzY8q-0001UI-RE; Fri, 02 Sep 2011 18:07:00 +0000 Received: from na3sys009aog119.obsmtp.com ([74.125.149.246]) by canuck.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1QzY8n-0001Tz-It for linux-arm-kernel@lists.infradead.org; Fri, 02 Sep 2011 18:06:58 +0000 Received: from mail-yw0-f46.google.com ([209.85.213.46]) (using TLSv1) by na3sys009aob119.postini.com ([74.125.148.12]) with SMTP ID DSNKTmEbP5spDCC9RVRnLA0KOdci0FnKDvd/@postini.com; Fri, 02 Sep 2011 11:06:57 PDT Received: by ywf7 with SMTP id 7so2369423ywf.19 for ; Fri, 02 Sep 2011 11:06:54 -0700 (PDT) Received: by 10.68.28.167 with SMTP id c7mr2181164pbh.358.1314986814408; Fri, 02 Sep 2011 11:06:54 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id x6sm11621522pba.5.2011.09.02.11.06.53 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Sep 2011 11:06:53 -0700 (PDT) From: Kevin Hilman To: Tony Lindgren Subject: testing-board branch: rebase to RMK's devel-stable? Organization: Texas Instruments, Inc. Date: Fri, 02 Sep 2011 11:06:52 -0700 Message-ID: <87vcta7r9f.fsf@ti.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110902_140657_894536_13D514D2 X-CRM114-Status: GOOD ( 18.34 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.246 listed in list.dnswl.org] Cc: Nicolas Pitre , linux-omap , linux-arm-kernel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 02 Sep 2011 18:07:38 +0000 (UTC) Hi Tony, Your testing-board branch currently has a couple new boards that are missing the boot_params to atag_offset conversion (patch below.) There's a patch below to fix this, but maybe it's better to just rebase your testing-board branch onto Russell's devel-stable branch (where he's merged the seris from Nico) so any board stuff we add is sure to do it correctly. Kevin From 4c5699a5feb1a037e1ae3147ca7d7e9fe3eb62c1 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 2 Sep 2011 11:00:12 -0700 Subject: [PATCH] OMAP: convert new boards to atag_offset These boards were added after the bulk converson from boot_params to atag_offset (queued for v3.2.) Fix them up. Signed-off-by: Kevin Hilman --- arch/arm/mach-omap2/board-omap3encore.c | 2 +- arch/arm/mach-omap2/board-omap4pcm049.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3encore.c b/arch/arm/mach-omap2/board-omap3encore.c index eb70fe1..07ed8ab 100644 --- a/arch/arm/mach-omap2/board-omap3encore.c +++ b/arch/arm/mach-omap2/board-omap3encore.c @@ -338,7 +338,7 @@ static void __init omap_encore_init(void) } MACHINE_START(ENCORE, "encore") - .boot_params = 0x80000100, + .atag_offset = 0x100, .reserve = omap_reserve, .map_io = omap3_map_io, .init_early = omap_encore_init_early, diff --git a/arch/arm/mach-omap2/board-omap4pcm049.c b/arch/arm/mach-omap2/board-omap4pcm049.c index d889110..260f2cb 100644 --- a/arch/arm/mach-omap2/board-omap4pcm049.c +++ b/arch/arm/mach-omap2/board-omap4pcm049.c @@ -578,7 +578,7 @@ static void __init pcm049_map_io(void) MACHINE_START(PCM049, "phyCORE OMAP4") /* Maintainer: Jan Weitzel - Phytec Messtechnik GmbH */ - .boot_params = 0x80000100, + .atag_offset = 0x100, .reserve = omap_reserve, .map_io = pcm049_map_io, .init_early = pcm049_init_early,