[U-Boot] [PATCH] [ARM] Moved conditional compile into Makefile

[Jean-Christophe PLAGNIOL-VILLARD]

On 14:30 Mon 08 Sep     , Andreas Engel wrote:
> 
> Signed-off-by: Andreas Engel <andreas.engel at ericsson.com>
> ---
>  README                         |    4 ++--
>  drivers/serial/Makefile        |    3 ++-
>  drivers/serial/serial_pl01x.c  |   15 +++++----------
>  include/configs/integratorap.h |    2 +-
>  include/configs/integratorcp.h |    2 +-
>  include/configs/versatile.h    |    2 +-
>  6 files changed, 12 insertions(+), 16 deletions(-)
> 
> diff --git a/README b/README
> index 37449d1..4daff33 100644
> --- a/README
> +++ b/README
> @@ -380,11 +380,11 @@ The following options need to be configured:
>  		param header, the default value is zero if undefined.
> 
>  - Serial Ports:
> -		CFG_PL010_SERIAL
> +		CONFIG_PL010_SERIAL
> 
>  		Define this if you want support for Amba PrimeCell PL010 UARTs.
> 
> -		CFG_PL011_SERIAL
> +		CONFIG_PL011_SERIAL
> 
>  		Define this if you want support for Amba PrimeCell PL011 UARTs.
> 
> diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
> index 3cc1999..b370828 100644
> --- a/drivers/serial/Makefile
> +++ b/drivers/serial/Makefile
> @@ -33,7 +33,8 @@ COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
>  COBJS-$(CONFIG_S3C64XX) += s3c64xx.o
>  COBJS-y += serial.o
>  COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
> -COBJS-y += serial_pl01x.o
> +COBJS-$(CONFIG_PL010_SERIAL) += serial_pl01x.o
> +COBJS-$(CONFIG_PL011_SERIAL) += serial_pl01x.o

what append if CONFIG_PL010_SERIAL and CONFIG_PL011_SERIAL is active at the
same time?

serial_pl01x.c will be compile twice

so please move to 
+COBJS-$(CONFIG_PL010_SERIAL)$(CONFIG_PL011_SERIAL) += serial_pl01x.o

Best Regards,
J.