On Tue, Dec 11, 2012 at 11:59:27AM +0100, Jan Luebbe wrote: > From: Teresa Gámez <t.gamez@xxxxxxxxx> > > Created ARCH for AM33xx boards as second stage bootloader. > This includes: > - Added dmtimer0 > - Created basic header files > - Added MMC support for ARCH_AM33XX > - Added reset function > > Signed-off-by: Teresa Gámez <t.gamez@xxxxxxxxx> > [...] > diff --git a/arch/arm/mach-omap/include/mach/clocks.h b/arch/arm/mach-omap/include/mach/clocks.h > index 9e47a9e..ed1b368 100644 > --- a/arch/arm/mach-omap/include/mach/clocks.h > +++ b/arch/arm/mach-omap/include/mach/clocks.h > @@ -46,5 +46,8 @@ > #ifdef CONFIG_ARCH_OMAP4 > #include <mach/omap4-clock.h> > #endif > +#ifdef CONFIG_ARCH_AM33XX > +#include <mach/am33xx-clock.h> > +#endif We should really get rid of such things. Compiling for different SoCs by creating conflicting defines is easy first and very painful later. Please clean this up before more SoCs are added. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox