Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[EMAIL PROTECTED]>
---
Makefile | 1 +
common/Makefile | 11 -----------
{common => drivers/fpga}/ACEX1K.c | 0
{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
11 files changed, 1 insertions(+), 11 deletions(-)
rename {common => drivers/fpga}/ACEX1K.c (100%)
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 d6abb4d..cddd571 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 f00cbd9..14042e6 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/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
--
1.5.6.5
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
