From c8aa7dfc18f7cc90d0aea6c7becbb67dfc5bba4b Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 31 Oct 2008 12:26:55 +0100 Subject: [PATCH] FPGA: move fpga drivers to drivers/fpga Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- Makefile | 1 + common/Makefile | 11 ------ {common => drivers/fpga}/ACEX1K.c | 0 drivers/fpga/Makefile | 58 ++++++++++++++++++++++++++++ {common => drivers/fpga}/altera.c | 0 {common => drivers/fpga}/cyclon2.c | 0 {common => drivers/fpga}/fpga.c | 0 {common => drivers/fpga}/spartan2.c | 0 {common => drivers/fpga}/spartan3.c | 0 {common => drivers/fpga}/stratixII.c | 0 {common => drivers/fpga}/virtex2.c | 0 {common => drivers/fpga}/xilinx.c | 0 12 files changed, 59 insertions(+), 11 deletions(-) rename {common => drivers/fpga}/ACEX1K.c (100%) create mode 100644 drivers/fpga/Makefile rename {common => drivers/fpga}/altera.c (100%) rename {common => drivers/fpga}/cyclon2.c (100%) rename {common => drivers/fpga}/fpga.c (100%) rename {common => drivers/fpga}/spartan2.c (100%) rename {common => drivers/fpga}/spartan3.c (100%) rename {common => drivers/fpga}/stratixII.c (100%) rename {common => drivers/fpga}/virtex2.c (100%) rename {common => drivers/fpga}/xilinx.c (100%) diff --git a/Makefile b/Makefile index befb6081a..4eff1b5d2 100644 --- a/Makefile +++ b/Makefile @@ -221,6 +221,7 @@ LIBS += disk/libdisk.a LIBS += drivers/bios_emulator/libatibiosemu.a LIBS += drivers/block/libblock.a LIBS += drivers/dma/libdma.a +LIBS += drivers/fpga/libfpga.a LIBS += drivers/hwmon/libhwmon.a LIBS += drivers/i2c/libi2c.a LIBS += drivers/input/libinput.a diff --git a/common/Makefile b/common/Makefile index 9dec4ec35..596fef3b0 100644 --- a/common/Makefile +++ b/common/Makefile @@ -90,18 +90,7 @@ COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.o COBJS-$(CONFIG_CMD_FDOS) += cmd_fdos.o COBJS-$(CONFIG_CMD_FLASH) += cmd_flash.o ifdef CONFIG_FPGA -COBJS-y += fpga.o COBJS-$(CONFIG_CMD_FPGA) += cmd_fpga.o -COBJS-$(CONFIG_FPGA_SPARTAN2) += spartan2.o -COBJS-$(CONFIG_FPGA_SPARTAN3) += spartan3.o -COBJS-$(CONFIG_FPGA_VIRTEX2) += virtex2.o -COBJS-$(CONFIG_FPGA_XILINX) += xilinx.o -ifdef CONFIG_FPGA_ALTERA -COBJS-y += altera.o -COBJS-$(CONFIG_FPGA_ACEX1K) += ACEX1K.o -COBJS-$(CONFIG_FPGA_CYCLON2) += cyclon2.o -COBJS-$(CONFIG_FPGA_STRATIX_II) += stratixII.o -endif endif COBJS-$(CONFIG_CMD_I2C) += cmd_i2c.o COBJS-$(CONFIG_CMD_IDE) += cmd_ide.o diff --git a/common/ACEX1K.c b/drivers/fpga/ACEX1K.c similarity index 100% rename from common/ACEX1K.c rename to drivers/fpga/ACEX1K.c diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile new file mode 100644 index 000000000..52d8e2432 --- /dev/null +++ b/drivers/fpga/Makefile @@ -0,0 +1,58 @@ +# +# (C) Copyright 2008 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB := $(obj)libfpga.a + +ifdef CONFIG_FPGA +COBJS-y += fpga.o +COBJS-$(CONFIG_FPGA_SPARTAN2) += spartan2.o +COBJS-$(CONFIG_FPGA_SPARTAN3) += spartan3.o +COBJS-$(CONFIG_FPGA_VIRTEX2) += virtex2.o +COBJS-$(CONFIG_FPGA_XILINX) += xilinx.o +ifdef CONFIG_FPGA_ALTERA +COBJS-y += altera.o +COBJS-$(CONFIG_FPGA_ACEX1K) += ACEX1K.o +COBJS-$(CONFIG_FPGA_CYCLON2) += cyclon2.o +COBJS-$(CONFIG_FPGA_STRATIX_II) += stratixII.o +endif +endif + +COBJS := $(COBJS-y) +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +all: $(LIB) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/common/altera.c b/drivers/fpga/altera.c similarity index 100% rename from common/altera.c rename to drivers/fpga/altera.c diff --git a/common/cyclon2.c b/drivers/fpga/cyclon2.c similarity index 100% rename from common/cyclon2.c rename to drivers/fpga/cyclon2.c diff --git a/common/fpga.c b/drivers/fpga/fpga.c similarity index 100% rename from common/fpga.c rename to drivers/fpga/fpga.c diff --git a/common/spartan2.c b/drivers/fpga/spartan2.c similarity index 100% rename from common/spartan2.c rename to drivers/fpga/spartan2.c diff --git a/common/spartan3.c b/drivers/fpga/spartan3.c similarity index 100% rename from common/spartan3.c rename to drivers/fpga/spartan3.c diff --git a/common/stratixII.c b/drivers/fpga/stratixII.c similarity index 100% rename from common/stratixII.c rename to drivers/fpga/stratixII.c diff --git a/common/virtex2.c b/drivers/fpga/virtex2.c similarity index 100% rename from common/virtex2.c rename to drivers/fpga/virtex2.c diff --git a/common/xilinx.c b/drivers/fpga/xilinx.c similarity index 100% rename from common/xilinx.c rename to drivers/fpga/xilinx.c