From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Sat, 19 Nov 2011 10:00:35 -0800 Subject: [U-Boot] [PATCH 6/9] ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 In-Reply-To: <1321703956-4224-7-git-send-email-agust@denx.de> References: <1321703956-4224-1-git-send-email-agust@denx.de> <1321703956-4224-7-git-send-email-agust@denx.de> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Sat, Nov 19, 2011 at 3:59 AM, Anatolij Gustschin wrote: > MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 were removed > from mach-types.h. Add them to the board config file. > > Signed-off-by: Anatolij Gustschin I built this and it fixes the failure. I did not test on hardware. Acked-by: Simon Glass > --- > ?board/calao/tny_a9260/tny_a9260.c | ? ?5 ----- > ?include/configs/tny_a9260.h ? ? ? | ? ?4 ++++ > ?2 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/board/calao/tny_a9260/tny_a9260.c b/board/calao/tny_a9260/tny_a9260.c > index ab51a33..a472b91 100644 > --- a/board/calao/tny_a9260/tny_a9260.c > +++ b/board/calao/tny_a9260/tny_a9260.c > @@ -86,11 +86,6 @@ int board_init(void) > ? ? ? ?/* Enable Ctrlc */ > ? ? ? ?console_init_f(); > > -#if defined(CONFIG_TNY_A9260) > - ? ? ? gd->bd->bi_arch_number = MACH_TYPE_TNY_A9260; > -#elif defined(CONFIG_TNY_A9G20) > - ? ? ? gd->bd->bi_arch_number = MACH_TYPE_TNY_A9G20; > -#endif > ? ? ? ?/* adress of boot parameters */ > ? ? ? ?gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; > > diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h > index 986aeba..c632de6 100644 > --- a/include/configs/tny_a9260.h > +++ b/include/configs/tny_a9260.h > @@ -45,8 +45,12 @@ > ?/* Define actual evaluation board type from used processor type */ > ?#ifdef CONFIG_AT91SAM9G20 > ?# define CONFIG_TNY_A9G20 > +# define MACH_TYPE_TNY_A9G20 ? ? ? ? ? 2059 > +# define CONFIG_MACH_TYPE ? ? ? ? ? ? ?MACH_TYPE_TNY_A9G20 > ?#else > ?# define CONFIG_TNY_A9260 > +# define MACH_TYPE_TNY_A9260 ? ? ? ? ? 2058 > +# define CONFIG_MACH_TYPE ? ? ? ? ? ? ?MACH_TYPE_TNY_A9260 > ?#endif Seems odd to me to have the #define MACH_TYPE_TNY_ inside the #ifdef also, but ok. > > ?/* ARM asynchronous clock */ > -- > 1.7.5.4 > > _______________________________________________ > U-Boot mailing list > U-Boot at lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot >