[U-Boot] [PATCH] Repair build failure in case PPC is not defined and FIT is beng used.

Wolfgang Denk
2009-10-29T10:53:17Z

Dear Remy Bohmer,

please pay a little more attention to the commit subjects (here:
s/beng/being/, please); also, make sure the subject is short enough
for a commit message title line.

In message <1256764421-27799-7-git-send-email-linux@bohmer.net> you wrote:
> Signed-off-by: Remy Bohmer <linux@bohmer.net>
> ---
> common/cmd_bootm.c | 2 +-
> common/image.c | 2 ++
> 2 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
> index 8f83598..32fd9bb 100644
> --- a/common/cmd_bootm.c
> +++ b/common/cmd_bootm.c
> @@ -524,7 +524,7 @@ int do_bootm_subcommand (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
> }
> break;
> #endif
> -#ifdef CONFIG_OF_LIBFDT
> +#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_SYS_BOOTMAPSZ)
> case BOOTM_STATE_FDT:
> {
> ulong bootmap_base = getenv_bootm_low();
> diff --git a/common/image.c b/common/image.c
> index 6eaf41e..41b584d 100644
> --- a/common/image.c
> +++ b/common/image.c
> @@ -1506,9 +1506,11 @@ int boot_get_fdt (int flag, int argc, char *argv[], bootm_headers_t *images,
> fdt_blob = (char *)data;
> }
>
> +#if defined(CONFIG_PPC)
> images->fit_hdr_fdt = fit_hdr;
> images->fit_uname_fdt = fit_uname_fdt;
> images->fit_noffset_fdt = fdt_noffset;
> +#endif

NAK. This code is in no way dependent on the Power architecture, so
CONFIG_PPC is definitly the wrong thing to check for.

Best regards,

Wolfgang Denk

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The years of peak mental activity are undoubtedly between the ages of
four and eighteen. At four we know all the questions, at eighteen all
the answers.