Re: [Qemu-devel] [PATCH 07/47] hw/arm/Makefile.objs: CONFIG_* created for each board

[Peter Maydell]

On 25 August 2013 23:58, Ákos Kovács <address@hidden> wrote:
> The new CONFIG_* definitions added to the default-configs/arm-softmmu.mak
> Signed-off-by: Ákos Kovács <address@hidden>
> ---
>  default-configs/arm-softmmu.mak |   13 +++++++++++++
>  hw/arm/Makefile.objs            |   35 ++++++++++++++++++++++++++++-------
>  2 files changed, 41 insertions(+), 7 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index d13bc2b..885b0c1 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -79,3 +79,16 @@ CONFIG_VERSATILE_PCI=y
>  CONFIG_VERSATILE_I2C=y
>
>  CONFIG_SDHCI=y
> +
> +CONFIG_COLLIE=y
> +CONFIG_GUMSTIX=y
> +CONFIG_HIGHBANK=y
> +CONFIG_INTEGRATORCP=y
> +CONFIG_KZM=y
> +CONFIG_MUSICPAL=y
> +CONFIG_PALM=y
> +CONFIG_SPITZ=y
> +CONFIG_TOSA=y
> +CONFIG_VERSATILEPB=y
> +CONFIG_VXPRESS=y

VEXPRESS.

> +CONFIG_Z2=y
> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
> index 3671b42..fa0eabf 100644
> --- a/hw/arm/Makefile.objs
> +++ b/hw/arm/Makefile.objs
> @@ -1,7 +1,28 @@
> -obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o
> -obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o
> -obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o
> -obj-y += tosa.o versatilepb.o vexpress.o xilinx_zynq.o z2.o
> -
> -obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o
> -obj-y += omap1.o omap2.o strongarm.o
> +obj-y += boot.o
> +obj-$(CONFIG_COLLIE)   += collie.o
> +obj-$(CONFIG_EXYNOS4)  += exynos4_boards.o
> +obj-$(CONFIG_EXYNOS4) += exynos4210.o
> +obj-$(CONFIG_GUMSTIX)  += gumstix.o
> +obj-$(CONFIG_HIGHBANK) += highbank.o
> +obj-$(CONFIG_INTEGRATORCP) += integratorcp.o
> +obj-$(CONFIG_KZM)      += kzm.o
> +obj-$(CONFIG_MAINSTONE)+= mainstone.o
> +obj-$(CONFIG_MUSICPAL) += musicpal.o
> +obj-$(CONFIG_NSERIES)  += nseries.o
> +obj-$(CONFIG_OMAP) += omap_sx1.o

This is a board -- why is it sharing a config with OMAP
rather than getting its own?

> +obj-$(CONFIG_PALM)     += palm.o
> +obj-$(CONFIG_REALVIEW) += realview.o
> +obj-$(CONFIG_SPITZ)    += spitz.o
> +obj-$(CONFIG_STELLARIS)+= stellaris.o
> +obj-$(CONFIG_TOSA)     += tosa.o
> +obj-$(CONFIG_VERSATILEPB) += versatilepb.o
> +obj-$(CONFIG_VXPRESS)     += vexpress.o
> +obj-$(CONFIG_ZYNQ) += xilinx_zynq.o
> +obj-$(CONFIG_ARMV7M) += armv7m.o
> +obj-$(CONFIG_PXA2XX) += pxa2xx.o
> +obj-$(CONFIG_PXA2XX) += z2.o

Why didn't this board get its own CONFIG_Z2 ?

> +obj-$(CONFIG_PXA2XX) += pxa2xx_gpio.o
> +obj-$(CONFIG_PXA2XX) += pxa2xx_pic.o
> +obj-$(CONFIG_OMAP) += omap1.o
> +obj-$(CONFIG_OMAP) += omap2.o
> +obj-$(CONFIG_STRONARM) += strongarm.o

Typo, as Max points out.

thanks
-- PMM