[PATCH] Consolidate XILINX_VIRTEX board support

[Peter Korsgaard]

>>>>> "WR" == Wolfgang Reissnegger <wolfgang.reissnegger at xilinx.com> writes:

Hi,

WR> diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
WR> index 5b87779..05631fe 100644
WR> --- a/arch/ppc/boot/simple/Makefile
WR> +++ b/arch/ppc/boot/simple/Makefile
WR> @@ -187,8 +187,7 @@ boot-$(CONFIG_REDWOOD_6)	+= embed_config.o
WR>  boot-$(CONFIG_8xx)		+= embed_config.o
WR>  boot-$(CONFIG_8260)		+= embed_config.o
WR>  boot-$(CONFIG_EP405)		+= embed_config.o
WR> -boot-$(CONFIG_XILINX_ML300)	+= embed_config.o
WR> -boot-$(CONFIG_XILINX_ML403)	+= embed_config.o
WR> +boot-$(CONFIG_XILINX_VIRTEX)	+= embed_config.o

Don't do that. Other boards with Xilinx FPGAs don't necessarily need
embed_config.c

WR>  boot-$(CONFIG_BSEIP)		+= iic.o
WR>  boot-$(CONFIG_MBX)		+= iic.o pci.o qspan_pci.o
WR>  boot-$(CONFIG_MV64X60)		+= misc-mv64x60.o
WR> diff --git a/arch/ppc/boot/simple/embed_config.c b/arch/ppc/boot/simple/embed_config.c
WR> index 840bff2..e0b8954 100644
WR> --- a/arch/ppc/boot/simple/embed_config.c
WR> +++ b/arch/ppc/boot/simple/embed_config.c
WR> @@ -744,7 +744,7 @@ embed_config(bd_t **bdp)
WR>  }
WR>  #endif /* WILLOW */
 
WR> -#if defined(CONFIG_XILINX_ML300) || defined(CONFIG_XILINX_ML403)
WR> +#if defined(CONFIG_XILINX_VIRTEX)
WR>  void
WR>  embed_config(bd_t ** bdp)

.. And if they do, they might have another embed_config (E.G. if the
bootloader provides a valid struct bd_t).

-- 
Bye, Peter Korsgaard