[Armadeus-commitlog] SF.net SVN: armadeus:[989] trunk
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[989] trunk
|
From: <Fa...@us...> - 2009-01-05 17:05:26
|
Revision: 989
http://armadeus.svn.sourceforge.net/armadeus/?rev=989&view=rev
Author: FabM
Date: 2009-01-05 17:05:22 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
reverse
Modified Paths:
--------------
trunk/Makefile
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
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2009-01-05 12:35:14 UTC (rev 988)
+++ trunk/Makefile 2009-01-05 17:05:22 UTC (rev 989)
@@ -26,15 +26,12 @@
BUILDROOT_NAME=buildroot
BUILDROOT_FILE_PATH:=downloads
-#BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
-BUILDROOT_SITE:=http://downloads.sourceforge.net/armadeus
+BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
+#http://downloads.sourceforge.net/armadeus
BUILDROOT_VERSION:=20081103
BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
-include $(BUILDROOT_DIR)/.config
-LINUX_VERSION:=$(shell echo $(BR2_LINUX26_VERSION))
-BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
-ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
@@ -42,8 +39,7 @@
PATCH_DIR=patches
TAR_OPTIONS=--exclude=.svn -xf
-LINUX_DIR=$(BUILDROOT_DIR)/project_build_$(ARCH)/$(BOARD_NAME)/linux-$(LINUX_VERSION)
-BOARD_DIR=$(BUILDROOT_DIR)/target/device/armadeus/$(BOARD_NAME)/
+LINUX_DIR=$(BUILDROOT_DIR)/project_build_$(BR2_GCC_TARGET_ARCH)/$(BR2_BOARD_NAME)/linux-$(BR2_LINUX26_VERSION)
ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
echo " "; \
@@ -70,13 +66,8 @@
@echo ' <Package> - a single package (ex: u-boot linux or buildroot'
@echo
@echo 'Configuration:'
- @echo ' Global:'
@echo ' menuconfig - interactive curses-based configurator'
@echo ' oldconfig - resolve any unresolved symbols in .config'
- @echo ' Specific:'
- @echo ' linux-menuconfig - configure linux parameters'
- @echo ' uclibc-menuconfig - configure uclibc library parameters'
- @echo ' busybox-menuconfig - configure busybox shell parameters'
@echo
@echo 'Miscellaneous:'
@echo ' source - download all sources needed for offline-build'
@@ -116,11 +107,16 @@
$(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;
-linux26: $(BUILDROOT_DIR)/.configured
+linux26: $(BUILDROOT_DIR)/.configured
@-touch $(LINUX_DIR)/.config
@$(MAKE) -C $(BUILDROOT_DIR) linux26
@@ -161,8 +157,6 @@
buildroot-dirclean:
rm -rf $(BUILDROOT_DIR)
+
+.PHONY: dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean menuconfig $(BUILDROOT_DIR)/.config
-PHONY_TARGETS+=dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean
-PHONY_TARGETS+=menuconfig $(BUILDROOT_DIR)/.config
-.PHONY: $(PHONY_TARGETS)
-
Deleted: trunk/target/linux/modules/fpga/POD/Kconfig
===================================================================
--- trunk/target/linux/modules/fpga/POD/Kconfig 2009-01-05 12:35:14 UTC (rev 988)
+++ trunk/target/linux/modules/fpga/POD/Kconfig 2009-01-05 17:05:22 UTC (rev 989)
@@ -1,13 +0,0 @@
-
-#
-# Armadeus custom drivers configuration
-#
-#
-
-#
-config POD_DRIVERS
- tristate "Drivers generated by POD"
- depends on ARMADEUS_FPGA_DRIVERS
- ---help---
- All drivers for FPGA components
-
Added: 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 17:05:22 UTC (rev 989)
@@ -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 12:35:14 UTC (rev 988)
+++ trunk/target/linux/modules/fpga/POD/Makefile 2009-01-05 17:05:22 UTC (rev 989)
@@ -8,7 +8,7 @@
ifneq ($(KERNELRELEASE),)
# Part executed when called from kernel build system:
-obj-$(CONFIG_POD_DRIVERS) += $(find -maxdepth 1 -type d | grep -v .svn |grep -v "^.$" | sed 's/.//' | sed 's/\///' | sed 's/$/\//')
+obj-$(CONFIG_POD_DRIVERS) += void/
else
@@ -37,3 +37,4 @@
endif
+
Added: 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 17:05:22 UTC (rev 989)
@@ -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"
Property changes on: trunk/target/linux/modules/fpga/podscript.sh
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
