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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 958
          http://armadeus.svn.sourceforge.net/armadeus/?rev=958&view=rev
Author:   artemys
Date:     2008-12-15 14:22:25 +0000 (Mon, 15 Dec 2008)

Log Message:
-----------
[LINUX] Updates Armadeus custom drivers Makefiles with usage of new general Makefile.in

Modified Paths:
--------------
    trunk/target/linux/modules/Makefile
    trunk/target/linux/modules/backlight/Makefile
    trunk/target/linux/modules/fpga/Makefile
    trunk/target/linux/modules/fpga/POD/Makefile
    trunk/target/linux/modules/fpga/dev_tools/Makefile
    trunk/target/linux/modules/fpga/dev_tools/fpga_devtools/Makefile
    trunk/target/linux/modules/fpga/others/Makefile
    trunk/target/linux/modules/fpga/others/Wb_button/Makefile
    trunk/target/linux/modules/fpga/others/Wb_led/Makefile
    trunk/target/linux/modules/fpga/others/i2ctest/Makefile
    trunk/target/linux/modules/fpga/others/led/Makefile
    trunk/target/linux/modules/fpga/others/ps2keyboard/Makefile
    trunk/target/linux/modules/generic/Makefile
    trunk/target/linux/modules/gpio/Makefile
    trunk/target/linux/modules/imxlkeypad/Makefile
    trunk/target/linux/modules/isp1761/Makefile
    trunk/target/linux/modules/max1027/Makefile
    trunk/target/linux/modules/pwm/Makefile

Removed Paths:
-------------
    trunk/target/linux/modules/generic/.tmp_versions/

Modified: trunk/target/linux/modules/Makefile
===================================================================

--- trunk/target/linux/modules/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -15,14 +15,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')
-#`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)
+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)
 

Modified: trunk/target/linux/modules/backlight/Makefile
===================================================================
--- trunk/target/linux/modules/backlight/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/backlight/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -17,11 +17,10 @@
 # (preferably use Makefile in parent directory)
 else
 
-BASE_DIR="../../../../buildroot/"
-REL=`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)
-KDIR    := $(ARMADEUS_KERNEL_DIR)
+ARMADEUS_BASE_DIR=../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR    := $(ARMADEUS_LINUX_DIR)
 PWD	:= $(shell pwd)
 
 default:

Modified: trunk/target/linux/modules/fpga/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/fpga/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -14,14 +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')
-#`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)
+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)
 

Modified: trunk/target/linux/modules/fpga/POD/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/POD/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/fpga/POD/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -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)
 

Modified: trunk/target/linux/modules/fpga/dev_tools/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/fpga/dev_tools/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -14,14 +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')
-#`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)
+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)
 

Modified: trunk/target/linux/modules/fpga/dev_tools/fpga_devtools/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/fpga_devtools/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/fpga/dev_tools/fpga_devtools/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -8,20 +8,17 @@
 # dd if=fpga_test.bit of=/dev/fpga/loader
 
 
-BASE_DIR="../../../../buildroot/"
-
-REL=`grep "BR2_PACKAGE_LINUX_VERSION=" $(BASE_DIR).config | \
-      sed "s/BR2_PACKAGE_LINUX_VERSION=\\"//" | sed "s/\\"//"`
-
-ARMADEUS_KERNEL_DIR=$(BASE_DIR)build_arm_nofpu/linux-$(REL)
-
 ifneq ($(KERNELRELEASE),)
 
 obj-$(CONFIG_ARMADEUS_FPGA_TOOL_DRIVER)	+= fpgaloader.o
 fpgaloader-objs   := target-fpga-loader.o xilinx-fpga-loader.o fpga-loader.o 
 
 else
-KDIR    := $(ARMADEUS_KERNEL_DIR)
+
+ARMADEUS_BASE_DIR=../../../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR    := $(ARMADEUS_LINUX_DIR)
 PWD	:= $(shell pwd)
 
 default:
@@ -30,7 +27,6 @@
 clean:
 	rm -f *.*o \
     rm -f Module.symvers
-
    
 endif
 

Modified: trunk/target/linux/modules/fpga/others/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/others/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/fpga/others/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -14,14 +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')
-#`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)
+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)
 

Modified: trunk/target/linux/modules/fpga/others/Wb_button/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/others/Wb_button/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/fpga/others/Wb_button/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -2,13 +2,6 @@
 # Makefile for the Armadeus Wb_button drivers
 #
 
