From: Vaibhav Hiremath <hvaibhav@ti.com>
To: Tony Lindgren <tony@atomide.com>, linux-omap@vger.kernel.org
Subject: FYI: Merge issue with linux-omap/master (due to merge 'omap-cleanup-for-v3.5')
Date: Thu, 28 Jun 2012 19:58:35 +0530 [thread overview]
Message-ID: <4FEC6A13.3020903@ti.com> (raw)
Hi Tony,
Looks like we have an issue with the merge from branch
"omap-cleanup-for-v3.5",
Patch (ARM: OMAP2+: am33xx: Make am33xx as a separate class) changes
AM335X_CLASS to value 0x33500033 and then later merge commit (Merge tag
'omap-cleanup-for-v3.5' into tmp-merge) reverts it back to 0x33500034.
Due to this Kernel doesn't boot on BeagleBone platform, below change is
required to boot it.
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -396,7 +394,7 @@ IS_OMAP_TYPE(3430, 0x3430)
#define AM35XX_REV_ES1_0 AM35XX_CLASS
#define AM35XX_REV_ES1_1 (AM35XX_CLASS | (0x1 << 8))
-#define AM335X_CLASS 0x33500034
+#define AM335X_CLASS 0x33500033
Thanks,
Vaibhav
reply other threads:[~2012-06-28 14:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=4FEC6A13.3020903@ti.com \
--to=hvaibhav@ti.com \
--cc=linux-omap@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.