Patchwork [U-Boot] cmd:spl:fix: Prevent from a build error on boards, which don't support FDT

login
register
mail settings
Submitter Łukasz Majewski
Date Dec. 6, 2012, 3:23 p.m.
Message ID <1354807418-11509-1-git-send-email-l.majewski@samsung.com>
Download mbox | patch
Permalink /patch/204281/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Łukasz Majewski - Dec. 6, 2012, 3:23 p.m.
Do not compile in FDT related code, when it is not supported.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
 common/cmd_spl.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Stefano Babic - Dec. 6, 2012, 3:33 p.m.
On 06/12/2012 16:23, Lukasz Majewski wrote:
> Do not compile in FDT related code, when it is not supported.
> 
> Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
>  common/cmd_spl.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/common/cmd_spl.c b/common/cmd_spl.c
> index 9ec054a..e3c543b 100644
> --- a/common/cmd_spl.c
> +++ b/common/cmd_spl.c
> @@ -130,10 +130,12 @@ static int spl_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
>  		if (call_bootm(argc, argv, subcmd_list[(int)c->cmd]))
>  			return -1;
>  		switch ((int)c->cmd) {
> +#ifdef CONFIG_OF_LIBFDT
>  		case SPL_EXPORT_FDT:
>  			printf("Argument image is now in RAM: 0x%p\n",
>  				(void *)images.ft_addr);
>  			break;
> +#endif
>  		case SPL_EXPORT_ATAGS:
>  			printf("Argument image is now in RAM at: 0x%p\n",
>  				(void *)gd->bd->bi_boot_params);
> 

Acked-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic
Tom Rini - Dec. 12, 2012, 1:15 p.m.
On Thu, Dec 06, 2012 at 04:33:33PM +0100, Stefano Babic wrote:
> On 06/12/2012 16:23, Lukasz Majewski wrote:
> > Do not compile in FDT related code, when it is not supported.
> > 
> > Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> > ---
> >  common/cmd_spl.c |    2 ++
> >  1 files changed, 2 insertions(+), 0 deletions(-)
> > 
> > diff --git a/common/cmd_spl.c b/common/cmd_spl.c
> > index 9ec054a..e3c543b 100644
> > --- a/common/cmd_spl.c
> > +++ b/common/cmd_spl.c
> > @@ -130,10 +130,12 @@ static int spl_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
> >  		if (call_bootm(argc, argv, subcmd_list[(int)c->cmd]))
> >  			return -1;
> >  		switch ((int)c->cmd) {
> > +#ifdef CONFIG_OF_LIBFDT
> >  		case SPL_EXPORT_FDT:
> >  			printf("Argument image is now in RAM: 0x%p\n",
> >  				(void *)images.ft_addr);
> >  			break;
> > +#endif
> >  		case SPL_EXPORT_ATAGS:
> >  			printf("Argument image is now in RAM at: 0x%p\n",
> >  				(void *)gd->bd->bi_boot_params);
> > 
> 
> Acked-by: Stefano Babic <sbabic@denx.de>

Applied to u-boot/master, thanks!

Patch

diff --git a/common/cmd_spl.c b/common/cmd_spl.c
index 9ec054a..e3c543b 100644
--- a/common/cmd_spl.c
+++ b/common/cmd_spl.c
@@ -130,10 +130,12 @@  static int spl_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		if (call_bootm(argc, argv, subcmd_list[(int)c->cmd]))
 			return -1;
 		switch ((int)c->cmd) {
+#ifdef CONFIG_OF_LIBFDT
 		case SPL_EXPORT_FDT:
 			printf("Argument image is now in RAM: 0x%p\n",
 				(void *)images.ft_addr);
 			break;
+#endif
 		case SPL_EXPORT_ATAGS:
 			printf("Argument image is now in RAM at: 0x%p\n",
 				(void *)gd->bd->bi_boot_params);