Current state of AM33xx patches

[Paul Walmsley]

On Wed, 27 Jun 2012, Hiremath, Vaibhav wrote:

> On Thu, Jun 28, 2012 at 00:01:06, Paul Walmsley wrote:
> > On Wed, 27 Jun 2012, Hiremath, Vaibhav wrote:
> > 
> > The branch used was your am335x-upstream-staging branch, plus a minor 
> > patch to allow the kernel to build on an am335x-only config (although for 
> > the purposes of this test, omap2plus_defconfig was used).
>
> Something seems to be wrong here???
> The HEAD is,
> 
> commit 67e686682dc286d90a0ed47b7dc68fb54944d3d9
> Author: AnilKumar Ch <anilkumar at ti.com>
> Date:   Thu Jun 21 12:33:58 2012 +0530
> 
>     arm/dts: Add support for AM335x BeagleBone

As I wrote earlier, there's an extra patch on there to get a kernel built 
with an AM33xx-only config to link, used here for build testing.  It 
shouldn't affect the kernel's ability to start at all.  It's included 
below.


- Paul

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index d09ccc1..e6f4117 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -385,8 +385,12 @@ void __init omap2430_init_late(void)
 /*
  * Currently only board-omap3beagle.c should call this because of the
  * same machine_id for 34xx and 36xx beagle.. Will get fixed with DT.
+ *
+ * XXX Due to the fact that the 33xx machine_init section is incorrectly
+ * incorporated as part of an AM35xx board file, we had to expand the
+ * following test to include CONFIG_SOC_AM33XX :-(
  */
-#ifdef CONFIG_SOC_OMAP3430
+#if defined(CONFIG_SOC_OMAP3430) || defined(CONFIG_SOC_AM33XX)
 void __init omap3_init_early(void)
 {
        omap2_set_globals_3xxx();