[Armadeus-commitlog] SF.net SVN: armadeus:[1168] trunk/target/linux/modules/fpga

[<ar...@us...>]

Revision: 1168
          http://armadeus.svn.sourceforge.net/armadeus/?rev=1168&view=rev
Author:   artemys
Date:     2009-03-18 08:21:39 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
[LINUX] Some fpga modules were not correctly installed on target rootfs (due to recent regression); so corrects that

Modified Paths:
--------------
    trunk/target/linux/modules/fpga/dev_tools/Makefile
    trunk/target/linux/modules/fpga/dev_tools/loader/Makefile
    trunk/target/linux/modules/fpga/others/Makefile

Modified: trunk/target/linux/modules/fpga/dev_tools/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/Makefile	2009-03-16 20:17:50 UTC (rev 1167)
+++ trunk/target/linux/modules/fpga/dev_tools/Makefile	2009-03-18 08:21:39 UTC (rev 1168)
@@ -8,8 +8,8 @@
 
 # Part executed when called from kernel build system:
 
-obj-$(ARMADEUS_FPGA_LOADER_DRIVER) += loader/
-#obj-$(ARMADEUS_FPGAACCESS_DRIVER) += fpgaaccess/
+obj-$(CONFIG_ARMADEUS_FPGA_LOADER_DRIVER) += loader/
+#obj-$(CONFIG_ARMADEUS_FPGAACCESS_DRIVER) += fpgaaccess/
 
 else
 

Modified: trunk/target/linux/modules/fpga/dev_tools/loader/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/loader/Makefile	2009-03-16 20:17:50 UTC (rev 1167)
+++ trunk/target/linux/modules/fpga/dev_tools/loader/Makefile	2009-03-18 08:21:39 UTC (rev 1168)
@@ -5,12 +5,11 @@
 ifneq ($(KERNELRELEASE),)
 
 obj-$(CONFIG_ARMADEUS_FPGA_LOADER_DRIVER)	+= fpgaloader.o
-ifneq ($(CONFIG_MACH_APF27),)
 fpgaloader-objs := xilinx-fpga-loader.o fpga-loader.o
+ifneq ($(CONFIG_MACH_APF27),)
 obj-y += apf27-fpga-loader.o
 endif
 ifneq ($(CONFIG_MACH_APF9328),)
-fpgaloader-objs := xilinx-fpga-loader.o fpga-loader.o
 obj-y += apf9328-fpga-loader.o
 endif
 

Modified: trunk/target/linux/modules/fpga/others/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/others/Makefile	2009-03-16 20:17:50 UTC (rev 1167)
+++ trunk/target/linux/modules/fpga/others/Makefile	2009-03-18 08:21:39 UTC (rev 1168)
@@ -8,7 +8,7 @@
 
 # Part executed when called from kernel build system:
 
-obj-$(ARMADEUS_I2C_OCORE_IRQMNG) += i2ctest/ 
+obj-$(CONFIG_ARMADEUS_I2C_OCORE_IRQMNG) += i2ctest/ 
 obj-$(CONFIG_ARMADEUS_PS2KBD_DRIVER) += ps2keyboard/
 
 else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.