diff mbox

[RESEND,1/2] mx5: Remove unnecessary CONFIG_SYS_BOOTMAPSZ definition

Message ID 1304489597-26548-1-git-send-email-shawn.guo@linaro.org
State Accepted
Commit b78b40f6c08e0b6b160a75c62ab305e7ae0fa290
Headers show

Commit Message

Shawn Guo May 4, 2011, 6:13 a.m. UTC
Since the following commit, definition CONFIG_SYS_BOOTMAPSZ is not
needed any more.

  ed59e58786cae9f8afcb575649afc65985beed4d
  Remove device tree booting dependency on CONFIG_SYS_BOOTMAPSZ

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
Why resend?
The previous post does not apply on u-boot mainline, so rebase and
resend.

 include/configs/mx51evk.h |    1 -
 include/configs/mx53evk.h |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

Comments

Stefano Babic May 4, 2011, 8:04 a.m. UTC | #1
On 05/04/2011 08:13 AM, Shawn Guo wrote:
> With the following commit, CONFIG_OF_LIBFDT is redefined.
> 
>   2fa8ca98c37d5b1bb0328b19ddb7e9d162cd9683
>   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>

Hi Shawn,

> ---
>  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

Thanks to clean up this. Could you also drop the not needed "1" to the
other define ?

#define CONFIG_OF_LIBFDT                1

Should be:
#define CONFIG_OF_LIBFDT

Regards,
Stefano Babic
Shawn Guo May 4, 2011, 8:44 a.m. UTC | #2
On Wed, May 04, 2011 at 10:04:42AM +0200, Stefano Babic wrote:
> On 05/04/2011 08:13 AM, Shawn Guo wrote:
> > With the following commit, CONFIG_OF_LIBFDT is redefined.
> > 
> >   2fa8ca98c37d5b1bb0328b19ddb7e9d162cd9683
> >   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>
> 
> Hi Shawn,
> 
> > ---
> >  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
> 
> Thanks to clean up this. Could you also drop the not needed "1" to the
> other define ?
> 
> #define CONFIG_OF_LIBFDT                1
> 
> Should be:
> #define CONFIG_OF_LIBFDT
> 
As you can see from the commit below, 

  2fa8ca98c37d5b1bb0328b19ddb7e9d162cd9683
  Add CONFIG_OF_LIBFDT to more boards.

CONFIG_OF_LIBFDT was defined with '1' in all those files.

---
 include/configs/ca9x4_ct_vxp.h  |    2 ++
 include/configs/devkit8000.h    |    2 ++
 include/configs/efikamx.h       |    2 ++
 include/configs/igep0020.h      |    2 ++
 include/configs/igep0030.h      |    2 ++
 include/configs/mx51evk.h       |    2 ++
 include/configs/mx53evk.h       |    2 ++
 include/configs/omap3_overo.h   |    2 ++
 include/configs/omap3_pandora.h |    2 ++
 include/configs/omap3_sdp3430.h |    2 ++
 include/configs/omap3_zoom1.h   |    2 ++
 include/configs/omap3_zoom2.h   |    2 ++
 include/configs/omap4_panda.h   |    2 ++
 include/configs/omap4_sdp4430.h |    2 ++
 include/configs/tegra2-common.h |    1 +
 15 files changed, 29 insertions(+), 0 deletions(-)

If you really want to get this '1' removed, I would prefer to do it
globally with another patch.
Stefano Babic May 4, 2011, 8:50 a.m. UTC | #3
On 05/04/2011 10:44 AM, Shawn Guo wrote:

> As you can see from the commit below, 
> 
>   2fa8ca98c37d5b1bb0328b19ddb7e9d162cd9683
>   Add CONFIG_OF_LIBFDT to more boards.
> 
> CONFIG_OF_LIBFDT was defined with '1' in all those files.
> 
> ---
>  include/configs/ca9x4_ct_vxp.h  |    2 ++
>  include/configs/devkit8000.h    |    2 ++
>  include/configs/efikamx.h       |    2 ++
>  include/configs/igep0020.h      |    2 ++
>  include/configs/igep0030.h      |    2 ++
>  include/configs/mx51evk.h       |    2 ++
>  include/configs/mx53evk.h       |    2 ++
>  include/configs/omap3_overo.h   |    2 ++
>  include/configs/omap3_pandora.h |    2 ++
>  include/configs/omap3_sdp3430.h |    2 ++
>  include/configs/omap3_zoom1.h   |    2 ++
>  include/configs/omap3_zoom2.h   |    2 ++
>  include/configs/omap4_panda.h   |    2 ++
>  include/configs/omap4_sdp4430.h |    2 ++
>  include/configs/tegra2-common.h |    1 +
>  15 files changed, 29 insertions(+), 0 deletions(-)
> 
> If you really want to get this '1' removed, I would prefer to do it
> globally with another patch.

No, I agree with you. Better to fix globally in another patch.

Best regards,
Stefano Babic
Stefano Babic May 15, 2011, 2:31 p.m. UTC | #4
On 05/04/2011 08:13 AM, Shawn Guo wrote:
> Since the following commit, definition CONFIG_SYS_BOOTMAPSZ is not
> needed any more.
> 
>   ed59e58786cae9f8afcb575649afc65985beed4d
>   Remove device tree booting dependency on CONFIG_SYS_BOOTMAPSZ
> 
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---

Applied to -u-boot-imx, thanks.

Best regards,
Stefano Babic
diff mbox

Patch

diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 6a785f8..febe8d8 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -227,6 +227,5 @@ 
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
 #define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_BOOTMAPSZ   0x800000
 
 #endif
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 5749a08..74aee89 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -193,6 +193,5 @@ 
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
 #define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_BOOTMAPSZ   0x800000
 
 #endif				/* __CONFIG_H */