From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Warren Date: Thu, 01 Mar 2012 14:32:16 -0700 Subject: [U-Boot] [PATCH 3/3] ARM: Update mach-types In-Reply-To: <1330636394-25173-3-git-send-email-troy.kisky@boundarydevices.com> References: <1330636394-25173-1-git-send-email-troy.kisky@boundarydevices.com> <1330636394-25173-3-git-send-email-troy.kisky@boundarydevices.com> Message-ID: <4F4FEAE0.4050704@nvidia.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 03/01/2012 02:13 PM, Troy Kisky wrote: > This updates u-boot to the same as the Dec 6, 2011 > mach-types upate to Linux. > diff --git a/include/configs/ventana.h b/include/configs/ventana.h > #define CONFIG_MACH_VENTANA > +/* > + * FIXME: This belongs in mach-types.h. However, we only pull mach-types > + * from Linus' kernel.org tree. > + */ > +#include > +#ifdef MACH_TYPE_VENTANA > +#error "MACH_TYPE_VENTANA has been defined properly, please remove this." > +#else > +#define MACH_TYPE_VENTANA 2927 > +#ifdef CONFIG_MACH_VENTANA > +# define machine_is_ventana() (MACH_TYPE_VENTANA == MACH_TYPE_VENTANA) > +#else > +# define machine_is_ventana() (0) > +#endif > +#endif I'm curious how Seaboard still builds after this change; presumably ventana.h isn't included in the Seaboard build because the build isn't for Ventana, yet without ventana.h included, machine_is_ventana() doesn't exist. -- nvpublic