From: Kevin Hilman <khilman@ti.com>
To: Tony Lindgren <tony@atomide.com>
Cc: linux-omap <linux-omap@vger.kernel.org>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
Nicolas Pitre <nicolas.pitre@linaro.org>
Subject: testing-board branch: rebase to RMK's devel-stable?
Date: Fri, 02 Sep 2011 11:06:52 -0700 [thread overview]
Message-ID: <87vcta7r9f.fsf@ti.com> (raw)
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 <khilman@ti.com>
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 <khilman@ti.com>
---
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,
--
1.7.6
next reply other threads:[~2011-09-02 18:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-02 18:06 Kevin Hilman [this message]
2011-09-02 18:47 ` testing-board branch: rebase to RMK's devel-stable? Nicolas Pitre
2011-09-02 18:58 ` Nicolas Pitre
2011-09-05 10:31 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87vcta7r9f.fsf@ti.com \
--to=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=nicolas.pitre@linaro.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox