[Armadeus-commitlog] SF.net SVN: armadeus:[1017] trunk
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1017] trunk
|
From: <Fa...@us...> - 2009-01-14 14:21:16
|
Revision: 1017
http://armadeus.svn.sourceforge.net/armadeus/?rev=1017&view=rev
Author: FabM
Date: 2009-01-14 14:21:01 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
[POD] Driver generation mechanisme updated
Modified Paths:
--------------
trunk/Makefile
trunk/target/linux/modules/fpga/POD/Kconfig
trunk/target/linux/modules/fpga/POD/Makefile
trunk/target/linux/modules/fpga/POD/void/Makefile
Removed Paths:
-------------
trunk/target/linux/modules/fpga/POD/void/Kconfig
trunk/target/linux/modules/fpga/podscript.sh
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2009-01-14 14:16:13 UTC (rev 1016)
+++ trunk/Makefile 2009-01-14 14:21:01 UTC (rev 1017)
@@ -116,11 +116,6 @@
$(MAKE) -C $(BUILDROOT_DIR)
linux-menuconfig:
- @if [ ! -e "target/linux/modules/fpga/POD/.pod" ] ; then \
- if [ -x target/linux/modules/fpga/podscript.sh ]; then \
- target/linux/modules/fpga/podscript.sh ; \
- fi \
- fi;
@if [ -e "$(LINUX_DIR)/.unpacked" ] ; then \
$(MAKE) -C $(BUILDROOT_DIR) linux26-menuconfig ; \
fi;
Modified: trunk/target/linux/modules/fpga/POD/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/POD/Kconfig 2009-01-14 14:16:13 UTC (rev 1016)
+++ trunk/target/linux/modules/fpga/POD/Kconfig 2009-01-14 14:21:01 UTC (rev 1017)
@@ -6,13 +6,9 @@
#
config POD_DRIVERS
- boolean "Drivers generated by POD"
+ tristate "Drivers generated by POD"
default n
depends on ARMADEUS_FPGA_DRIVERS
---help---
All drivers for FPGA components
-
-
-source "drivers/armadeus/fpga/POD/void/Kconfig"
-
Modified: trunk/target/linux/modules/fpga/POD/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/POD/Makefile 2009-01-14 14:16:13 UTC (rev 1016)
+++ trunk/target/linux/modules/fpga/POD/Makefile 2009-01-14 14:21:01 UTC (rev 1017)
@@ -8,17 +8,18 @@
ifneq ($(KERNELRELEASE),)
# Part executed when called from kernel build system:
-obj-$(CONFIG_POD_DRIVERS) += void/
+obj-$(CONFIG_POD_DRIVERS) += $(shell ls -F drivers/armadeus/fpga/POD/ | grep \/$)
else
# Part executed when called from standard make in this directory:
-ARMADEUS_BASE_DIR=../../../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-
+BASE_DIR:=../../../../buildroot/
+REL:=$(shell grep "BR2_PACKAGE_LINUX_VERSION=" $(BASE_DIR).config | sed -e 's/BR2_PACKAGE_LINUX_VERSION=//' | sed -e 's/"//g')
+#
+ARMADEUS_KERNEL_DIR:=$(BASE_DIR)build_arm/linux-$(REL)
ifeq ($(LINUX_DIR),)
-LINUX_DIR:=$(ARMADEUS_LINUX_DIR)
+LINUX_DIR:=$(ARMADEUS_KERNEL_DIR)
endif
PWD:= $(shell pwd)
Deleted: trunk/target/linux/modules/fpga/POD/void/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/POD/void/Kconfig 2009-01-14 14:16:13 UTC (rev 1016)
+++ trunk/target/linux/modules/fpga/POD/void/Kconfig 2009-01-14 14:21:01 UTC (rev 1017)
@@ -1,10 +0,0 @@
-#
-#
-
-config VOID_DRIVER
- tristate "Useless, just to avoid error"
- default n
- depends on POD_DRIVERS
- ---help---
- Useless, just to avoid error
-
Modified: trunk/target/linux/modules/fpga/POD/void/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/POD/void/Makefile 2009-01-14 14:16:13 UTC (rev 1016)
+++ trunk/target/linux/modules/fpga/POD/void/Makefile 2009-01-14 14:21:01 UTC (rev 1017)
@@ -5,7 +5,7 @@
# Part executed when called from kernel build system:
ifneq ($(KERNELRELEASE),)
-obj-$(CONFIG_VOID_DRIVER) += void.o
+obj-$(CONFIG_POD_DRIVERS) += void.o
# Part executed when called from standard make in this directory:
# (preferably use Makefile in parent directory)
Deleted: trunk/target/linux/modules/fpga/podscript.sh
===================================================================
--- trunk/target/linux/modules/fpga/podscript.sh 2009-01-14 14:16:13 UTC (rev 1016)
+++ trunk/target/linux/modules/fpga/podscript.sh 2009-01-14 14:21:01 UTC (rev 1017)
@@ -1,88 +0,0 @@
-#!/bin/bash
-
-FPGADIR="target/linux/modules/fpga"
-PODDIR="/POD"
-
-echo "***********************"
-echo "*Generating POD config*"
-echo "***********************"
-
-echo """
-#
-# Armadeus custom drivers configuration
-#
-#
-
-#
-config POD_DRIVERS
- boolean \"Drivers generated by POD\"
- default n
- depends on ARMADEUS_FPGA_DRIVERS
- ---help---
- All drivers for FPGA components
-
-""" > $FPGADIR$PODDIR/Kconfig
-
-
-line=""
-for i in `ls $FPGADIR$PODDIR`
-do
- if [ -d $FPGADIR$PODDIR/$i ]
- then
- echo $i
- name=$i
-
- echo """
-source \"drivers/armadeus/fpga/POD/$name/Kconfig\"
-""" >> "${FPGADIR}${PODDIR}/Kconfig"
-
- line="${line} $name/"
- fi;
-done;
-
-# fill Makefile
-echo """
-#
-# Main Makefile for the Armadeus FPGA related drivers
-#
-# Add your subdirectories to obj- target
-#
-
-ifneq (\$(KERNELRELEASE),)
-
-# Part executed when called from kernel build system:
-obj-\$(CONFIG_POD_DRIVERS) += ${line}
-
-else
-
-# Part executed when called from standard make in this directory:
-
-BASE_DIR:=../../../../buildroot/
-REL:=\$(shell grep \"BR2_PACKAGE_LINUX_VERSION=\" \$(BASE_DIR).config | \
- sed -e 's/BR2_PACKAGE_LINUX_VERSION=//' | sed -e 's/\"//g')
-#`grep \"BR2_PACKAGE_LINUX_VERSION=\" \$(BASE_DIR).config | \
-# sed \"s/BR2_PACKAGE_LINUX_VERSION=\\\"//\" | sed \"s/\\\"//\"`
-ARMADEUS_KERNEL_DIR:=\$(BASE_DIR)build_arm/linux-\$(REL)
-ifeq (\$(LINUX_DIR),)
-LINUX_DIR:=\$(ARMADEUS_KERNEL_DIR)
-endif
-PWD:= \$(shell pwd)
-
-default:
- echo \"Your Linux source dir is: \$(LINUX_DIR)\"
- \$(MAKE) -C \$(LINUX_DIR) SUBDIRS=\$(PWD) zImage modules
-
-clean:
- echo \"Your Linux source dir is: \$(LINUX_DIR)\"
- \$(MAKE) -C \$(LINUX_DIR) SUBDIRS=\$(PWD) clean
-
-install:
- echo \"Installing Armadeus drivers...\"
- \$(MAKE) -C \$(LINUX_DIR) SUBDIRS=\$(PWD) INSTALL_MOD_PATH=\$(TARGET_DIR) modules_install
-
-endif
-
-""" > "${FPGADIR}${PODDIR}/Makefile";
-# ok config generated
-touch "$FPGADIR$PODDIR/.pod"
-echo "ok"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
