[Armadeus-commitlog] SF.net SVN: armadeus:[992] trunk/target/linux/modules/fpga
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[992] trunk/target/linux/modules/fpga
|
From: <jo...@us...> - 2009-01-05 21:24:03
|
Revision: 992
http://armadeus.svn.sourceforge.net/armadeus/?rev=992&view=rev
Author: jorasse
Date: 2009-01-05 21:23:59 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
[buildroot] undo change committed in r988 and r989
Modified Paths:
--------------
trunk/target/linux/modules/fpga/POD/Makefile
Added Paths:
-----------
trunk/target/linux/modules/fpga/POD/Kconfig
trunk/target/linux/modules/fpga/podscript.sh
Removed Paths:
-------------
trunk/target/linux/modules/fpga/POD/Kconfig
trunk/target/linux/modules/fpga/podscript.sh
Deleted: trunk/target/linux/modules/fpga/POD/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/POD/Kconfig 2009-01-05 21:11:09 UTC (rev 991)
+++ trunk/target/linux/modules/fpga/POD/Kconfig 2009-01-05 21:23:59 UTC (rev 992)
@@ -1,18 +0,0 @@
-
-#
-# 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
-
-
-
-source "drivers/armadeus/fpga/POD/void/Kconfig"
-
Copied: trunk/target/linux/modules/fpga/POD/Kconfig (from rev 987, trunk/target/linux/modules/fpga/POD/Kconfig)
===================================================================
--- trunk/target/linux/modules/fpga/POD/Kconfig (rev 0)
+++ trunk/target/linux/modules/fpga/POD/Kconfig 2009-01-05 21:23:59 UTC (rev 992)
@@ -0,0 +1,18 @@
+
+#
+# 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
+
+
+
+source "drivers/armadeus/fpga/POD/void/Kconfig"
+
Modified: trunk/target/linux/modules/fpga/POD/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/POD/Makefile 2009-01-05 21:11:09 UTC (rev 991)
+++ trunk/target/linux/modules/fpga/POD/Makefile 2009-01-05 21:23:59 UTC (rev 992)
@@ -14,12 +14,11 @@
# 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')
-#
-ARMADEUS_KERNEL_DIR:=$(BASE_DIR)build_arm/linux-$(REL)
+ARMADEUS_BASE_DIR=../../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
ifeq ($(LINUX_DIR),)
-LINUX_DIR:=$(ARMADEUS_KERNEL_DIR)
+LINUX_DIR:=$(ARMADEUS_LINUX_DIR)
endif
PWD:= $(shell pwd)
Deleted: trunk/target/linux/modules/fpga/podscript.sh
===================================================================
--- trunk/target/linux/modules/fpga/podscript.sh 2009-01-05 21:11:09 UTC (rev 991)
+++ trunk/target/linux/modules/fpga/podscript.sh 2009-01-05 21:23:59 UTC (rev 992)
@@ -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"
Copied: trunk/target/linux/modules/fpga/podscript.sh (from rev 987, trunk/target/linux/modules/fpga/podscript.sh)
===================================================================
--- trunk/target/linux/modules/fpga/podscript.sh (rev 0)
+++ trunk/target/linux/modules/fpga/podscript.sh 2009-01-05 21:23:59 UTC (rev 992)
@@ -0,0 +1,88 @@
+#!/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.
|
