[U-Boot] [PATCH 2/5] ixp: move pci drivers to drivers/pci

Wolfgang Denk wd at denx.de
Thu Jan 22 08:48:27 CET 2009


Dear Jean-Christophe PLAGNIOL-VILLARD,

In message <1232604438-15471-3-git-send-email-plagnioj at jcrosoft.com> you wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
> 
> diff --git a/cpu/ixp/Makefile b/cpu/ixp/Makefile
> index afa972a..6deecd4 100644
> --- a/cpu/ixp/Makefile
> +++ b/cpu/ixp/Makefile
> @@ -28,7 +28,6 @@ LIB	= $(obj)lib$(CPU).a
>  START	= start.o
>  COBJS-y	+= cpu.o
>  COBJS-y	+= interrupts.o
> -COBJS-$(CONFIG_PCI) += pci.o
>  COBJS-y	+= serial.o
>  ifndef CONFIG_USE_IRQ
>  COBJS-y	+= timer.o
> diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
> index bffb1eb..0c4fa80 100644
> --- a/drivers/pci/Makefile
> +++ b/drivers/pci/Makefile
> @@ -27,6 +27,7 @@ LIB	:= $(obj)libpci.a
>  
>  COBJS-$(CONFIG_FSL_PCI_INIT) += fsl_pci_init.o
>  COBJS-$(CONFIG_PCI) += pci.o pci_auto.o pci_indirect.o
> +COBJS-$(CONFIG_IXP_PCI) += pci_ixp.o
>  COBJS-$(CONFIG_SH4_PCI) += pci_sh4.o
>  COBJS-$(CONFIG_SH7751_PCI) +=pci_sh7751.o
>  COBJS-$(CONFIG_SH7780_PCI) +=pci_sh7780.o
> diff --git a/cpu/ixp/pci.c b/drivers/pci/pci_ixp.c
> similarity index 100%
> rename from cpu/ixp/pci.c
> rename to drivers/pci/pci_ixp.c
> diff --git a/include/configs/actux1.h b/include/configs/actux1.h
> index a3b04b1..677a1ba 100644
> --- a/include/configs/actux1.h
> +++ b/include/configs/actux1.h
> @@ -65,6 +65,7 @@
>  #define CONFIG_CMD_ELF
>  #undef CONFIG_CMD_PCI
>  #undef CONFIG_PCI
> +#undef CONFIG_IXP_PCI

IMHO there is no use in #undef'ing non-standard things that are not
defined anyway by default. This just litters the code. I suggest we
don't do this.

> --- a/include/configs/actux2.h
> +++ b/include/configs/actux2.h
> @@ -56,6 +56,7 @@
>  #define CONFIG_CMD_ELF
>  #undef CONFIG_CMD_PCI
>  #undef CONFIG_PCI
> +#undef CONFIG_IXP_PCI

Ditto.

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
How many QA engineers does it take to screw in a lightbulb? 3:  1  to
screw it in and 2 to say "I told you so" when it doesn't work.


More information about the U-Boot mailing list