[Armadeus-commitlog] SF.net SVN: armadeus:[1161] trunk
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1161] trunk
|
From: <ar...@us...> - 2009-03-13 13:44:53
|
Revision: 1161
http://armadeus.svn.sourceforge.net/armadeus/?rev=1161&view=rev
Author: artemys
Date: 2009-03-13 13:44:38 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
[LINUX] Corrects commit 1153 + cleanup a little FPGA drivers configuration
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config
trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.27.13.config
trunk/target/linux/modules/Kconfig
trunk/target/linux/modules/fpga/dev_tools/Kconfig
trunk/target/linux/modules/fpga/dev_tools/Makefile
trunk/target/linux/modules/fpga/dev_tools/fpgaaccess/Kconfig
trunk/target/linux/modules/fpga/dev_tools/loader/Kconfig
trunk/target/linux/modules/fpga/others/Kconfig
trunk/target/linux/modules/fpga/others/Makefile
trunk/target/linux/modules/fpga/others/i2ctest/Kconfig
trunk/target/linux/modules/fpga/others/ps2keyboard/Kconfig
Modified: trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config 2009-03-13 13:44:38 UTC (rev 1161)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.27.13
-# Fri Mar 13 10:20:10 2009
+# Fri Mar 13 14:31:08 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1100,6 +1100,10 @@
# Armadeus specific drivers
#
CONFIG_ARMADEUS_DRIVERS=y
+
+#
+# Misc.
+#
# CONFIG_ARMADEUS_GENERIC_DRIVER is not set
# CONFIG_ARMADEUS_GPIO_DRIVER is not set
# CONFIG_ARMADEUS_KEYPAD_DRIVER is not set
@@ -1113,10 +1117,17 @@
# FPGA Drivers
#
CONFIG_ARMADEUS_FPGA_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_TEST=y
+
+#
+# Drivers for configuring and testing the FPGA
+#
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
-# CONFIG_ARMADEUS_FPGAACCESS_DRIVER is not set
-# CONFIG_ARMADEUS_FPGA_OTHERS_DRIVERS is not set
+
+#
+# Others drivers for the FPGA
+#
+# CONFIG_ARMADEUS_I2C_OCORE_IRQMNG is not set
+# CONFIG_ARMADEUS_PS2KBD_DRIVER is not set
# CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS is not set
# CONFIG_POD_DRIVERS is not set
@@ -1127,7 +1138,7 @@
CONFIG_IMX_BACKLIGHT=m
#
-# Communication bus related:
+# Communication bus related
#
# CONFIG_ARMADEUS_ISP1761 is not set
CONFIG_MMC=y
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.27.13.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.27.13.config 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.27.13.config 2009-03-13 13:44:38 UTC (rev 1161)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27.2
-# Mon Feb 23 14:11:31 2009
+# Linux kernel version: 2.6.27.13
+# Fri Mar 13 14:22:46 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1106,6 +1106,10 @@
# Armadeus specific drivers
#
CONFIG_ARMADEUS_DRIVERS=y
+
+#
+# Misc.
+#
# CONFIG_ARMADEUS_GENERIC_DRIVER is not set
CONFIG_ARMADEUS_GPIO_DRIVER=m
CONFIG_ARMADEUS_PPDEV_DRIVER=m
@@ -1119,15 +1123,19 @@
#
# FPGA Drivers
#
-CONFIG_ARMADEUS_FPGA_DRIVERS=n
-# CONFIG_ARMADEUS_BUTTON_DRIVER is not set
-# CONFIG_ARMADEUS_LED_DRIVER is not set
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS=n
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_BUTTON_DRIVER=n
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_LED_DRIVER=n
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER=n
+CONFIG_ARMADEUS_FPGA_DRIVERS=y
+
+#
+# Drivers for configuring and testing the FPGA
+#
+CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
+
+#
+# Others drivers for the FPGA
+#
# CONFIG_ARMADEUS_I2C_OCORE_IRQMNG is not set
CONFIG_ARMADEUS_PS2KBD_DRIVER=m
+# CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS is not set
# CONFIG_POD_DRIVERS is not set
#
@@ -1137,7 +1145,7 @@
CONFIG_IMX_BACKLIGHT=m
#
-# Communication bus related:
+# Communication bus related
#
CONFIG_ARMADEUS_ISP1761=y
CONFIG_MMC=y
Modified: trunk/target/linux/modules/Kconfig
===================================================================
--- trunk/target/linux/modules/Kconfig 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/Kconfig 2009-03-13 13:44:38 UTC (rev 1161)
@@ -9,6 +9,9 @@
boolean "Support for specific Armadeus drivers"
default n
---help---
+
+comment "Misc."
+ depends on ARMADEUS_DRIVERS
source "drivers/armadeus/generic/Kconfig"
@@ -30,7 +33,7 @@
source "drivers/armadeus/backlight/Kconfig"
-comment "Communication bus related:"
+comment "Communication bus related"
depends on ARMADEUS_DRIVERS
source "drivers/armadeus/isp1761/Kconfig"
Modified: trunk/target/linux/modules/fpga/dev_tools/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/Kconfig 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/fpga/dev_tools/Kconfig 2009-03-13 13:44:38 UTC (rev 1161)
@@ -1,12 +1,9 @@
#
-# Armadeus custom drivers configuration
+# FPGA devt drivers configuration
#
-config ARMADEUS_FPGA_TEST
- boolean "Driver for configuring and testing FPGA"
- default n
- depends on ARMADEUS_FPGA_DRIVERS
- ---help---
- All drivers for FPGA components
+
+comment "Drivers for configuring and testing the FPGA"
+ depends on ARMADEUS_FPGA_DRIVERS
source "drivers/armadeus/fpga/dev_tools/loader/Kconfig"
-source "drivers/armadeus/fpga/dev_tools/fpgaaccess/Kconfig"
+#source "drivers/armadeus/fpga/dev_tools/fpgaaccess/Kconfig"
Modified: trunk/target/linux/modules/fpga/dev_tools/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/Makefile 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/fpga/dev_tools/Makefile 2009-03-13 13:44:38 UTC (rev 1161)
@@ -8,7 +8,8 @@
# Part executed when called from kernel build system:
-obj-$(CONFIG_ARMADEUS_FPGA_TEST) += loader/ fpgaaccess/
+obj-$(ARMADEUS_FPGA_LOADER_DRIVER) += loader/
+#obj-$(ARMADEUS_FPGAACCESS_DRIVER) += fpgaaccess/
else
Modified: trunk/target/linux/modules/fpga/dev_tools/fpgaaccess/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/fpgaaccess/Kconfig 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/fpga/dev_tools/fpgaaccess/Kconfig 2009-03-13 13:44:38 UTC (rev 1161)
@@ -2,7 +2,8 @@
#
config ARMADEUS_FPGAACCESS_DRIVER
- tristate "fpgaaccess driver"
- default n
- depends on ARMADEUS_FPGA_TEST
- ---help---
+ tristate "fpgaaccess driver"
+ default n
+ depends on ARMADEUS_FPGA_DRIVERS
+ ---help---
+
Modified: trunk/target/linux/modules/fpga/dev_tools/loader/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/loader/Kconfig 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/fpga/dev_tools/loader/Kconfig 2009-03-13 13:44:38 UTC (rev 1161)
@@ -4,6 +4,8 @@
config ARMADEUS_FPGA_LOADER_DRIVER
tristate "Armadeus FPGA configuration driver (= loader)"
default n
- depends on ARMADEUS_FPGA_TEST
+ depends on ARMADEUS_FPGA_DRIVERS
---help---
+ With this driver you will be able to (re)load the configuration
+ of your FPGA directly from Linux userspace.
Modified: trunk/target/linux/modules/fpga/others/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/others/Kconfig 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/fpga/others/Kconfig 2009-03-13 13:44:38 UTC (rev 1161)
@@ -3,13 +3,8 @@
#
#
-#
-config ARMADEUS_FPGA_OTHERS_DRIVERS
- boolean "Others drivers for FPGA"
- default n
- depends on ARMADEUS_FPGA_DRIVERS
- ---help---
- All drivers for FPGA components
+comment "Others drivers for the FPGA"
+ depends on ARMADEUS_FPGA_DRIVERS
source "drivers/armadeus/fpga/others/i2ctest/Kconfig"
source "drivers/armadeus/fpga/others/ps2keyboard/Kconfig"
Modified: trunk/target/linux/modules/fpga/others/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/others/Makefile 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/fpga/others/Makefile 2009-03-13 13:44:38 UTC (rev 1161)
@@ -8,7 +8,8 @@
# Part executed when called from kernel build system:
-obj-$(CONFIG_ARMADEUS_FPGA_OTHERS_DRIVERS) += i2ctest/ ps2keyboard/
+obj-$(ARMADEUS_I2C_OCORE_IRQMNG) += i2ctest/
+obj-$(CONFIG_ARMADEUS_PS2KBD_DRIVER) += ps2keyboard/
else
Modified: trunk/target/linux/modules/fpga/others/i2ctest/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/others/i2ctest/Kconfig 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/fpga/others/i2ctest/Kconfig 2009-03-13 13:44:38 UTC (rev 1161)
@@ -4,5 +4,5 @@
config ARMADEUS_I2C_OCORE_IRQMNG
tristate "Driver for testing wishbone i2c-ocore-irq_mng"
default n
- depends on ARMADEUS_FPGA_OTHERS_DRIVERS
+ depends on ARMADEUS_FPGA_DRIVERS
---help---
Modified: trunk/target/linux/modules/fpga/others/ps2keyboard/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/others/ps2keyboard/Kconfig 2009-03-13 10:32:14 UTC (rev 1160)
+++ trunk/target/linux/modules/fpga/others/ps2keyboard/Kconfig 2009-03-13 13:44:38 UTC (rev 1161)
@@ -4,7 +4,7 @@
config ARMADEUS_PS2KBD_DRIVER
tristate "Armadeus PS/2 driver"
default n
- depends on ARMADEUS_FPGA_OTHERS_DRIVERS
+ depends on ARMADEUS_FPGA_DRIVERS
---help---
If you have the corresponding IP loaded in the FPGA then this
driver will allow you to use PS/2 keyboard with your Armadeus
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
