[U-Boot] [patch] u-boot powerpc build error

[Scott Wood]

On Wed, 12 Jan 2011 13:47:08 +0900
gmane <goweol at gmail.com> wrote:

> Hello,
> 
> I met this error (use GNU make 3.80).

"else ifdef" appears to be new in make 3.81.

> $ make MPC885ADS_config
> $ make
> /home/namsh/work/u-boot/arch/powerpc/config.mk:35: Extraneous text after 
> `else' directive
> /home/namsh/work/u-boot/arch/powerpc/config.mk:37: *** only one `else' 
> per conditional.  Stop.
> 
> Regards,
> namsh
> 
> diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk
> index 2912604..5eeba9a 100644
> --- a/arch/powerpc/config.mk
> +++ b/arch/powerpc/config.mk
> @@ -32,13 +32,15 @@ PLATFORM_LDFLAGS  += -n --gc-sections
>   ifdef CONFIG_SYS_LDSCRIPT
>   # need to strip off double quotes
>   LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT))
> -else ifdef CONFIG_NAND_SPL
> +else
> +ifdef CONFIG_NAND_SPL
>   LDSCRIPT := $(SRCTREE)/$(CONFIG_BOARDDIR)/u-boot-nand.lds
>   else
>   ifneq ($(wildcard $(SRCTREE)/arch/powerpc/cpu/$(CPU)/u-boot.lds),)
>   LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/$(CPU)/u-boot.lds
>   endif
>   endif
> +endif

Shouldn't CONFIG_SYS_LDSCRIPT override only the main U-boot's linker
script, not the NAND SPL?  It's unlikely that the same linker
script would be used for both.

If the NAND SPL linker script needs to be overridden (probably
unlikely), it would need CONFIG_SYS_LDSCRIPT_SPL, similar to
CONFIG_SYS_TEXT_BASE_SPL.

I know this isn't your change, but this is where I noticed it. :-)

-Scott