[2/2] Fix CONFIG_OF_LIBFDT redefined warning

Message ID 1302509364-22278-2-git-send-email-shawn.guo@linaro.org
State New
Headers show

Commit Message

Shawn Guo April 11, 2011, 8:09 a.m.
With the following commit, CONFIG_OF_LIBFDT was redefined.

    a8f88eedb2c4df472e512db58dfcaafd82c68b86
    Add CONFIG_OF_LIBFDT to more boards.

Remove the duplicated definition to fix CONFIG_OF_LIBFDT redefined
warning.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 include/configs/mx51evk.h |    2 --
 include/configs/mx53evk.h |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

Comments

John Rigby April 11, 2011, 2:41 p.m. | #1
On Mon, Apr 11, 2011 at 2:09 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> With the following commit, CONFIG_OF_LIBFDT was redefined.
>
>    a8f88eedb2c4df472e512db58dfcaafd82c68b86
>    Add CONFIG_OF_LIBFDT to more boards.
>
> Remove the duplicated definition to fix CONFIG_OF_LIBFDT redefined
> warning.
>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
>  include/configs/mx51evk.h |    2 --
>  include/configs/mx53evk.h |    2 --
>  2 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
> index febe8d8..207b20c 100644
> --- a/include/configs/mx51evk.h
> +++ b/include/configs/mx51evk.h
> @@ -226,6 +226,4 @@
>  #define CONFIG_ENV_IS_IN_MMC
>  #define CONFIG_SYS_MMC_ENV_DEV 0
>
> -#define CONFIG_OF_LIBFDT
> -
>  #endif
> diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
> index 74aee89..78122a7 100644
> --- a/include/configs/mx53evk.h
> +++ b/include/configs/mx53evk.h
> @@ -192,6 +192,4 @@
>  #define CONFIG_ENV_IS_IN_MMC
>  #define CONFIG_SYS_MMC_ENV_DEV 0
>
> -#define CONFIG_OF_LIBFDT
> -
>  #endif                         /* __CONFIG_H */
> --
> 1.7.4.1
>
>

Is this going upstream?  When it does I will get it.
Shawn Guo April 11, 2011, 3:45 p.m. | #2
On Mon, Apr 11, 2011 at 08:41:22AM -0600, John Rigby wrote:
> On Mon, Apr 11, 2011 at 2:09 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> > With the following commit, CONFIG_OF_LIBFDT was redefined.
> >
> >    a8f88eedb2c4df472e512db58dfcaafd82c68b86
> >    Add CONFIG_OF_LIBFDT to more boards.
> >
> > Remove the duplicated definition to fix CONFIG_OF_LIBFDT redefined
> > warning.
> >
> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> > ---
> >  include/configs/mx51evk.h |    2 --
> >  include/configs/mx53evk.h |    2 --
> >  2 files changed, 0 insertions(+), 4 deletions(-)
> >
> > diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
> > index febe8d8..207b20c 100644
> > --- a/include/configs/mx51evk.h
> > +++ b/include/configs/mx51evk.h
> > @@ -226,6 +226,4 @@
> >  #define CONFIG_ENV_IS_IN_MMC
> >  #define CONFIG_SYS_MMC_ENV_DEV 0
> >
> > -#define CONFIG_OF_LIBFDT
> > -
> >  #endif
> > diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
> > index 74aee89..78122a7 100644
> > --- a/include/configs/mx53evk.h
> > +++ b/include/configs/mx53evk.h
> > @@ -192,6 +192,4 @@
> >  #define CONFIG_ENV_IS_IN_MMC
> >  #define CONFIG_SYS_MMC_ENV_DEV 0
> >
> > -#define CONFIG_OF_LIBFDT
> > -
> >  #endif                         /* __CONFIG_H */
> > --
> > 1.7.4.1
> >
> >
> 
> Is this going upstream?  When it does I will get it.
> 
I have to wait for the ancestors showing up on mainline.  I'm seeing
them on linaro u-boot tree, but not mainline.  Correct me if I'm
wrong.
John Rigby April 11, 2011, 4:05 p.m. | #3
Ok, I'll put your  patches in linaro-stable.  Let me know if the
versions that make in upstream turn out to be different.

On Mon, Apr 11, 2011 at 9:45 AM, Shawn Guo <shawn.guo@freescale.com> wrote:
> On Mon, Apr 11, 2011 at 08:41:22AM -0600, John Rigby wrote:
>> On Mon, Apr 11, 2011 at 2:09 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
>> > With the following commit, CONFIG_OF_LIBFDT was redefined.
>> >
>> >    a8f88eedb2c4df472e512db58dfcaafd82c68b86
>> >    Add CONFIG_OF_LIBFDT to more boards.
>> >
>> > Remove the duplicated definition to fix CONFIG_OF_LIBFDT redefined
>> > warning.
>> >
>> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
>> > ---
>> >  include/configs/mx51evk.h |    2 --
>> >  include/configs/mx53evk.h |    2 --
>> >  2 files changed, 0 insertions(+), 4 deletions(-)
>> >
>> > diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
>> > index febe8d8..207b20c 100644
>> > --- a/include/configs/mx51evk.h
>> > +++ b/include/configs/mx51evk.h
>> > @@ -226,6 +226,4 @@
>> >  #define CONFIG_ENV_IS_IN_MMC
>> >  #define CONFIG_SYS_MMC_ENV_DEV 0
>> >
>> > -#define CONFIG_OF_LIBFDT
>> > -
>> >  #endif
>> > diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
>> > index 74aee89..78122a7 100644
>> > --- a/include/configs/mx53evk.h
>> > +++ b/include/configs/mx53evk.h
>> > @@ -192,6 +192,4 @@
>> >  #define CONFIG_ENV_IS_IN_MMC
>> >  #define CONFIG_SYS_MMC_ENV_DEV 0
>> >
>> > -#define CONFIG_OF_LIBFDT
>> > -
>> >  #endif                         /* __CONFIG_H */
>> > --
>> > 1.7.4.1
>> >
>> >
>>
>> Is this going upstream?  When it does I will get it.
>>
> I have to wait for the ancestors showing up on mainline.  I'm seeing
> them on linaro u-boot tree, but not mainline.  Correct me if I'm
> wrong.
>
> --
> Regards,
> Shawn
>
>

Patch

diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index febe8d8..207b20c 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -226,6 +226,4 @@ 
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
-#define CONFIG_OF_LIBFDT
-
 #endif
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 74aee89..78122a7 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -192,6 +192,4 @@ 
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
-#define CONFIG_OF_LIBFDT
-
 #endif				/* __CONFIG_H */