Patchwork [U-Boot,1/1] DaVinci: Fix DM365 & DM644X build error

login
register
mail settings
Submitter Mohammed Afzal
Date Jan. 20, 2011, 11:27 a.m.
Message ID <1295522848-1490-1-git-send-email-afzal@ti.com>
Download mbox | patch
Permalink /patch/79673/
State Not Applicable
Headers show

Comments

Mohammed Afzal - Jan. 20, 2011, 11:27 a.m.
DM365 & DM644X builds 'davinci_emac_mii_mode_sel()',
which uses 'davinci_syscfg_regs' macro, and the
macro is valid iff CONFIG_SOC_DA8XX is defined.

Fix: Before compiling 'davinci_emac_mii_mode_sel()', make sure that
CONFIG_SOC_DA8XX is defined.

Signed-off-by: Mohammed Afzal <afzal@ti.com>
---
 board/davinci/common/misc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Albert ARIBAUD - Jan. 20, 2011, 10:02 p.m.
Le 20/01/2011 12:27, Mohammed Afzal a écrit :
> DM365&  DM644X builds 'davinci_emac_mii_mode_sel()',
> which uses 'davinci_syscfg_regs' macro, and the
> macro is valid iff CONFIG_SOC_DA8XX is defined.
>
> Fix: Before compiling 'davinci_emac_mii_mode_sel()', make sure that
> CONFIG_SOC_DA8XX is defined.
>
> Signed-off-by: Mohammed Afzal<afzal@ti.com>
> ---
>   board/davinci/common/misc.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/board/davinci/common/misc.c b/board/davinci/common/misc.c
> index 08c898f..c0a6c41 100644
> --- a/board/davinci/common/misc.c
> +++ b/board/davinci/common/misc.c
> @@ -80,7 +80,7 @@ err:
>   /*
>    * Set the mii mode as MII or RMII
>    */
> -#if defined(CONFIG_DRIVER_TI_EMAC)
> +#if defined(CONFIG_DRIVER_TI_EMAC)&&  defined(CONFIG_SOC_DA8XX)
>   void davinci_emac_mii_mode_sel(int mode_sel)
>   {
>   	int val;

Seems this is already fixed by commit 
51861a953aa10fde5c861ca022f0833f326e3041 which is in u-boot-ti/master, 
right?

Amicalement,
Sandeep Paulraj - Jan. 20, 2011, 11:57 p.m.
> 
> Seems this is already fixed by commit
> 51861a953aa10fde5c861ca022f0833f326e3041 which is in u-boot-ti/master,
> right?
> 
Yes that is correct I believe. Before my vacation I was getting the entire Davinci series of SOCs compiling as they were broken for various reasons and this is one of the fixes I had made IIRC.

This commit should be in u-boot-arm/master as well

--Sandeep

Patch

diff --git a/board/davinci/common/misc.c b/board/davinci/common/misc.c
index 08c898f..c0a6c41 100644
--- a/board/davinci/common/misc.c
+++ b/board/davinci/common/misc.c
@@ -80,7 +80,7 @@  err:
 /*
  * Set the mii mode as MII or RMII
  */
-#if defined(CONFIG_DRIVER_TI_EMAC)
+#if defined(CONFIG_DRIVER_TI_EMAC) && defined(CONFIG_SOC_DA8XX)
 void davinci_emac_mii_mode_sel(int mode_sel)
 {
 	int val;