-BASE_DIR="../../../../../buildroot/"
-
-REL=`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)
-
 ifneq ($(KERNELRELEASE),)
 
 obj-$(CONFIG_ARMADEUS_BUTTON_DRIVER)	+= button.o
@@ -18,7 +11,10 @@
 
 else
 
-KDIR    := $(ARMADEUS_KERNEL_DIR)
+ARMADEUS_BASE_DIR=../../../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR    := $(ARMADEUS_LINUX_DIR)
 PWD	:= $(shell pwd)
 
 default:

Modified: trunk/target/linux/modules/fpga/others/Wb_led/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/others/Wb_led/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/fpga/others/Wb_led/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -2,13 +2,6 @@
 # Makefile for the Armadeus Wb_led drivers
 #
 
-BASE_DIR="../../../../../../buildroot/"
-
-REL=`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)
-
 ifneq ($(KERNELRELEASE),)
 
 obj-$(CONFIG_ARMADEUS_LED_DRIVER)	+= s_led.o g_led.o
@@ -17,7 +10,11 @@
 # (preferably use Makefile in parent directory)
 
 else
-KDIR    := $(ARMADEUS_KERNEL_DIR)
+
+ARMADEUS_BASE_DIR=../../../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR    := $(ARMADEUS_LINUX_DIR)
 PWD	:= $(shell pwd)
 
 default:

Modified: trunk/target/linux/modules/fpga/others/i2ctest/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/others/i2ctest/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/fpga/others/i2ctest/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -13,11 +13,10 @@
 # (preferably use Makefile in parent directory)
 else
 
-BASE_DIR="../../../../../buildroot/"
-REL=`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)
-KDIR    := $(ARMADEUS_KERNEL_DIR)
+ARMADEUS_BASE_DIR=../../../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR    := $(ARMADEUS_LINUX_DIR)
 PWD	:= $(shell pwd)
 
 default:

Modified: trunk/target/linux/modules/fpga/others/led/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/others/led/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/fpga/others/led/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -13,11 +13,10 @@
 # (preferably use Makefile in parent directory)
 else
 
-BASE_DIR="../../../../buildroot/"
-REL=`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)
-KDIR    := $(ARMADEUS_KERNEL_DIR)
+ARMADEUS_BASE_DIR=../../../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR    := $(ARMADEUS_LINUX_DIR)
 PWD	:= $(shell pwd)
 
 default:

Modified: trunk/target/linux/modules/fpga/others/ps2keyboard/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/others/ps2keyboard/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/fpga/others/ps2keyboard/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -12,11 +12,10 @@
 # (preferably use Makefile in parent directory)
 else
 
-BASE_DIR="../../../../buildroot/"
-REL=`grep "BR2_PACKAGE_LINUX_VERSION=" $(BASE_DIR).config | \
-      sed "s/BR2_PACKAGE_LINUX_VERSION=\\"//" | sed "s/\\"//"`
-ARMADEUS_KERNEL_DIR=$(BASE_DIR)build_arm_nofpu/linux-$(REL)
-KDIR    := $(ARMADEUS_KERNEL_DIR)
+ARMADEUS_BASE_DIR=../../../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR    := $(ARMADEUS_LINUX_DIR)
 PWD	:= $(shell pwd)
 
 default:

Modified: trunk/target/linux/modules/generic/Makefile
===================================================================
--- trunk/target/linux/modules/generic/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/generic/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -12,11 +12,10 @@
 # (preferably use Makefile in parent directory)
 else
 
-BASE_DIR="../../../../buildroot/"
-REL=`grep "BR2_PACKAGE_LINUX_VERSION=" $(BASE_DIR).config | \
-      sed "s/BR2_PACKAGE_LINUX_VERSION=\\"//" | sed "s/\\"//"`
-ARMADEUS_KERNEL_DIR=$(BASE_DIR)build_arm_nofpu/linux-$(REL)
-KDIR    := $(ARMADEUS_KERNEL_DIR)
+ARMADEUS_BASE_DIR=../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR    := $(ARMADEUS_LINUX_DIR)
 PWD	:= $(shell pwd)
 
 default:

Modified: trunk/target/linux/modules/gpio/Makefile
===================================================================
--- trunk/target/linux/modules/gpio/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/gpio/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -15,12 +15,10 @@
 # (preferably use Makefile in parent directory)
 else
 
