* FYI: Merge issue with linux-omap/master (due to merge 'omap-cleanup-for-v3.5')
@ 2012-06-28 14:28 Vaibhav Hiremath
0 siblings, 0 replies; only message in thread
From: Vaibhav Hiremath @ 2012-06-28 14:28 UTC (permalink / raw)
To: Tony Lindgren, linux-omap
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-06-28 14:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-28 14:28 FYI: Merge issue with linux-omap/master (due to merge 'omap-cleanup-for-v3.5') Vaibhav Hiremath
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).