Patchwork [U-Boot] bootm: fix usage of lmb_reserve()

login
register
mail settings
Submitter Andreas Bießmann
Date April 3, 2012, 10:16 a.m.
Message ID <1333448187-7456-1-git-send-email-andreas.devel@googlemail.com>
Download mbox | patch
Permalink /patch/150374/
State Not Applicable
Headers show

Comments

Andreas Bießmann - April 3, 2012, 10:16 a.m.
From: Andreas Bießmann <biessmann@corscience.de>

commit 44f074c771c4b70d250b0d7ed2f7513488c678bb brakes compiling avr32 boards
which do not have CONFIG_LMB. This patch re-add the empty lmb_reserve() define
to opt-out respective code parts in do_bootm() and do_bootm_subcommand().

This patch fixes errors like this:
---8<---
cmd_bootm.c: In function 'do_bootm_subcommand':
cmd_bootm.c:518: error: 'bootm_headers_t' has no member named 'lmb'
cmd_bootm.c: In function 'do_bootm':
cmd_bootm.c:665: error: 'bootm_headers_t' has no member named 'lmb'
--->8---

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
---
 common/cmd_bootm.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Andreas Bießmann - April 3, 2012, 10:32 a.m.
Hi,

On 03.04.2012 12:16, Andreas Bießmann wrote:
> From: Andreas Bießmann <biessmann@corscience.de>
> 
> commit 44f074c771c4b70d250b0d7ed2f7513488c678bb brakes compiling avr32 boards
> which do not have CONFIG_LMB. This patch re-add the empty lmb_reserve() define
> to opt-out respective code parts in do_bootm() and do_bootm_subcommand().
> 
> This patch fixes errors like this:
> ---8<---
> cmd_bootm.c: In function 'do_bootm_subcommand':
> cmd_bootm.c:518: error: 'bootm_headers_t' has no member named 'lmb'
> cmd_bootm.c: In function 'do_bootm':
> cmd_bootm.c:665: error: 'bootm_headers_t' has no member named 'lmb'
> --->8---

again days to late and about half an hour unnecessary work ... should
really check ML more often.

http://patchwork.ozlabs.org/patch/149924/ was before.

> Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
> ---
>  common/cmd_bootm.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
> index 9ad2535..7d72c7a 100644
> --- a/common/cmd_bootm.c
> +++ b/common/cmd_bootm.c
> @@ -186,6 +186,8 @@ static void boot_start_lmb(bootm_headers_t *images)
>  	board_lmb_reserve(&images->lmb);
>  }
>  #else
> +/* we want to opt-out access to images.lmb by precompiler !*/

I would like to have some comment like this in the other patch.

regards

Andreas Bießmann
Marek Vasut - April 3, 2012, 1:43 p.m.
Dear Andreas Bießmann,

> Hi,
> 
> On 03.04.2012 12:16, Andreas Bießmann wrote:
> > From: Andreas Bießmann <biessmann@corscience.de>
> > 
> > commit 44f074c771c4b70d250b0d7ed2f7513488c678bb brakes compiling avr32
> > boards which do not have CONFIG_LMB. This patch re-add the empty
> > lmb_reserve() define to opt-out respective code parts in do_bootm() and
> > do_bootm_subcommand().
> > 
> > This patch fixes errors like this:
> > ---8<---
> > cmd_bootm.c: In function 'do_bootm_subcommand':
> > cmd_bootm.c:518: error: 'bootm_headers_t' has no member named 'lmb'
> > cmd_bootm.c: In function 'do_bootm':
> > cmd_bootm.c:665: error: 'bootm_headers_t' has no member named 'lmb'
> > --->8---
> 
> again days to late and about half an hour unnecessary work ... should
> really check ML more often.
> 
> http://patchwork.ozlabs.org/patch/149924/ was before.
> 
> > Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
> > ---
> > 
> >  common/cmd_bootm.c |    2 ++
> >  1 files changed, 2 insertions(+), 0 deletions(-)
> > 
> > diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
> > index 9ad2535..7d72c7a 100644
> > --- a/common/cmd_bootm.c
> > +++ b/common/cmd_bootm.c
> > @@ -186,6 +186,8 @@ static void boot_start_lmb(bootm_headers_t *images)
> > 
> >  	board_lmb_reserve(&images->lmb);
> >  
> >  }
> >  #else
> > 
> > +/* we want to opt-out access to images.lmb by precompiler !*/
> 
> I would like to have some comment like this in the other patch.

Errr ... I believe we should have a subsequent fix that removes the aftereffect 
of the macro altogether.

> 
> regards
> 
> Andreas Bießmann

Best regards,
Marek Vasut

Patch

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 9ad2535..7d72c7a 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -186,6 +186,8 @@  static void boot_start_lmb(bootm_headers_t *images)
 	board_lmb_reserve(&images->lmb);
 }
 #else
+/* we want to opt-out access to images.lmb by precompiler !*/
+# define lmb_reserve(lmb, base, size)
 static inline void boot_start_lmb(bootm_headers_t *images) { }
 #endif