From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bo Shen Date: Thu, 14 Mar 2013 18:25:15 +0800 Subject: [U-Boot] [PATCH] at91sam9260ek: move board id setup to config header In-Reply-To: <51418DF9.4080808@gmail.com> References: <1362932168-31180-1-git-send-email-andreas.devel@googlemail.com> <51412BDF.5060002@atmel.com> <51418DF9.4080808@gmail.com> Message-ID: <5141A58B.2060402@atmel.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Andreas, On 3/14/2013 16:44, Andreas Bie?mann wrote: > Hi Bo, > > On 03/14/2013 02:46 AM, Bo Shen wrote: >> On 3/11/2013 0:16, Andreas Bie?mann wrote: >>> Signed-off-by: Andreas Bie?mann >>> Cc: Bo Shen >> >> Acked-by: Bo Shen >> >>> --- >>> board/atmel/at91sam9260ek/at91sam9260ek.c | 12 ------------ >>> include/configs/at91sam9260ek.h | 20 ++++++++++++++++++++ >>> 2 files changed, 20 insertions(+), 12 deletions(-) >>> > > > >>> --- a/include/configs/at91sam9260ek.h >>> +++ b/include/configs/at91sam9260ek.h >>> @@ -125,6 +125,26 @@ >>> (ATMEL_BASE_SRAM1 + 0x1000 - GENERATED_GBL_DATA_SIZE) >>> #endif >>> >>> +/* >>> + * The (arm)linux board id set by generic code depending on >>> configured board >>> + * (see boards.cfg for different boards) >>> + */ >>> +#ifdef CONFIG_AT91SAM9G20 >>> + /* the sam9g20 variants have two different board ids */ >>> +# ifdef CONFIG_AT91SAM9G20EK_2MMC >>> + /* we may be setup for the 2MMC variant of at91sam9g20ek */ >>> +# define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9G20EK_2MMC >>> +# else >>> +# ifdef CONFIG_AT91SAM9G20EK >>> + /* or the normal at91sam9g20ek */ >>> +# define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9G20EK >>> +# endif >>> +# endif > > I think I'll generate a v2 here. It is safer to have: > > #ifdef AT91SAM9G20 > #ifdef 2MMC > // 2MMC > #else > // default for SAM9G20 > #endif > #else > // default for SAM9260 > #endif I agree. > Best regards > > Andreas Bie?mann > Best Regards, Bo Shen