-BASE_DIR="../../../../buildroot"
-REL=`grep "BR2_PACKAGE_LINUX_VERSION=" $(BASE_DIR)/.config | \
-      sed "s/BR2_PACKAGE_LINUX_VERSION=\\"//" | sed "s/\\"//"`
-BUILD_ARM=`ls $(BASE_DIR) | grep "^build_arm"`
-ARMADEUS_KERNEL_DIR=$(BASE_DIR)/$(BUILD_ARM)/linux-$(REL)
-KDIR    := $(ARMADEUS_KERNEL_DIR)
+ARMADEUS_BASE_DIR=../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR    := $(ARMADEUS_LINUX_DIR)
 PWD	:= $(shell pwd)
 
 default:

Modified: trunk/target/linux/modules/imxlkeypad/Makefile
===================================================================
--- trunk/target/linux/modules/imxlkeypad/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/imxlkeypad/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -11,12 +11,10 @@
 # (preferably use Makefile in parent directory)
 else
 
-BASE_DIR="../../../../buildroot/"
-REL=`grep "BR2_PACKAGE_LINUX_VERSION=" $(BASE_DIR).config | \
-      sed "s/BR2_PACKAGE_LINUX_VERSION=\\"//" | sed "s/\\"//"`
-BUILD_ARM=`ls ../../../../buildroot | grep "^build_arm"`
-ARMADEUS_KERNEL_DIR=$(BASE_DIR)/$(BUILD_ARM)/linux-$(REL)
-KDIR    := $(ARMADEUS_KERNEL_DIR)
+ARMADEUS_BASE_DIR=../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR    := $(ARMADEUS_LINUX_DIR)
 PWD	:= $(shell pwd)
 
 default:

Modified: trunk/target/linux/modules/isp1761/Makefile
===================================================================
--- trunk/target/linux/modules/isp1761/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/isp1761/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -10,14 +10,11 @@
 # Part execute when called from standard make in this directory:
 else
 
-BASE_DIR="../../../../buildroot/"
-BUILD_DIR_EXT:=$(shell ls $(BASE_DIR) | grep -e "^project_build_arm*")
-REL=`grep "BR2_PACKAGE_LINUX_VERSION=" $(BASE_DIR).config | \
-      sed "s/BR2_PACKAGE_LINUX_VERSION=\\"//" | sed "s/\\"//"`
+ARMADEUS_BASE_DIR=../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
 
-ARMADEUS_KERNEL_DIR=$(BASE_DIR)/$(BUILD_DIR_EXT)/apf9328/linux-$(REL)
 ifeq ($(LINUX_DIR),)
-LINUX_DIR    := $(ARMADEUS_KERNEL_DIR)
+LINUX_DIR    := $(ARMADEUS_LINUX_DIR)
 endif
 PWD	:= $(shell pwd)
 

Modified: trunk/target/linux/modules/max1027/Makefile
===================================================================
--- trunk/target/linux/modules/max1027/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/max1027/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -11,11 +11,10 @@
 # (preferably use Makefile in parent directory)
 else
 
-BASE_DIR="../../../../buildroot/"
-REL=`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)
-KDIR    := $(ARMADEUS_KERNEL_DIR)
+ARMADEUS_BASE_DIR=../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR    := $(ARMADEUS_LINUX_DIR)
 PWD	:= $(shell pwd)
 
 default:

Modified: trunk/target/linux/modules/pwm/Makefile
===================================================================
--- trunk/target/linux/modules/pwm/Makefile	2008-12-15 13:29:01 UTC (rev 957)
+++ trunk/target/linux/modules/pwm/Makefile	2008-12-15 14:22:25 UTC (rev 958)
@@ -14,11 +14,10 @@
 # (preferably use Makefile in parent directory)
 else
 
-BASE_DIR="../../../../buildroot/"
-REL=`grep "BR2_PACKAGE_LINUX_VERSION=" $(BASE_DIR).config | \
-      sed "s/BR2_PACKAGE_LINUX_VERSION=\\"//" | sed "s/\\"//"`
-ARMADEUS_KERNEL_DIR=$(BASE_DIR)build_arm_nofpu/linux-$(REL)
-KDIR    := $(ARMADEUS_KERNEL_DIR)
+ARMADEUS_BASE_DIR=../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR    := $(ARMADEUS_LINUX_DIR)
 PWD	:= $(shell pwd)
 
 default:


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


