[U-Boot] [PATCH 1/5][v2] powerpc/mpc85xx:No NOR boot, do not compile IFC errata A003399

[Prabhakar Kushwaha <prabhakar@freescale.com>]

On 04/09/2013 06:09 AM, Scott Wood wrote:
> On 04/05/2013 09:28:14 PM, Prabhakar Kushwaha wrote:
>> On 04/06/2013 02:03 AM, Scott Wood wrote:
>>> On 03/22/2013 02:07:48 AM, Prabhakar Kushwaha wrote:
>>>> IFC errata A003399 is valid for IFC NOR boot i.e.if no on-board NOR 
>>>> flash or
>>>> no NOR boot, do not compile its workaround.
>>>>
>>>> Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
>>>> ---
>>>>  Based upon git://git.denx.de/u-boot.git branch master
>>>>  Changes for v2:
>>>>      - Add CONFIG_A003399_NOR_WORKAROUND for errata workaround
>>>>     - Add CONFIG_A003399_NOR_WORKAROUND in README
>>>>
>>>>  README                                    |    4 ++++
>>>>  arch/powerpc/cpu/mpc85xx/cpu_init_early.c |    9 ++++++---
>>>>  arch/powerpc/cpu/mpc8xxx/fsl_ifc.c        |    2 +-
>>>>  3 files changed, 11 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/README b/README
>>>> index 7f2506a..c4ad69d 100644
>>>> --- a/README
>>>> +++ b/README
>>>> @@ -414,6 +414,10 @@ The following options need to be configured:
>>>>          See Freescale App Note 4493 for more information about
>>>>          this erratum.
>>>>
>>>> +        CONFIG_A003399_NOR_WORKAROUND
>>>> +        Enables a workaround for IFC erratum A003399. It is only
>>>> +        requred during NOR boot.
>>>> +
>>>>          CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY
>>>>
>>>>          This is the value to write into CCSR offset 0x18600
>>>> diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c 
>>>> b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
>>>> index dacfdd1..3a4bfc5 100644
>>>> --- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
>>>> +++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
>>>> @@ -25,7 +25,8 @@
>>>>
>>>>  DECLARE_GLOBAL_DATA_PTR;
>>>>
>>>> -#if defined(CONFIG_SYS_FSL_ERRATUM_IFC_A003399) && 
>>>> !defined(CONFIG_SYS_RAMBOOT)
>>>> +#if defined(CONFIG_SYS_FSL_ERRATUM_IFC_A003399)\
>>>> +    && defined(CONFIG_A003399_NOR_WORKAROUND)
>>>
>>> Why would CONFIG_A003399_NOR_WORKAROUND be enabled if 
>>> CONFIG_SYS_FSL_ERRATUM_IFC_A003399 isn't?
>>
>>
>> originally i tried the same but it did not work. As P1010RDB.h does 
>> not include config_mpc85xx.h.   Only arch/powerpc/cpu/mpc85xx/*.c 
>> files includes both P1010RDB.h and config_mpc85xx.h
>
> Can you add #include <config.h> in P1010RDB.h near the top, but after 
> the symbols that config_mpc85xx.h depends on (which I think is just 
> CONFIG_P1010)?
I need to add config_mpc85xx.h here.

  #define CONFIG_MPC85xx
  #define CONFIG_FSL_IFC                 /* Enable IFC Support */
  #define CONFIG_SYS_HAS_SERDES          /* common SERDES init code */
+#include "../../arch/powerpc/include/asm/config_mpc85xx.h"

I tried just after CONFIG_P1010 but it is giving compilation error.

Just to mention, I need to provide relative path in order to compile.
I will still suggest to keep original patch, As header file location may 
change over period of time then config file needs to be updated again.

Regards,
Prabhakar