diff options
22 files changed, 0 insertions, 2081 deletions
diff --git a/recipes-ti/c6accel/ti-c6accel.inc b/recipes-ti/c6accel/ti-c6accel.inc deleted file mode 100644 index 7e7fb296..00000000 --- a/recipes-ti/c6accel/ti-c6accel.inc +++ /dev/null | |||
@@ -1,89 +0,0 @@ | |||
1 | DESCRIPTION = "TI C6Accel - DSP Software Libraries on ARM" | ||
2 | HOMEPAGE = "https://gforge01.dal.design.ti.com/gf/project/dsplib4arm/" | ||
3 | |||
4 | SECTION = "devel" | ||
5 | LICENSE = "TI-TSPA" | ||
6 | |||
7 | require recipes-ti/includes/ti-paths.inc | ||
8 | require recipes-ti/includes/ti-staging.inc | ||
9 | require recipes-ti/includes/ti-eula-unpack.inc | ||
10 | |||
11 | PLATFORM_omapl138 = "omapl138" | ||
12 | PLATFORM_omap3 = "omap3530" | ||
13 | PLATFORM ?= "UNDEFINED_PLATFORM" | ||
14 | |||
15 | COMPATIBLE_MACHINE = "(omapl138|omap3)" | ||
16 | |||
17 | PROVIDES += "ti-c6accel-apps" | ||
18 | |||
19 | # This recipe links statically against kernel dependant stuff, use kernel PR as base and append a local version | ||
20 | PR = "${MACHINE_KERNEL_PR}" | ||
21 | PR_append = "a" | ||
22 | |||
23 | S = "${WORKDIR}/c6accel_${PV}" | ||
24 | |||
25 | # http://software-dl.ti.com/dsps/dsps_public_sw/c6000/web/c6accel/latest/index_FDS.html | ||
26 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/c6000/web/c6accel/latest/exports//c6accel_${PV}_Linux-x86_Setup.bin;name=c6accelbin " | ||
27 | |||
28 | BINFILE="c6accel_${PV}_Linux-x86_Setup.bin" | ||
29 | TI_BIN_UNPK_CMDS="Y:workdir" | ||
30 | |||
31 | DEPENDS = "ti-codec-engine ti-xdais ti-dsplink ti-dspbios" | ||
32 | DEPENDS += "ti-edma3lld ti-cgt6x ti-xdctools-native ti-framework-components" | ||
33 | DEPENDS += "ti-biosutils" | ||
34 | |||
35 | TIARGS = ' \ | ||
36 | PLATFORM="${PLATFORM}" \ | ||
37 | CE_INSTALL_DIR="${CE_INSTALL_DIR}" \ | ||
38 | XDAIS_INSTALL_DIR="${XDAIS_INSTALL_DIR}" \ | ||
39 | LINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \ | ||
40 | CMEM_INSTALL_DIR="${CMEM_INSTALL_DIR}" \ | ||
41 | EDMA3_LLD_INSTALL_DIR="${EDMA3_LLD_INSTALL_DIR}" \ | ||
42 | CODEGEN_INSTALL_DIR="${CODEGEN_INSTALL_DIR}" \ | ||
43 | XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" \ | ||
44 | FC_INSTALL_DIR="${FC_INSTALL_DIR}" \ | ||
45 | BIOS_INSTALL_DIR="${BIOS_INSTALL_DIR}" \ | ||
46 | BIOSUTILS_INSTALL_DIR="${BIOSUTILS_INSTALL_DIR}" \ | ||
47 | LPM_INSTALL_DIR="${LPM_INSTALL_DIR}" \ | ||
48 | SERVER_INSTALL_DIR="${CODEC_INSTALL_DIR}" \ | ||
49 | C6ACCEL_INSTALL_DIR="${S}" \ | ||
50 | CSTOOL_DIR="${TOOLCHAIN_PATH}" \ | ||
51 | CSTOOL_PREFIX="${TOOLCHAIN_PATH}/${TARGET_PREFIX}" \ | ||
52 | LINUXLIBS_INSTALL_DIR="${STAGING_DIR_TARGET}" \ | ||
53 | CFLAGS=" ${TARGET_CC_ARCH} ${CFLAGS}" LDFLAGS="${LDFLAGS}" \ | ||
54 | ' | ||
55 | |||
56 | do_configure() { | ||
57 | unset VERBOSE | ||
58 | make ${TIARGS} clean | ||
59 | sed -i -e 's:-L$(LINUXLIBS_INSTALL_DIR)/lib:-L$(LINUXLIBS_INSTALL_DIR)/lib -L$(LINUXLIBS_INSTALL_DIR)/usr/lib ${LDFLAGS}:' ${S}/soc/app/Makefile | ||
60 | } | ||
61 | |||
62 | do_compile() { | ||
63 | unset VERBOSE | ||
64 | make ${TIARGS} all | ||
65 | } | ||
66 | |||
67 | do_install() { | ||
68 | install -d ${D}${C6ACCEL_INSTALL_DIR_RECIPE} | ||
69 | cp -pPrf ${S}/* ${D}${C6ACCEL_INSTALL_DIR_RECIPE} | ||
70 | |||
71 | # update linker.cmd file to point to sysroot | ||
72 | sed -i ${i} -e s=${S}=${C6ACCEL_INSTALL_DIR}=g ${D}${C6ACCEL_INSTALL_DIR_RECIPE}/soc/app/c6accel_app_config/linker.cmd | ||
73 | |||
74 | cd ${S} | ||
75 | make \ | ||
76 | PLATFORM="${PLATFORM}" \ | ||
77 | CMEM_INSTALL_DIR="${CMEM_INSTALL_DIR}" \ | ||
78 | LINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \ | ||
79 | LPM_INSTALL_DIR="${LPM_INSTALL_DIR}" \ | ||
80 | C6ACCEL_INSTALL_DIR="${S}" \ | ||
81 | EXEC_DIR_C6ACCEL="${D}/${installdir}/c6accel-apps" \ | ||
82 | install | ||
83 | } | ||
84 | |||
85 | PACKAGES += "ti-c6accel-apps" | ||
86 | FILES_ti-c6accel-apps = "${installdir}/c6accel-apps/*" | ||
87 | INSANE_SKIP_ti-c6accel-apps = "1" | ||
88 | RDEPENDS_ti-c6accel-apps += "ti-cmem-module ti-dsplink-module" | ||
89 | |||
diff --git a/recipes-ti/c6accel/ti-c6accel/0001-soc-honour-buildsystem-CFLAGS-and-LDFLAGS-when-set.patch b/recipes-ti/c6accel/ti-c6accel/0001-soc-honour-buildsystem-CFLAGS-and-LDFLAGS-when-set.patch deleted file mode 100644 index a108c6e0..00000000 --- a/recipes-ti/c6accel/ti-c6accel/0001-soc-honour-buildsystem-CFLAGS-and-LDFLAGS-when-set.patch +++ /dev/null | |||
@@ -1,82 +0,0 @@ | |||
1 | From 192b19046a67263da44203bf50a5b51d0a655fec Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Fri, 31 Dec 2010 15:26:37 +0100 | ||
4 | Subject: [PATCH] soc: honour buildsystem CFLAGS and LDFLAGS when set | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | --- | ||
8 | soc/app/Makefile | 13 ++++--------- | ||
9 | soc/c6accelw/Makefile | 14 ++++---------- | ||
10 | 2 files changed, 8 insertions(+), 19 deletions(-) | ||
11 | |||
12 | diff --git a/soc/app/Makefile b/soc/app/Makefile | ||
13 | index 2647746..bed937e 100755 | ||
14 | --- a/soc/app/Makefile | ||
15 | +++ b/soc/app/Makefile | ||
16 | @@ -53,15 +53,10 @@ CONFIGURO = $(XDC_INSTALL_DIR)/xs xdc.tools.configuro | ||
17 | CONFIG_BLD = ../../config.bld | ||
18 | |||
19 | ifeq ($(BUILD_TYPE), release) | ||
20 | -ifeq ($(ARM_ISA),armv7-a) | ||
21 | - C_FLAGS += -O3 -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp | ||
22 | -endif | ||
23 | -ifeq ($(ARM_ISA),armv5t) | ||
24 | - C_FLAGS += -mlittle-endian -march=armv5t -mtune=arm9tdmi -mabi=aapcs-linux -O | ||
25 | -endif | ||
26 | +C_FLAGS += $(CFLAGS) | ||
27 | else | ||
28 | CPP_FLAGS += -DNDEBUG | ||
29 | - C_FLAGS += -Wall -g | ||
30 | + C_FLAGS += $(CFLAGS) -Wall -g | ||
31 | endif | ||
32 | |||
33 | |||
34 | @@ -72,7 +67,7 @@ ifeq ($(PLATFORM),omapl138) | ||
35 | C_FLAGS += -DPLATFORM=138 | ||
36 | endif | ||
37 | |||
38 | -LD_FLAGS += -L$(LINUXLIBS_INSTALL_DIR)/lib -lm -lpthread | ||
39 | +LD_FLAGS += $(LDFLAGS) -L$(LINUXLIBS_INSTALL_DIR)/lib -lm -lpthread | ||
40 | C6ACCEL_LIB += ../c6accelw/lib/c6accelw_$(PLATFORM).a470MV | ||
41 | |||
42 | COMPILE.c = $(VERBOSE) $(CSTOOL_PREFIX)gcc $(CPP_FLAGS) $(C_FLAGS) $(CPP_FLAGS) -c | ||
43 | @@ -102,7 +97,7 @@ $(TARGET): $(OBJFILES) $(C6ACCEL_LIB) $(XDC_LFILE) | ||
44 | |||
45 | $(OBJFILES): %.o: %.c $(HEADERS) $(XDC_CFLAGS) | ||
46 | @echo Compiling $@ from $<.. | ||
47 | - $(COMPILE.c) $(shell cat $(XDC_CFLAGS)) -o $@ $< | ||
48 | + $(COMPILE.c) $(shell cat $(XDC_CFLAGS) | sed 's:-march=armv5t::g') -o $@ $< | ||
49 | |||
50 | $(XDC_LFILE) $(XDC_CFLAGS): $(XDC_CFGFILE) | ||
51 | @echo | ||
52 | diff --git a/soc/c6accelw/Makefile b/soc/c6accelw/Makefile | ||
53 | index cc58acf..298ab3b 100755 | ||
54 | --- a/soc/c6accelw/Makefile | ||
55 | +++ b/soc/c6accelw/Makefile | ||
56 | @@ -21,19 +21,13 @@ BUILD_TYPE=release | ||
57 | CPP_FLAGS += -I../packages -I$(XDC_INSTALL_DIR)/packages -I$(CE_INSTALL_DIR)/packages -I$(XDAIS_INSTALL_DIR)/packages -Dxdc_target_name__=arm/GCArmv5T -Dxdc_target_types__=gnu/targets/std.h | ||
58 | |||
59 | ifeq ($(BUILD_TYPE), release) | ||
60 | -ifeq ($(ARM_ISA),armv7-a) | ||
61 | - C_FLAGS += -O3 -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp | ||
62 | - endif | ||
63 | -ifeq ($(ARM_ISA),armv5t) | ||
64 | - C_FLAGS += -mlittle-endian -march=armv5t -mtune=arm9tdmi -mabi=aapcs-linux -O | ||
65 | - endif | ||
66 | - | ||
67 | +C_FLAGS += $(CFLAGS) | ||
68 | else | ||
69 | - CPP_FLAGS += -DNDEBUG | ||
70 | - C_FLAGS += -Wall -g | ||
71 | + CPP_FLAGS += -DNDEBUG | ||
72 | + C_FLAGS += $(CFLAGS) -Wall -g | ||
73 | endif | ||
74 | |||
75 | -LD_FLAGS += -L$(LINUXLIBS_INSTALL_DIR)/lib | ||
76 | +LD_FLAGS += $(LDFLAGS) -L$(LINUXLIBS_INSTALL_DIR)/lib | ||
77 | AR_FLAGS += | ||
78 | |||
79 | COMPILE.c = $(VERBOSE) $(CSTOOL_PREFIX)gcc $(CPP_FLAGS) $(C_FLAGS) -c | ||
80 | -- | ||
81 | 1.6.6.1 | ||
82 | |||
diff --git a/recipes-ti/c6accel/ti-c6accel/fix-loadmodule.patch b/recipes-ti/c6accel/ti-c6accel/fix-loadmodule.patch deleted file mode 100644 index 9921f29e..00000000 --- a/recipes-ti/c6accel/ti-c6accel/fix-loadmodule.patch +++ /dev/null | |||
@@ -1,81 +0,0 @@ | |||
1 | diff -uNr c6accel_1_00_00_04_orig/soc/app/omap3530/loadmodules_omap3530_c6accel.sh c6accel_1_00_00_04/soc/app/omap3530/loadmodules_omap3530_c6accel.sh | ||
2 | --- c6accel_1_00_00_04_orig/soc/app/omap3530/loadmodules_omap3530_c6accel.sh 2010-07-26 16:18:35.000000000 -0500 | ||
3 | +++ c6accel_1_00_00_04/soc/app/omap3530/loadmodules_omap3530_c6accel.sh 2010-09-12 11:50:46.129159981 -0500 | ||
4 | @@ -1,4 +1,4 @@ | ||
5 | -# loadmodules.sh | ||
6 | +#!/bin/sh | ||
7 | # | ||
8 | # Copyright (C) $year Texas Instruments Incorporated - http://www.ti.com/ | ||
9 | # | ||
10 | @@ -11,34 +11,16 @@ | ||
11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
12 | # Lesser General Public License for more details. | ||
13 | |||
14 | -# | ||
15 | -# Default Memory Map | ||
16 | -# | ||
17 | -# Start Addr Size Description | ||
18 | -# ------------------------------------------- | ||
19 | -# 0x80000000 88 MB Linux | ||
20 | -# 0x85800000 08 MB CMEM | ||
21 | -# 0x86800000 24 MB DDRALGHEAP | ||
22 | -# 0x87800000 6 MB DDR2 (BIOS, Codecs, Applications) | ||
23 | -# 0x87E00000 1 MB DSPLINK (MEM) | ||
24 | -# 0x87F00000 4 KB DSPLINK (RESET) | ||
25 | -# 0x87F01000 1020 KB unused | ||
26 | -rmmod cmemk.ko | ||
27 | -rmmod lpm_omap3530.ko | ||
28 | -rmmod dsplinkk | ||
29 | -# Allocate 15MB for CMEM | ||
30 | -insmod cmemk.ko phys_start=0x86300000 phys_end=0x87200000 pools=20x4096 | ||
31 | +# remove previously loaded cmem to ensure that it configured to use our pool configuration | ||
32 | +rmmod cmemk 2>/dev/null | ||
33 | |||
34 | -# insert DSP/BIOS Link driver | ||
35 | -# | ||
36 | -insmod dsplinkk.ko | ||
37 | +# Allocate 15MB for CMEM | ||
38 | +modprobe cmemk phys_start=0x86300000 phys_end=0x87200000 pools=20x4096 allowOverlap=1 | ||
39 | +modprobe dsplinkk | ||
40 | +modprobe lpm_omap3530 | ||
41 | |||
42 | # make /dev/dsplink | ||
43 | rm -rf /dev/dsplink | ||
44 | mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0 | ||
45 | |||
46 | |||
47 | -# insert Local Power Manager driver | ||
48 | -# | ||
49 | -insmod lpm_omap3530.ko | ||
50 | - | ||
51 | diff -uNr c6accel_1_00_00_04_orig/soc/app/omapl138/loadmodules_omapl138_c6accel.sh c6accel_1_00_00_04/soc/app/omapl138/loadmodules_omapl138_c6accel.sh | ||
52 | --- c6accel_1_00_00_04_orig/soc/app/omapl138/loadmodules_omapl138_c6accel.sh 2010-07-27 09:45:37.000000000 -0500 | ||
53 | +++ c6accel_1_00_00_04/soc/app/omapl138/loadmodules_omapl138_c6accel.sh 2010-09-12 11:52:07.193160179 -0500 | ||
54 | @@ -1,4 +1,4 @@ | ||
55 | -# | ||
56 | +#!/bin/sh | ||
57 | # Copyright (c) 2008, Texas Instruments Incorporated | ||
58 | # All rights reserved. | ||
59 | # | ||
60 | @@ -29,15 +29,14 @@ | ||
61 | # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, | ||
62 | # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
63 | # | ||
64 | -rmmod dsplinkk.ko | ||
65 | -rmmod cmemk.ko | ||
66 | + | ||
67 | +# remove previously loaded cmem to ensure that its configured to use our pool configuration. | ||
68 | +rmmod cmemk 2>/dev/null | ||
69 | + | ||
70 | # insert cmemk, tell it to occupy physical 120MB-128MB, create | ||
71 | # 20 4K buffers, 10 128K buffers and two 1MB buffers | ||
72 | -insmod cmemk.ko phys_start=0xC2000000 phys_end=0xC4000000 pools=20x4096 | ||
73 | - | ||
74 | -# insert DSP/BIOS Link driver | ||
75 | -# | ||
76 | -insmod dsplinkk.ko | ||
77 | +modprobe cmemk phys_start=0xC2000000 phys_end=0xC4000000 pools=20x4096 allowOverlap=1 | ||
78 | +modprobe dsplinkk | ||
79 | |||
80 | # make /dev/dsplink | ||
81 | rm -f /dev/dsplink | ||
diff --git a/recipes-ti/c6accel/ti-c6accel_1.01.00.06.bb b/recipes-ti/c6accel/ti-c6accel_1.01.00.06.bb deleted file mode 100644 index 61263c53..00000000 --- a/recipes-ti/c6accel/ti-c6accel_1.01.00.06.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | require ti-c6accel.inc | ||
2 | |||
3 | SRC_URI[c6accelbin.md5sum] = "4cfb9ae9d1b69954a22b454726d4d6cb" | ||
4 | SRC_URI[c6accelbin.sha256sum] = "9fac3295c5c8533535e18f96c9a31c446f5a275798ace8c145f9ed51fa3e3ece" | ||
5 | |||
6 | LIC_FILES_CHKSUM = "file://docs/ReleaseNotes_C6Accel.txt;md5=28fbd64e0ba4a1af1a2f1179024f38a9" | ||
7 | |||
8 | SSRC_URI_append = " \ | ||
9 | file://0001-soc-honour-buildsystem-CFLAGS-and-LDFLAGS-when-set.patch \ | ||
10 | " | ||
11 | |||
12 | PV = "1_01_00_06" | ||
13 | |||
14 | |||
15 | CFLAGS += "-fPIC" | ||
16 | |||
diff --git a/recipes-ti/dsplink/ti-dsplink.inc b/recipes-ti/dsplink/ti-dsplink.inc deleted file mode 100644 index e0096155..00000000 --- a/recipes-ti/dsplink/ti-dsplink.inc +++ /dev/null | |||
@@ -1,195 +0,0 @@ | |||
1 | DESCRIPTION = "DSPLINK Inter-Processor Communications (IPC) for TI ARM/DSP processors" | ||
2 | HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/DSPLink/index.html" | ||
3 | SECTION = "devel" | ||
4 | LICENSE = "GPLv2" | ||
5 | |||
6 | LIC_FILES_CHKSUM = "file://dsplink/doc/gpl_2.0.pdf;md5=70996be607b61df78ce46093f4afe2bd" | ||
7 | |||
8 | |||
9 | # TODO :: KERNEL_CC, should use for kernel cc for module build? | ||
10 | # TODO :: Need to understand why OBJDUMP is required for kernel module | ||
11 | # TODO :: Unset required since LDFLAGS gets picked up and used incorrectly - investigate | ||
12 | # TODO :: Do we need to pass so many variables to each make step? | ||
13 | |||
14 | inherit module | ||
15 | |||
16 | require ../includes/ti-paths.inc | ||
17 | require ../includes/ti-staging.inc | ||
18 | |||
19 | PROVIDES = "ti-dsplink-module" | ||
20 | PROVIDES += "ti-dsplink-examples" | ||
21 | |||
22 | # This package builds a kernel module, use kernel PR as base and append a local version | ||
23 | PR = "${MACHINE_KERNEL_PR}" | ||
24 | PR_append = "h" | ||
25 | |||
26 | S = "${WORKDIR}/dsplink_linux_${PV}" | ||
27 | |||
28 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/${PV_DL_PATH}/dsplink_linux_${PV}.tar.gz;name=dsplinktarball \ | ||
29 | file://ti-dsplink-examples-run.sh \ | ||
30 | file://ti-dsplink-examples-loadmodules.sh \ | ||
31 | file://ti-dsplink-examples-unloadmodules.sh " | ||
32 | |||
33 | DEPENDS = "ti-dspbios ti-xdctools-native ti-cgt6x" | ||
34 | DEPENDS += "virtual/kernel perl-native" | ||
35 | |||
36 | # SOC_FAMILY configuration | ||
37 | |||
38 | DSPLINKPLATFORM_dm6446 = "DAVINCI" | ||
39 | DSPLINKPLATFORM_dm6467 = "DAVINCIHD" | ||
40 | DSPLINKPLATFORM_omapl137 = "OMAPL1XX" | ||
41 | DSPLINKPLATFORM_omapl138 = "OMAPL138" | ||
42 | DSPLINKPLATFORM_omap3 = "OMAP3530" | ||
43 | DSPLINKPLATFORM ?= "<UNDEFINED_DSPLINKPLATFORM>" | ||
44 | |||
45 | DSPLINKDSPCFG_dm6446 = "DM6446GEMSHMEM" | ||
46 | DSPLINKDSPCFG_dm6467 = "DM6467GEMSHMEM" | ||
47 | DSPLINKDSPCFG_omapl137 = "OMAPL1XXGEMSHMEM" | ||
48 | DSPLINKDSPCFG_omapl138 = "OMAPL138GEMSHMEM" | ||
49 | DSPLINKDSPCFG_omap3 = "OMAP3530SHMEM" | ||
50 | DSPLINKDSPCFG ?= "<UNDEFINED_DSPLINKDSPCFG>" | ||
51 | |||
52 | DSPLINKDSP_dm6446 = "DM6446GEM_0" | ||
53 | DSPLINKDSP_dm6467 = "DM6467GEM_0" | ||
54 | DSPLINKDSP_omapl137 = "OMAPL1XXGEM_0" | ||
55 | DSPLINKDSP_omapl138 = "OMAPL138GEM_0" | ||
56 | DSPLINKDSP_omap3 = "OMAP3530_0" | ||
57 | DSPLINKDSP ?= "<UNDEFINED_DSPLINKDSP>" | ||
58 | |||
59 | DSPLINKGPPOS_dm6446 = "DM6446LSP" | ||
60 | DSPLINKGPPOS_dm6467 = "DM6467LSP" | ||
61 | DSPLINKGPPOS_omapl137 = "ARM" | ||
62 | DSPLINKGPPOS_omapl138 = "ARM" | ||
63 | DSPLINKGPPOS_omap3 = "OMAPLSP" | ||
64 | DSPLINKGPPOS ?= "<DEFINED_DSPLINKGPPOS>" | ||
65 | |||
66 | # Exported Variable needed by build | ||
67 | DSPLINK = "${S}/dsplink" | ||
68 | export DSPLINK | ||
69 | |||
70 | do_configure() { | ||
71 | |||
72 | # Run perl script to create appropriate makefiles (v1.60 and up) | ||
73 | ( | ||
74 | cd ${DSPLINK} | ||
75 | perl config/bin/dsplinkcfg.pl --platform=${DSPLINKPLATFORM} --nodsp=1 \ | ||
76 | --dspcfg_0=${DSPLINKDSPCFG} --dspos_0=DSPBIOS5XX \ | ||
77 | --gppos=${DSPLINKGPPOS} --comps=ponslrmc | ||
78 | ) | ||
79 | } | ||
80 | |||
81 | do_prepsources () { | ||
82 | |||
83 | # Prepare the tree for rebuiling - clean and generate interfaces | ||
84 | XDCPATH=${DSPLINK} ${XDC_INSTALL_DIR}/xdc .make -PR . | ||
85 | XDCPATH=${DSPLINK} ${XDC_INSTALL_DIR}/xdc clean -PR . | ||
86 | XDCPATH=${DSPLINK} ${XDC_INSTALL_DIR}/xdc .interfaces -PR . | ||
87 | } | ||
88 | |||
89 | addtask prepsources after do_configure before do_compile | ||
90 | |||
91 | do_compile() { | ||
92 | # TODO :: KERNEL_CC, should use for kernel module build? | ||
93 | # TODO :: Need to understand why OBJDUMP is required for kernel module | ||
94 | # Unset these since LDFLAGS gets picked up and used incorrectly.... need | ||
95 | # investigation | ||
96 | |||
97 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | ||
98 | |||
99 | # Build the gpp user space library | ||
100 | cd ${DSPLINK}/gpp/src/api && make \ | ||
101 | CROSS_COMPILE="${TARGET_PREFIX}" \ | ||
102 | CC="${TOOLCHAIN_PATH}/${TARGET_PREFIX}gcc" \ | ||
103 | AR="${TOOLCHAIN_PATH}/${TARGET_PREFIX}ar" \ | ||
104 | LD="${TOOLCHAIN_PATH}/${TARGET_PREFIX}ld" \ | ||
105 | COMPILER="${TOOLCHAIN_PATH}/${TARGET_PREFIX}gcc" \ | ||
106 | ARCHIVER="${TOOLCHAIN_PATH}/${TARGET_PREFIX}ar" \ | ||
107 | KERNEL_DIR="${STAGING_KERNEL_DIR}" \ | ||
108 | all | ||
109 | |||
110 | # Build the gpp kernel space (debug and release) | ||
111 | do_make_scripts | ||
112 | cd ${DSPLINK}/gpp/src && make \ | ||
113 | OBJDUMP="${TARGET_PREFIX}objdump" \ | ||
114 | CROSS_COMPILE="${TARGET_PREFIX}" \ | ||
115 | CC="${TOOLCHAIN_PATH}/${TARGET_PREFIX}gcc" \ | ||
116 | AR="${TOOLCHAIN_PATH}/${TARGET_PREFIX}ar" \ | ||
117 | LD="${TOOLCHAIN_PATH}/${TARGET_PREFIX}ld" \ | ||
118 | COMPILER="${TOOLCHAIN_PATH}/${TARGET_PREFIX}gcc" \ | ||
119 | ARCHIVER="${TOOLCHAIN_PATH}/${TARGET_PREFIX}ar" \ | ||
120 | KERNEL_DIR="${STAGING_KERNEL_DIR}" \ | ||
121 | BASE_BUILDOS="${STAGING_KERNEL_DIR}" \ | ||
122 | all | ||
123 | |||
124 | # Build the gpp samples | ||
125 | cd ${DSPLINK}/gpp/src/samples && make \ | ||
126 | BASE_TOOLCHAIN="${TOOLCHAIN_PATH}" \ | ||
127 | BASE_CGTOOLS="${BASE_TOOLCHAIN}/bin" \ | ||
128 | OSINC_PLATFORM="${TOOLCHAIN_PATH}/lib/gcc/${TARGET_SYS}/$(${TARGET_PREFIX}gcc -dumpversion)/include" \ | ||
129 | OSINC_TARGET="${BASE_TOOLCHAIN}/target/usr/include" \ | ||
130 | CROSS_COMPILE="${TARGET_PREFIX}" \ | ||
131 | CC="${TOOLCHAIN_PATH}/${TARGET_PREFIX}gcc" \ | ||
132 | LD="${TOOLCHAIN_PATH}/${TARGET_PREFIX}gcc" \ | ||
133 | AR="${TOOLCHAIN_PATH}/${TARGET_PREFIX}ar" \ | ||
134 | COMPILER="${TOOLCHAIN_PATH}/${TARGET_PREFIX}gcc" \ | ||
135 | LINKER="${TOOLCHAIN_PATH}/${TARGET_PREFIX}gcc" \ | ||
136 | ARCHIVER="${TOOLCHAIN_PATH}/${TARGET_PREFIX}ar" \ | ||
137 | KERNEL_DIR="${STAGING_KERNEL_DIR}" \ | ||
138 | all | ||
139 | |||
140 | # Build the dsp library (debug and release) | ||
141 | cd ${DSPLINK}/dsp/src && make \ | ||
142 | BASE_CGTOOLS="${CODEGEN_INSTALL_DIR}" \ | ||
143 | BASE_SABIOS="${BIOS_INSTALL_DIR}" \ | ||
144 | all | ||
145 | |||
146 | # Build the dsp samples (debug and release) | ||
147 | cd ${DSPLINK}/dsp/src/samples && make \ | ||
148 | BASE_CGTOOLS="${CODEGEN_INSTALL_DIR}" \ | ||
149 | BASE_SABIOS="${BIOS_INSTALL_DIR}" \ | ||
150 | all | ||
151 | } | ||
152 | |||
153 | KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}" | ||
154 | |||
155 | do_install () { | ||
156 | |||
157 | # Install the kernel module | ||
158 | install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp | ||
159 | install -m 0755 ${DSPLINK}/gpp/export/BIN/Linux/${DSPLINKPLATFORM}/RELEASE/dsplinkk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/ | ||
160 | |||
161 | # Install the example apps (gpp and dsp) | ||
162 | install -d ${D}/${installdir}/ti-dsplink-examples/ | ||
163 | cp ${DSPLINK}/gpp/export/BIN/Linux/${DSPLINKPLATFORM}/RELEASE/*gpp ${D}/${installdir}/ti-dsplink-examples | ||
164 | cp ${DSPLINK}/dsp/export/BIN/DspBios/${DSPLINKPLATFORM}/${DSPLINKDSP}/RELEASE/*.out ${D}/${installdir}/ti-dsplink-examples | ||
165 | |||
166 | # Install the example apps module un/load scripts | ||
167 | install ${WORKDIR}/ti-dsplink-examples-loadmodules.sh ${D}/${installdir}/ti-dsplink-examples | ||
168 | install ${WORKDIR}/ti-dsplink-examples-unloadmodules.sh ${D}/${installdir}/ti-dsplink-examples | ||
169 | install ${WORKDIR}/ti-dsplink-examples-run.sh ${D}/${installdir}/ti-dsplink-examples | ||
170 | |||
171 | # Install/Stage the Source Tree | ||
172 | install -d ${D}${LINK_INSTALL_DIR_RECIPE} | ||
173 | cp -pPrf ${S}/* ${D}${LINK_INSTALL_DIR_RECIPE} | ||
174 | chmod -R +w ${D}${LINK_INSTALL_DIR_RECIPE} | ||
175 | |||
176 | # Changes path of include txt file to use LINK_INSTALL_DIR variable for GPP | ||
177 | for i in $(find ${D}${LINK_INSTALL_DIR_RECIPE}/dsplink/gpp/export/BIN/Linux/${DSPLINKPLATFORM}/*/ -name "*.txt"); do | ||
178 | sed -i ${i} -e s=${S}=\$\{LINK_INSTALL_DIR\}=g | ||
179 | done | ||
180 | |||
181 | # Changes path of include txt file to use LINK_INSTALL_DIR variable for DSP | ||
182 | for i in $(find ${D}${LINK_INSTALL_DIR_RECIPE}/dsplink/dsp/export/BIN/DspBios/${DSPLINKPLATFORM}/${DSPLINKDSP}/*/ -name "*.txt"); do | ||
183 | sed -i ${i} -e s=${S}=\$\{LINK_INSTALL_DIR\}=g | ||
184 | done | ||
185 | |||
186 | } | ||
187 | |||
188 | PACKAGES =+ "ti-dsplink-module" | ||
189 | FILES_ti-dsplink-module = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/dsplinkk.ko" | ||
190 | |||
191 | PACKAGES += "ti-dsplink-examples" | ||
192 | RDEPENDS_ti-dsplink-examples_append = " ti-dsplink-module" | ||
193 | RDEPENDS_ti-dsplink-examples_append_omap3 += " ti-lpm-module ti-lpm-utils" | ||
194 | FILES_ti-dsplink-examples = "${installdir}/ti-dsplink-examples/*" | ||
195 | INSANE_SKIP_ti-dsplink-examples = "1" | ||
diff --git a/recipes-ti/dsplink/ti-dsplink/0001-remove-check-for-make-version-3.85-works-fine.patch b/recipes-ti/dsplink/ti-dsplink/0001-remove-check-for-make-version-3.85-works-fine.patch deleted file mode 100644 index 70596c5d..00000000 --- a/recipes-ti/dsplink/ti-dsplink/0001-remove-check-for-make-version-3.85-works-fine.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From a96aa25518f306138c71b3fc074381f102092a13 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Fri, 23 Dec 2011 10:58:47 +0100 | ||
4 | Subject: [PATCH] remove check for make version, 3.85 works fine | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | --- | ||
8 | dsplink/make/start.mk | 4 ---- | ||
9 | 1 files changed, 0 insertions(+), 4 deletions(-) | ||
10 | |||
11 | diff --git a/dsplink/make/start.mk b/dsplink/make/start.mk | ||
12 | index 0589f3c..a8f5740 100644 | ||
13 | --- a/dsplink/make/start.mk | ||
14 | +++ b/dsplink/make/start.mk | ||
15 | @@ -39,10 +39,6 @@ | ||
16 | # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
17 | # ============================================================================ | ||
18 | |||
19 | - | ||
20 | -# Check for MAKE version | ||
21 | -$(if $(filter $(MAKE_VERSION), 3.81 3.81beta1 3.90 3.92),,\ | ||
22 | -$(error This makefile requires one of GNU make version 3.81 3.81beta1 3.90 3.92)) | ||
23 | # ============================================================================ | ||
24 | # Export the directory separator | ||
25 | # ============================================================================ | ||
26 | -- | ||
27 | 1.7.7.4 | ||
28 | |||
diff --git a/recipes-ti/dsplink/ti-dsplink/dsplink-BKL-fix.patch b/recipes-ti/dsplink/ti-dsplink/dsplink-BKL-fix.patch deleted file mode 100644 index eab3ec63..00000000 --- a/recipes-ti/dsplink/ti-dsplink/dsplink-BKL-fix.patch +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | From e0931bf37628727903a567f1c7096ae0011edc3d Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Tue, 4 Jan 2011 13:49:05 +0100 | ||
4 | Subject: [PATCH] Adjust drv_pmgr for post 2.6.36 ioctl changes | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | --- | ||
8 | dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c | 17 ++++++++++++++++- | ||
9 | 1 files changed, 16 insertions(+), 1 deletions(-) | ||
10 | |||
11 | diff --git a/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c b/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c | ||
12 | index a9b831c..e4a836d 100644 | ||
13 | --- a/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c | ||
14 | +++ b/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c | ||
15 | @@ -399,10 +399,15 @@ DRV_Release (struct inode * inode, struct file * filp) ; | ||
16 | * @see None | ||
17 | * ---------------------------------------------------------------------------- | ||
18 | */ | ||
19 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) | ||
20 | STATIC | ||
21 | int | ||
22 | DRV_Ioctl (struct inode * inode, struct file * filp, | ||
23 | unsigned int cmd, unsigned long args) ; | ||
24 | +#else | ||
25 | +STATIC | ||
26 | +int DRV_Ioctl (struct file *filp, unsigned int cmd, unsigned long args); | ||
27 | +#endif | ||
28 | |||
29 | |||
30 | /** ---------------------------------------------------------------------------- | ||
31 | @@ -495,7 +500,11 @@ STATIC struct file_operations driverOps = { | ||
32 | open: DRV_Open, | ||
33 | flush: DRV_Flush, | ||
34 | release: DRV_Release, | ||
35 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) | ||
36 | ioctl: DRV_Ioctl, | ||
37 | +#else | ||
38 | + unlocked_ioctl: DRV_Ioctl, | ||
39 | +#endif | ||
40 | mmap: DRV_Mmap, | ||
41 | read: DRV_Read, | ||
42 | .owner = THIS_MODULE | ||
43 | @@ -817,10 +826,16 @@ DRV_Release (struct inode * inode, struct file * filp) | ||
44 | * @desc Function to invoke the APIs through ioctl. | ||
45 | * ---------------------------------------------------------------------------- | ||
46 | */ | ||
47 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) | ||
48 | STATIC | ||
49 | NORMAL_API | ||
50 | int DRV_Ioctl (struct inode * inode, struct file * filp, | ||
51 | unsigned int cmd, unsigned long args) | ||
52 | +#else | ||
53 | +STATIC | ||
54 | +NORMAL_API | ||
55 | +int DRV_Ioctl (struct file *filp, unsigned int cmd, unsigned long args) | ||
56 | +#endif | ||
57 | { | ||
58 | DSP_STATUS status = DSP_SOK ; | ||
59 | int osStatus = 0 ; | ||
60 | @@ -829,7 +844,7 @@ int DRV_Ioctl (struct inode * inode, struct file * filp, | ||
61 | CMD_Args apiArgs ; | ||
62 | |||
63 | |||
64 | - TRC_4ENTER ("DRV_Ioctl", inode, filp, cmd, args) ; | ||
65 | + TRC_3ENTER ("DRV_Ioctl", filp, cmd, args) ; | ||
66 | |||
67 | retVal = copy_from_user ((Pvoid) &apiArgs, | ||
68 | (const Pvoid) srcAddr, | ||
69 | -- | ||
70 | 1.6.6.1 | ||
71 | |||
diff --git a/recipes-ti/dsplink/ti-dsplink/dsplink_1_64_add_dm6446_build_support.patch b/recipes-ti/dsplink/ti-dsplink/dsplink_1_64_add_dm6446_build_support.patch deleted file mode 100644 index 5a25dbb5..00000000 --- a/recipes-ti/dsplink/ti-dsplink/dsplink_1_64_add_dm6446_build_support.patch +++ /dev/null | |||
@@ -1,337 +0,0 @@ | |||
1 | From 7b36e94dcb33892e1df7d3327db31bd41fb6167e Mon Sep 17 00:00:00 2001 | ||
2 | From: Roger Monk <r-monk@ti.com> | ||
3 | Date: Fri, 5 Mar 2010 19:22:58 +0000 | ||
4 | Subject: [PATCH] dsplink_1_64: Add support for building with CS tools + against 2.6.30+ | ||
5 | |||
6 | * Tweaked Patches from Niclas | ||
7 | |||
8 | Signed-off-by: Roger Monk <r-monk@ti.com> | ||
9 | --- | ||
10 | dsplink/config/bin/dsplinkcfg.pl | 17 ++++- | ||
11 | dsplink/gpp/src/DIRS | 5 + | ||
12 | dslpink/gpp/src/Makefile | 8 ++- | ||
13 | dsplink/gpp/src/Rules.mk | 5 + | ||
14 | dsplink/make/Linux/davinci_2.6.mk | 211 +++++++++++++++++++++++++++++++++++++++++++++ | ||
15 | 5 files changed, 244 insertions(+), 2 deletions(-) | ||
16 | create mode 100644 make/Linux/davinci_2.6.mk | ||
17 | |||
18 | diff --git a/dsplink/config/bin/dsplinkcfg.pl b/dsplink/config/bin/dsplinkcfg.pl | ||
19 | index 644aa38..e83c133 100644 | ||
20 | --- a/dsplink/config/bin/dsplinkcfg.pl | ||
21 | +++ b/dsplink/config/bin/dsplinkcfg.pl | ||
22 | @@ -215,6 +215,18 @@ my %CFG_GPPOS_DM6467LSPuc = | ||
23 | 'OSPREFIX' => 'uc', | ||
24 | ) ; | ||
25 | |||
26 | +# DM6446 Linux | ||
27 | +my %CFG_GPPOS_DM6446LSP = | ||
28 | +( | ||
29 | + 'NAME' => 'DM6446LSP', | ||
30 | + 'PREFIX' => '2.6', | ||
31 | + 'ID' => 'DM6446LSP', | ||
32 | + 'DESC' => 'DM6446 LSP for DM6446', | ||
33 | + 'VER' => '2.6.18', | ||
34 | + 'TYPE' => 'Linux', | ||
35 | + 'LOADERS'=> [\%CFG_LOADER_COFF, ], | ||
36 | + 'COMPS' => 'ponslrmc', | ||
37 | +) ; | ||
38 | |||
39 | # OMAPL138 Linux with uCLibc filesystem | ||
40 | my %CFG_GPPOS_OMAPL138LSPuc = | ||
41 | @@ -356,7 +368,7 @@ my %CFG_DSPCFG_DM6446GEMSHMEM = | ||
42 | 'PHYID' => 'DM6446GEMSHMEM', | ||
43 | 'PHYDESC' => 'Shared Memory Physical Interface', | ||
44 | 'PHYTYPE' => 'SHMEM', | ||
45 | - 'GPPOS' => [\%CFG_GPPOS_MVL5U, \%CFG_GPPOS_MVL5G], | ||
46 | + 'GPPOS' => [\%CFG_GPPOS_MVL5U, \%CFG_GPPOS_MVL5G, \%CFG_GPPOS_DM6446LSP], | ||
47 | 'DSPOS' => [\%CFG_DSPOS_5XX, \%CFG_DSPOS_6XX], | ||
48 | # DSP defines | ||
49 | 'DSPNAME' => 'DM6446GEM', | ||
50 | @@ -2994,6 +3006,9 @@ sub main { | ||
51 | if ($platform {'ID'} eq 'DA850') { | ||
52 | print "GPP side distribution file: \$DSPLINK" . $DIRSEP . "gpp" . $DIRSEP. "src" . $DIRSEP. "Rules.mk\n" ; | ||
53 | } | ||
54 | + if ($platform {'ID'} eq 'DAVINCI') { | ||
55 | + print "GPP side distribution file: \$DSPLINK" . $DIRSEP . "gpp" . $DIRSEP. "src" . $DIRSEP. "Rules.mk\n" ; | ||
56 | + } | ||
57 | if ($platform {'ID'} eq 'DAVINCIHD') { | ||
58 | print "GPP side distribution file: \$DSPLINK" . $DIRSEP . "gpp" . $DIRSEP. "src" . $DIRSEP. "Rules.mk\n" ; | ||
59 | } | ||
60 | diff --git a/dsplink/gpp/src/DIRS b/dsplink/gpp/src/DIRS | ||
61 | index e82969c..05bad2b 100644 | ||
62 | --- a/dsplink/gpp/src/DIRS | ||
63 | +++ b/dsplink/gpp/src/DIRS | ||
64 | @@ -63,6 +63,10 @@ ifeq ("$(TI_DSPLINK_PLATFORM)", "DAVINCIHD") | ||
65 | DIRS += \ | ||
66 | api | ||
67 | else # ifeq ("$(TI_DSPLINK_PLATFORM)", "DAVINCIHD") | ||
68 | +ifeq ("$(TI_DSPLINK_PLATFORM)", "DAVINCI") | ||
69 | +DIRS += \ | ||
70 | + api | ||
71 | +else # ifeq ("$(TI_DSPLINK_PLATFORM)", "DAVINCI") | ||
72 | ifeq ("$(TI_DSPLINK_PLATFORM)", "DA850") | ||
73 | DIRS += \ | ||
74 | api | ||
75 | @@ -77,6 +81,7 @@ DIRS += \ | ||
76 | endif # ifeq ("$(TI_DSPLINK_PLATFORM)", "OMAP3530") | ||
77 | endif # ifeq ("$(TI_DSPLINK_PLATFORM)", "OMAPL138") | ||
78 | endif # ifeq ("$(TI_DSPLINK_PLATFORM)", "DAVINCIHD") | ||
79 | +endif # ifeq ("$(TI_DSPLINK_PLATFORM)", "DAVINCI") | ||
80 | endif # ifeq ("$(TI_DSPLINK_PLATFORM)", "DA850") | ||
81 | else # ifeq ("$(TI_DSPLINK_GPPOS)", "Linux") | ||
82 | DIRS += \ | ||
83 | diff --git a/dsplink/gpp/src/Makefile b/dsplink/gpp/src/Makefile | ||
84 | index 9e6bbb1..49c3b97 100644 | ||
85 | --- a/dsplink/gpp/src/Makefile | ||
86 | +++ b/dsplink/gpp/src/Makefile | ||
87 | @@ -78,7 +78,13 @@ ifeq ("$(TI_DSPLINK_GPPOS)", "Linux") | ||
88 | include $(DSPLINK)$(DIRSEP)gpp$(DIRSEP)src$(DIRSEP)Rules.mk | ||
89 | include $(DSPLINK)$(DIRSEP)gpp$(DIRSEP)src$(DIRSEP)Makefile_kbuild | ||
90 | else # else ("$(TI_DSPLINK_PLATFORM)", "DAVINCIHD") | ||
91 | - include Makefile_bld | ||
92 | + ifeq ("$(TI_DSPLINK_PLATFORM)", "DAVINCI") | ||
93 | + include $(DSPLINK)$(DIRSEP)gpp$(DIRSEP)src$(DIRSEP)Makefile_bld | ||
94 | + include $(DSPLINK)$(DIRSEP)gpp$(DIRSEP)src$(DIRSEP)Rules.mk | ||
95 | + include $(DSPLINK)$(DIRSEP)gpp$(DIRSEP)src$(DIRSEP)Makefile_kbuild | ||
96 | + else # else ("$(TI_DSPLINK_PLATFORM)", "DAVINCI") | ||
97 | + include Makefile_bld | ||
98 | + endif # ifeq ("$(TI_DSPLINK_PLATFORM)", "DAVINCI") | ||
99 | endif # ifeq ("$(TI_DSPLINK_PLATFORM)", "OMAP3530") | ||
100 | endif # ifeq ("$(TI_DSPLINK_PLATFORM)", "DA850") | ||
101 | endif # ifeq ("$(TI_DSPLINK_PLATFORM)", "OMAPL138") | ||
102 | diff --git a/dsplink/gpp/src/Rules.mk b/dsplink/gpp/src/Rules.mk | ||
103 | index 658ee8a..5a6f52a 100644 | ||
104 | --- a/dsplink/gpp/src/Rules.mk | ||
105 | +++ b/dsplink/gpp/src/Rules.mk | ||
106 | @@ -63,6 +63,11 @@ KERNEL_DIR := ${HOME}/da850/DaVinci-PSP-SDK-03.20.00.01/src/kernel/linux-03.2 | ||
107 | TOOL_PATH := ${HOME}/git/arm-2008q3/bin | ||
108 | endif #ifeq ("$(TI_DSPLINK_PLATFORM)", "DA850") | ||
109 | |||
110 | +ifeq ("$(TI_DSPLINK_PLATFORM)", "DAVINCI") | ||
111 | +KERNEL_DIR := ${HOME}/linux-davinci | ||
112 | +TOOL_PATH := ${HOME}/toolchains/git/arm-2009q1-203/bin | ||
113 | +endif #ifeq ("$(TI_DSPLINK_PLATFORM)", "DAVINCI") | ||
114 | + | ||
115 | ifeq ("$(TI_DSPLINK_PLATFORM)", "DAVINCIHD") | ||
116 | KERNEL_DIR := ${HOME}/linux-davinci | ||
117 | TOOL_PATH := ${HOME}/toolchains/git/arm-2009q1-203/bin | ||
118 | diff --git a/dsplink/make/Linux/davinci_2.6.mk b/dsplink/make/Linux/davinci_2.6.mk | ||
119 | new file mode 100644 | ||
120 | index 0000000..834fd74 | ||
121 | --- /dev/null | ||
122 | +++ b/dsplink/make/Linux/davinci_2.6.mk | ||
123 | @@ -0,0 +1,211 @@ | ||
124 | +# ============================================================================ | ||
125 | +# @file davinci_2.6.mk | ||
126 | +# | ||
127 | +# @path $(DSPLINK)/make/Linux/ | ||
128 | +# | ||
129 | +# @desc This makefile defines OS specific macros used by MAKE system for | ||
130 | +# the Montavista Pro 5.0 Linux distribution. | ||
131 | +# | ||
132 | +# @ver 1.64 | ||
133 | +# ============================================================================ | ||
134 | +# Copyright (C) 2002-2009, Texas Instruments Incorporated - | ||
135 | +# http://www.ti.com/ | ||
136 | +# | ||
137 | +# Redistribution and use in source and binary forms, with or without | ||
138 | +# modification, are permitted provided that the following conditions | ||
139 | +# are met: | ||
140 | +# | ||
141 | +# * Redistributions of source code must retain the above copyright | ||
142 | +# notice, this list of conditions and the following disclaimer. | ||
143 | +# | ||
144 | +# * Redistributions in binary form must reproduce the above copyright | ||
145 | +# notice, this list of conditions and the following disclaimer in the | ||
146 | +# documentation and/or other materials provided with the distribution. | ||
147 | +# | ||
148 | +# * Neither the name of Texas Instruments Incorporated nor the names of | ||
149 | +# its contributors may be used to endorse or promote products derived | ||
150 | +# from this software without specific prior written permission. | ||
151 | +# | ||
152 | +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
153 | +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
154 | +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
155 | +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | ||
156 | +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
157 | +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
158 | +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | ||
159 | +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | ||
160 | +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | ||
161 | +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, | ||
162 | +# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
163 | +# ============================================================================ | ||
164 | + | ||
165 | + | ||
166 | +ifndef DAVINCI_LINUX2_6_MK | ||
167 | + | ||
168 | +define DAVINCI_LINUX2_6_MK | ||
169 | +endef | ||
170 | + | ||
171 | + | ||
172 | +# ============================================================================ | ||
173 | +# Let the make system know that a specific distribution for the GPP OS | ||
174 | +# is being used. | ||
175 | +# ============================================================================ | ||
176 | +USE_DISTRIBUTION := 1 | ||
177 | + | ||
178 | + | ||
179 | +# ============================================================================ | ||
180 | +# Set the values of necessary variables to be used for the OS. | ||
181 | +# ============================================================================ | ||
182 | + | ||
183 | +# ---------------------------------------------------------------------------- | ||
184 | +# Base directory for the GPP OS | ||
185 | +# ---------------------------------------------------------------------------- | ||
186 | +BASE_BUILDOS := ${HOME}/linux-davinci | ||
187 | + | ||
188 | +# ---------------------------------------------------------------------------- | ||
189 | +# Base for toolchain | ||
190 | +# ---------------------------------------------------------------------------- | ||
191 | +BASE_TOOLCHAIN := ${HOME}/toolchains/git/arm-2009q1-203 | ||
192 | + | ||
193 | +# ---------------------------------------------------------------------------- | ||
194 | +# Base for code generation tools - compiler, linker, archiver etc. | ||
195 | +# ---------------------------------------------------------------------------- | ||
196 | +BASE_CGTOOLS := $(BASE_TOOLCHAIN)/bin | ||
197 | + | ||
198 | +# ---------------------------------------------------------------------------- | ||
199 | +# Base directory for include files provided by GPP OS | ||
200 | +# ---------------------------------------------------------------------------- | ||
201 | +BASE_OSINC := $(BASE_BUILDOS)/include | ||
202 | + | ||
203 | +OSINC_GENERIC := $(BASE_OSINC) | ||
204 | +OSINC_PLATFORM := $(BASE_TOOLCHAIN)/lib/gcc/arm-none-linux-gnueabi/4.2.3/include | ||
205 | +OSINC_TARGET := $(BASE_TOOLCHAIN)/arm-none-linux-gnueabi/libc/usr/include | ||
206 | + | ||
207 | +ifneq ("$(VARIANT)", "") | ||
208 | +OSINC_VARIANT := $(BASE_OSINC) | ||
209 | +endif | ||
210 | + | ||
211 | + | ||
212 | +# ---------------------------------------------------------------------------- | ||
213 | +# Base directory for libraries provided by GPP OS | ||
214 | +# ---------------------------------------------------------------------------- | ||
215 | +BASE_OSLIB := $(BASE_TOOLCHAIN)/lib | ||
216 | + | ||
217 | +OSLIB_GENERIC := $(BASE_OSLIB) | ||
218 | +OSLIB_PLATFORM := $(BASE_OSLIB) | ||
219 | + | ||
220 | + | ||
221 | +ifneq ("$(VARIANT)", "") | ||
222 | +OSLIB_VARIANT := $(BASE_OSLIB) | ||
223 | +endif | ||
224 | + | ||
225 | + | ||
226 | +# ============================================================================ | ||
227 | +# COMPILER | ||
228 | +# ============================================================================ | ||
229 | + | ||
230 | +# ---------------------------------------------------------------------------- | ||
231 | +# Name of the compiler | ||
232 | +# ---------------------------------------------------------------------------- | ||
233 | +COMPILER := $(BASE_CGTOOLS)/arm-none-linux-gnueabi-gcc | ||
234 | +LD := $(BASE_CGTOOLS)/arm-none-linux-gnueabi-ld | ||
235 | + | ||
236 | +CROSS_COMPILE := arm-none-linux-gnueabi- | ||
237 | +export CROSS_COMPILE | ||
238 | + | ||
239 | +# ---------------------------------------------------------------------------- | ||
240 | +# Command line switches used by the compiler | ||
241 | +# | ||
242 | +# CC_SW_DEF Command line defines | ||
243 | +# CC_SW_INC Search path for header files | ||
244 | +# CC_SW_OBJ Create object file | ||
245 | +# CC_SW_DEB Include debug information | ||
246 | +# ---------------------------------------------------------------------------- | ||
247 | +CC_SW_DEF := -D | ||
248 | +CC_SW_INC := -I | ||
249 | +CC_SW_OBJ := -o | ||
250 | +CC_SW_DEB := -g | ||
251 | + | ||
252 | +# ---------------------------------------------------------------------------- | ||
253 | +# Standard flags for the compiler | ||
254 | +# ---------------------------------------------------------------------------- | ||
255 | +STD_USER_FLAGS := -Wall -c | ||
256 | + | ||
257 | +# ---------------------------------------------------------------------------- | ||
258 | +# Flags for the compiler when building a library | ||
259 | +# ---------------------------------------------------------------------------- | ||
260 | +EXE_CC_FLAGS := | ||
261 | + | ||
262 | +# ---------------------------------------------------------------------------- | ||
263 | +# Standard flags for the compiler when building an executable | ||
264 | +# ---------------------------------------------------------------------------- | ||
265 | +DRV_CC_FLAGS := -nostdinc | ||
266 | + | ||
267 | +# ---------------------------------------------------------------------------- | ||
268 | +# Flags for the compiler when building a driver | ||
269 | +# ---------------------------------------------------------------------------- | ||
270 | +LIB_CC_FLAGS := | ||
271 | + | ||
272 | +# ---------------------------------------------------------------------------- | ||
273 | +# Standard definitions for the compiler | ||
274 | +# ---------------------------------------------------------------------------- | ||
275 | +STD_CC_DEFNS := -D_REENTRANT | ||
276 | + | ||
277 | +# ============================================================================ | ||
278 | +# ARCHIVER2 - This denotes the archiver. | ||
279 | +# ============================================================================ | ||
280 | +ARCHIVER := $(BASE_CGTOOLS)/arm-none-linux-gnueabi-ar | ||
281 | + | ||
282 | +# ---------------------------------------------------------------------------- | ||
283 | +# Standard flags for the archiver | ||
284 | +# ---------------------------------------------------------------------------- | ||
285 | +STD_AR_FLAGS := -rs | ||
286 | + | ||
287 | + | ||
288 | +# ============================================================================ | ||
289 | +# LINKER used for Library & Driver build | ||
290 | +# ============================================================================ | ||
291 | +LINKER := $(BASE_CGTOOLS)/arm-none-linux-gnueabi-gcc | ||
292 | + | ||
293 | +# ---------------------------------------------------------------------------- | ||
294 | +# Command line switches used by the linker | ||
295 | +# | ||
296 | +# LD_SW_LIB Search path for libraries | ||
297 | +# LD_SW_OUT Output filename | ||
298 | +# LD_SW_RELOC Generate relocateable output | ||
299 | +# ---------------------------------------------------------------------------- | ||
300 | +LD_SW_LIB := -L | ||
301 | +LD_SW_OUT := -o | ||
302 | +LD_SW_RELOC := -r | ||
303 | + | ||
304 | +# ---------------------------------------------------------------------------- | ||
305 | +# Flags for the LD when building an executable | ||
306 | +# ---------------------------------------------------------------------------- | ||
307 | +STD_LD_FLAGS := | ||
308 | + | ||
309 | +# ---------------------------------------------------------------------------- | ||
310 | +# Standard flags for the LD | ||
311 | +# ---------------------------------------------------------------------------- | ||
312 | +EXE_LD_FLAGS := -lpthread -lc | ||
313 | + | ||
314 | +# ---------------------------------------------------------------------------- | ||
315 | +# Standard flags for the archiver | ||
316 | +# ---------------------------------------------------------------------------- | ||
317 | +DRV_LD_FLAGS := | ||
318 | + | ||
319 | + | ||
320 | +# ============================================================================ | ||
321 | +# Post processing utilities for Linux 2.6 | ||
322 | +# ============================================================================ | ||
323 | +ifneq ($(CONFIG_MODVERSIONS),) | ||
324 | +CMD_MODPOST_FLAGS := -m -i | ||
325 | +else | ||
326 | +CMD_MODPOST_FLAGS := -i | ||
327 | +endif | ||
328 | + | ||
329 | +CMD_MODPOST := $(BASE_BUILDOS)/scripts/mod/modpost \ | ||
330 | + $(CMD_MODPOST_FLAGS) $(BASE_BUILDOS)/Module.symvers \ | ||
331 | + $(BASE_BUILDOS)/vmlinux | ||
332 | + | ||
333 | + | ||
334 | +endif # ifndef DAVINCI_LINUX2_6_MK | ||
335 | -- | ||
336 | 1.6.0.6 | ||
337 | |||
diff --git a/recipes-ti/dsplink/ti-dsplink/dsplink_1_64_add_omapl137_build_support.patch b/recipes-ti/dsplink/ti-dsplink/dsplink_1_64_add_omapl137_build_support.patch deleted file mode 100644 index fa4cb2e6..00000000 --- a/recipes-ti/dsplink/ti-dsplink/dsplink_1_64_add_omapl137_build_support.patch +++ /dev/null | |||
@@ -1,288 +0,0 @@ | |||
1 | From fd5858c3a247bc61a4de3af1a5097cb05042cfa4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Roger Monk <r-monk@ti.com> | ||
3 | Date: Sun, 14 Mar 2010 22:13:42 +0000 | ||
4 | Subject: [PATCH] omap1 | ||
5 | |||
6 | Signed-off-by: Roger Monk <r-monk@ti.com> | ||
7 | --- | ||
8 | dsplink/config/bin/dsplinkcfg.pl | 2 +- | ||
9 | dsplink/gpp/src/DIRS | 5 + | ||
10 | dsplink/gpp/src/Makefile | 8 ++- | ||
11 | dsplink/make/Linux/omapl1xx_arm.mk | 210 ++++++++++++++++++++++++++++++++++++ | ||
12 | 4 files changed, 223 insertions(+), 2 deletions(-) | ||
13 | create mode 100644 dsplink/make/Linux/omapl1xx_arm.mk | ||
14 | |||
15 | diff --git a/dsplink/config/bin/dsplinkcfg.pl b/dsplink/config/bin/dsplinkcfg.pl | ||
16 | index e83c133..8151945 100644 | ||
17 | --- a/dsplink/config/bin/dsplinkcfg.pl | ||
18 | +++ b/dsplink/config/bin/dsplinkcfg.pl | ||
19 | @@ -523,7 +523,7 @@ my %CFG_DSPCFG_OMAPL1XXGEMSHMEM = | ||
20 | 'PHYID' => 'OMAPL1XXGEMSHMEM', | ||
21 | 'PHYDESC' => 'Shared Memory Physical Interface', | ||
22 | 'PHYTYPE' => 'SHMEM', | ||
23 | - 'GPPOS' => [\%CFG_GPPOS_MVL5U, \%CFG_GPPOS_MVL5G], | ||
24 | + 'GPPOS' => [\%CFG_GPPOS_MVL5U, \%CFG_GPPOS_MVL5G, \%CFG_GPPOS_ARM], | ||
25 | 'DSPOS' => [\%CFG_DSPOS_5XX], | ||
26 | # DSP defines | ||
27 | 'DSPNAME' => 'OMAPL1XXGEM', | ||
28 | diff --git a/dsplink/gpp/src/DIRS b/dsplink/gpp/src/DIRS | ||
29 | index 05bad2b..af48904 100644 | ||
30 | --- a/dsplink/gpp/src/DIRS | ||
31 | +++ b/dsplink/gpp/src/DIRS | ||
32 | @@ -55,6 +55,10 @@ ifeq ("$(TI_DSPLINK_PLATFORM)", "OMAPL138") | ||
33 | DIRS += \ | ||
34 | api | ||
35 | else # ifeq ("$(TI_DSPLINK_PLATFORM)", "OMAPL138") | ||
36 | +ifeq ("$(TI_DSPLINK_PLATFORM)", "OMAPL1XX") | ||
37 | +DIRS += \ | ||
38 | + api | ||
39 | +else # ifeq ("$(TI_DSPLINK_PLATFORM)", "OMAPL1XX") | ||
40 | ifeq ("$(TI_DSPLINK_PLATFORM)", "OMAP3530") | ||
41 | DIRS += \ | ||
42 | api | ||
43 | @@ -83,6 +87,7 @@ endif # ifeq ("$(TI_DSPLINK_PLATFORM)", "OMAPL138") | ||
44 | endif # ifeq ("$(TI_DSPLINK_PLATFORM)", "DAVINCIHD") | ||
45 | endif # ifeq ("$(TI_DSPLINK_PLATFORM)", "DAVINCI") | ||
46 | endif # ifeq ("$(TI_DSPLINK_PLATFORM)", "DA850") | ||
47 | +endif | ||
48 | else # ifeq ("$(TI_DSPLINK_GPPOS)", "Linux") | ||
49 | DIRS += \ | ||
50 | arch \ | ||
51 | diff --git a/dsplink/gpp/src/Makefile b/dsplink/gpp/src/Makefile | ||
52 | index 49c3b97..0afd988 100644 | ||
53 | --- a/dsplink/gpp/src/Makefile | ||
54 | +++ b/dsplink/gpp/src/Makefile | ||
55 | @@ -83,7 +83,13 @@ ifeq ("$(TI_DSPLINK_GPPOS)", "Linux") | ||
56 | include $(DSPLINK)$(DIRSEP)gpp$(DIRSEP)src$(DIRSEP)Rules.mk | ||
57 | include $(DSPLINK)$(DIRSEP)gpp$(DIRSEP)src$(DIRSEP)Makefile_kbuild | ||
58 | else # else ("$(TI_DSPLINK_PLATFORM)", "DAVINCI") | ||
59 | - include Makefile_bld | ||
60 | + ifeq ("$(TI_DSPLINK_PLATFORM)", "OMAPL1XX") | ||
61 | + include $(DSPLINK)$(DIRSEP)gpp$(DIRSEP)src$(DIRSEP)Makefile_bld | ||
62 | + include $(DSPLINK)$(DIRSEP)gpp$(DIRSEP)src$(DIRSEP)Rules.mk | ||
63 | + include $(DSPLINK)$(DIRSEP)gpp$(DIRSEP)src$(DIRSEP)Makefile_kbuild | ||
64 | + else # else ("$(TI_DSPLINK_PLATFORM)", "DAVINCI") | ||
65 | + include Makefile_bld | ||
66 | + endif | ||
67 | endif # ifeq ("$(TI_DSPLINK_PLATFORM)", "DAVINCI") | ||
68 | endif # ifeq ("$(TI_DSPLINK_PLATFORM)", "OMAP3530") | ||
69 | endif # ifeq ("$(TI_DSPLINK_PLATFORM)", "DA850") | ||
70 | diff --git a/dsplink/make/Linux/omapl1xx_arm.mk b/dsplink/make/Linux/omapl1xx_arm.mk | ||
71 | new file mode 100644 | ||
72 | index 0000000..3e42e87 | ||
73 | --- /dev/null | ||
74 | +++ b/dsplink/make/Linux/omapl1xx_arm.mk | ||
75 | @@ -0,0 +1,210 @@ | ||
76 | +# ============================================================================ | ||
77 | +# @file omapl1xx_arm.mk | ||
78 | +# | ||
79 | +# @path $(DSPLINK)/make/Linux/ | ||
80 | +# | ||
81 | +# @desc This makefile defines OS specific macros used by MAKE system for | ||
82 | +# the Montavista Pro 5.0 Linux distribution with mvlpro. | ||
83 | +# | ||
84 | +# @ver 1.64 | ||
85 | +# ============================================================================ | ||
86 | +# Copyright (C) 2002-2009, Texas Instruments Incorporated - | ||
87 | +# http://www.ti.com/ | ||
88 | +# | ||
89 | +# Redistribution and use in source and binary forms, with or without | ||
90 | +# modification, are permitted provided that the following conditions | ||
91 | +# are met: | ||
92 | +# | ||
93 | +# * Redistributions of source code must retain the above copyright | ||
94 | +# notice, this list of conditions and the following disclaimer. | ||
95 | +# | ||
96 | +# * Redistributions in binary form must reproduce the above copyright | ||
97 | +# notice, this list of conditions and the following disclaimer in the | ||
98 | +# documentation and/or other materials provided with the distribution. | ||
99 | +# | ||
100 | +# * Neither the name of Texas Instruments Incorporated nor the names of | ||
101 | +# its contributors may be used to endorse or promote products derived | ||
102 | +# from this software without specific prior written permission. | ||
103 | +# | ||
104 | +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
105 | +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
106 | +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
107 | +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | ||
108 | +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
109 | +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
110 | +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | ||
111 | +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | ||
112 | +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | ||
113 | +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, | ||
114 | +# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
115 | +# ============================================================================ | ||
116 | + | ||
117 | +ifndef OMAPL1XX_ARM_MK | ||
118 | + | ||
119 | +define OMAPL1XX_ARM_MK | ||
120 | +endef | ||
121 | + | ||
122 | + | ||
123 | +# ============================================================================ | ||
124 | +# Let the make system know that a specific distribution for the GPP OS | ||
125 | +# is being used. | ||
126 | +# ============================================================================ | ||
127 | +USE_DISTRIBUTION := 1 | ||
128 | + | ||
129 | + | ||
130 | +# ============================================================================ | ||
131 | +# Set the values of necessary variables to be used for the OS. | ||
132 | +# ============================================================================ | ||
133 | + | ||
134 | +# ---------------------------------------------------------------------------- | ||
135 | +# Base directory for the GPP OS | ||
136 | +# ---------------------------------------------------------------------------- | ||
137 | +BASE_BUILDOS := ${HOME}/da850/DaVinci-PSP-SDK-03.20.00.01/src/kernel/linux-03.20.00.01 | ||
138 | + | ||
139 | +# ---------------------------------------------------------------------------- | ||
140 | +# Base for toolchain | ||
141 | +# ---------------------------------------------------------------------------- | ||
142 | +BASE_TOOLCHAIN := ${HOME}/git/arm-2008q3 | ||
143 | + | ||
144 | +# ---------------------------------------------------------------------------- | ||
145 | +# Base for code generation tools - compiler, linker, archiver etc. | ||
146 | +# ---------------------------------------------------------------------------- | ||
147 | +BASE_CGTOOLS := $(BASE_TOOLCHAIN)/bin | ||
148 | + | ||
149 | +# ---------------------------------------------------------------------------- | ||
150 | +# Base directory for include files provided by GPP OS | ||
151 | +# ---------------------------------------------------------------------------- | ||
152 | +BASE_OSINC := $(BASE_BUILDOS)/include | ||
153 | + | ||
154 | +OSINC_GENERIC := $(BASE_OSINC) | ||
155 | +OSINC_PLATFORM := $(BASE_TOOLCHAIN)/lib/gcc/arm-none-linux-gnueabi/4.3.2/include | ||
156 | +OSINC_TARGET := $(BASE_TOOLCHAIN)/arm-none-linux-gnueabi/libc/usr/include | ||
157 | + | ||
158 | +ifneq ("$(VARIANT)", "") | ||
159 | +OSINC_VARIANT := $(BASE_OSINC) | ||
160 | +endif | ||
161 | + | ||
162 | + | ||
163 | +# ---------------------------------------------------------------------------- | ||
164 | +# Base directory for libraries provided by GPP OS | ||
165 | +# ---------------------------------------------------------------------------- | ||
166 | +BASE_OSLIB := $(BASE_TOOLCHAIN)/lib | ||
167 | + | ||
168 | +OSLIB_GENERIC := $(BASE_OSLIB) | ||
169 | +OSLIB_PLATFORM := $(BASE_OSLIB) | ||
170 | + | ||
171 | + | ||
172 | +ifneq ("$(VARIANT)", "") | ||
173 | +OSLIB_VARIANT := $(BASE_OSLIB) | ||
174 | +endif | ||
175 | + | ||
176 | + | ||
177 | +# ============================================================================ | ||
178 | +# COMPILER | ||
179 | +# ============================================================================ | ||
180 | + | ||
181 | +# ---------------------------------------------------------------------------- | ||
182 | +# Name of the compiler | ||
183 | +# ---------------------------------------------------------------------------- | ||
184 | +COMPILER := $(BASE_CGTOOLS)/arm-none-linux-gnueabi-gcc | ||
185 | +LD := $(BASE_CGTOOLS)/arm-none-linux-gnueabi-ld | ||
186 | + | ||
187 | +CROSS_COMPILE := arm-none-linux-gnueabi- | ||
188 | +export CROSS_COMPILE | ||
189 | + | ||
190 | +# ---------------------------------------------------------------------------- | ||
191 | +# Command line switches used by the compiler | ||
192 | +# | ||
193 | +# CC_SW_DEF Command line defines | ||
194 | +# CC_SW_INC Search path for header files | ||
195 | +# CC_SW_OBJ Create object file | ||
196 | +# CC_SW_DEB Include debug information | ||
197 | +# ---------------------------------------------------------------------------- | ||
198 | +CC_SW_DEF := -D | ||
199 | +CC_SW_INC := -I | ||
200 | +CC_SW_OBJ := -o | ||
201 | +CC_SW_DEB := -g | ||
202 | + | ||
203 | +# ---------------------------------------------------------------------------- | ||
204 | +# Standard flags for the compiler | ||
205 | +# ---------------------------------------------------------------------------- | ||
206 | +STD_USER_FLAGS := -Wall -c | ||
207 | + | ||
208 | +# ---------------------------------------------------------------------------- | ||
209 | +# Standard flags for the compiler when building an executable | ||
210 | +# ---------------------------------------------------------------------------- | ||
211 | +EXE_CC_FLAGS := | ||
212 | + | ||
213 | +# ---------------------------------------------------------------------------- | ||
214 | +# Flags for the compiler when building a driver | ||
215 | +# ---------------------------------------------------------------------------- | ||
216 | +DRV_CC_FLAGS := -nostdinc | ||
217 | + | ||
218 | +# ---------------------------------------------------------------------------- | ||
219 | +# Flags for the compiler when building a library | ||
220 | +# ---------------------------------------------------------------------------- | ||
221 | +LIB_CC_FLAGS := | ||
222 | + | ||
223 | +# ---------------------------------------------------------------------------- | ||
224 | +# Standard definitions for the compiler | ||
225 | +# ---------------------------------------------------------------------------- | ||
226 | +STD_CC_DEFNS := -D_REENTRANT | ||
227 | + | ||
228 | +# ============================================================================ | ||
229 | +# ARCHIVER2 - This denotes the archiver. | ||
230 | +# ============================================================================ | ||
231 | +ARCHIVER := $(BASE_CGTOOLS)/arm-none-linux-gnueabi-ar | ||
232 | + | ||
233 | +# ---------------------------------------------------------------------------- | ||
234 | +# Standard flags for the archiver | ||
235 | +# ---------------------------------------------------------------------------- | ||
236 | +STD_AR_FLAGS := -rs | ||
237 | + | ||
238 | + | ||
239 | +# ============================================================================ | ||
240 | +# LINKER - The compiler is used for linking purpose as well. | ||
241 | +# ============================================================================ | ||
242 | +LINKER := $(BASE_CGTOOLS)/arm-none-linux-gnueabi-gcc | ||
243 | + | ||
244 | +# ---------------------------------------------------------------------------- | ||
245 | +# Command line switches used by the linker | ||
246 | +# | ||
247 | +# LD_SW_LIB Search path for libraries | ||
248 | +# LD_SW_OUT Output filename | ||
249 | +# LD_SW_RELOC Generate relocateable output | ||
250 | +# ---------------------------------------------------------------------------- | ||
251 | +LD_SW_LIB := -L | ||
252 | +LD_SW_OUT := -o | ||
253 | +LD_SW_RELOC := -r | ||
254 | + | ||
255 | +# ---------------------------------------------------------------------------- | ||
256 | +# Standard flags for the linker | ||
257 | +# ---------------------------------------------------------------------------- | ||
258 | +STD_LD_FLAGS := | ||
259 | + | ||
260 | +# ---------------------------------------------------------------------------- | ||
261 | +# Flags for the linker when building an executable | ||
262 | +# ---------------------------------------------------------------------------- | ||
263 | +EXE_LD_FLAGS := -lpthread -lc | ||
264 | + | ||
265 | +# ---------------------------------------------------------------------------- | ||
266 | +# Flags for the linker when building a driver | ||
267 | +# ---------------------------------------------------------------------------- | ||
268 | +DRV_LD_FLAGS := | ||
269 | + | ||
270 | + | ||
271 | +# ============================================================================ | ||
272 | +# Post processing utilities for Linux 2.6 | ||
273 | +# ============================================================================ | ||
274 | +ifneq ($(CONFIG_MODVERSIONS),) | ||
275 | +CMD_MODPOST_FLAGS := -m -i | ||
276 | +else | ||
277 | +CMD_MODPOST_FLAGS := -i | ||
278 | +endif | ||
279 | + | ||
280 | +CMD_MODPOST := $(BASE_BUILDOS)/scripts/mod/modpost \ | ||
281 | + $(CMD_MODPOST_FLAGS) $(BASE_BUILDOS)/Module.symvers \ | ||
282 | + $(BASE_BUILDOS)/vmlinux | ||
283 | + | ||
284 | + | ||
285 | +endif # ifndef OMAPL1XX_ARM_MK | ||
286 | -- | ||
287 | 1.6.0.6 | ||
288 | |||
diff --git a/recipes-ti/dsplink/ti-dsplink/dsplink_1_64_kernel_2_6_33_autoconf.patch b/recipes-ti/dsplink/ti-dsplink/dsplink_1_64_kernel_2_6_33_autoconf.patch deleted file mode 100644 index 271b3043..00000000 --- a/recipes-ti/dsplink/ti-dsplink/dsplink_1_64_kernel_2_6_33_autoconf.patch +++ /dev/null | |||
@@ -1,335 +0,0 @@ | |||
1 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/arch/DA8XXGEM/da8xxgem_hal_pwr.c dsplink_linux_1_64b/dsplink/gpp/src/arch/DA8XXGEM/da8xxgem_hal_pwr.c | ||
2 | --- dsplink_linux_1_64a/dsplink/gpp/src/arch/DA8XXGEM/da8xxgem_hal_pwr.c 2009-11-13 12:12:47.000000000 +0000 | ||
3 | +++ dsplink_linux_1_64b/dsplink/gpp/src/arch/DA8XXGEM/da8xxgem_hal_pwr.c 2010-02-09 17:42:37.000000000 +0000 | ||
4 | @@ -22,7 +22,12 @@ | ||
5 | |||
6 | |||
7 | /* ----------------------------------- OSAL Headers */ | ||
8 | +#include <linux/version.h> | ||
9 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
10 | +#include <generated/autoconf.h> | ||
11 | +#else | ||
12 | #include <linux/autoconf.h> | ||
13 | +#endif | ||
14 | #include <asm/page.h> | ||
15 | #include <asm/io.h> | ||
16 | |||
17 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/arch/DA8XXGEM/shmem/Linux/da8xxgem_phy_shmem.c dsplink_linux_1_64b/dsplink/gpp/src/arch/DA8XXGEM/shmem/Linux/da8xxgem_phy_shmem.c | ||
18 | --- dsplink_linux_1_64a/dsplink/gpp/src/arch/DA8XXGEM/shmem/Linux/da8xxgem_phy_shmem.c 2009-11-13 12:12:47.000000000 +0000 | ||
19 | +++ dsplink_linux_1_64b/dsplink/gpp/src/arch/DA8XXGEM/shmem/Linux/da8xxgem_phy_shmem.c 2010-02-09 17:43:06.000000000 +0000 | ||
20 | @@ -22,7 +22,12 @@ | ||
21 | |||
22 | |||
23 | /* ----------------------------------- OS Headers */ | ||
24 | +#include <linux/version.h> | ||
25 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
26 | +#include <generated/autoconf.h> | ||
27 | +#else | ||
28 | #include <linux/autoconf.h> | ||
29 | +#endif | ||
30 | #include <linux/module.h> | ||
31 | #include <linux/types.h> | ||
32 | #include <linux/kernel.h> | ||
33 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/arch/DM6437/pci/dm6437_hal_pci_dma.c dsplink_linux_1_64b/dsplink/gpp/src/arch/DM6437/pci/dm6437_hal_pci_dma.c | ||
34 | --- dsplink_linux_1_64a/dsplink/gpp/src/arch/DM6437/pci/dm6437_hal_pci_dma.c 2009-11-13 12:12:46.000000000 +0000 | ||
35 | +++ dsplink_linux_1_64b/dsplink/gpp/src/arch/DM6437/pci/dm6437_hal_pci_dma.c 2010-02-09 17:45:06.000000000 +0000 | ||
36 | @@ -21,7 +21,12 @@ | ||
37 | */ | ||
38 | |||
39 | |||
40 | +#include <linux/version.h> | ||
41 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
42 | +#include <generated/autoconf.h> | ||
43 | +#else | ||
44 | #include <linux/autoconf.h> | ||
45 | +#endif | ||
46 | #include <asm/page.h> | ||
47 | #include <asm/io.h> | ||
48 | |||
49 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/arch/DM6437/pci/Linux/2.6.18/dm6437_phy_pci.c dsplink_linux_1_64b/dsplink/gpp/src/arch/DM6437/pci/Linux/2.6.18/dm6437_phy_pci.c | ||
50 | --- dsplink_linux_1_64a/dsplink/gpp/src/arch/DM6437/pci/Linux/2.6.18/dm6437_phy_pci.c 2009-11-13 12:12:46.000000000 +0000 | ||
51 | +++ dsplink_linux_1_64b/dsplink/gpp/src/arch/DM6437/pci/Linux/2.6.18/dm6437_phy_pci.c 2010-02-09 17:44:49.000000000 +0000 | ||
52 | @@ -22,7 +22,12 @@ | ||
53 | |||
54 | |||
55 | /* ----------------------------------- OS Headers */ | ||
56 | +#include <linux/version.h> | ||
57 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
58 | +#include <generated/autoconf.h> | ||
59 | +#else | ||
60 | #include <linux/autoconf.h> | ||
61 | +#endif | ||
62 | #include <linux/module.h> | ||
63 | #include <linux/types.h> | ||
64 | #include <linux/kernel.h> | ||
65 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/arch/DM6446GEM/shmem/Linux/dm6446gem_phy_shmem.c dsplink_linux_1_64b/dsplink/gpp/src/arch/DM6446GEM/shmem/Linux/dm6446gem_phy_shmem.c | ||
66 | --- dsplink_linux_1_64a/dsplink/gpp/src/arch/DM6446GEM/shmem/Linux/dm6446gem_phy_shmem.c 2009-11-13 12:12:46.000000000 +0000 | ||
67 | +++ dsplink_linux_1_64b/dsplink/gpp/src/arch/DM6446GEM/shmem/Linux/dm6446gem_phy_shmem.c 2010-02-09 17:44:21.000000000 +0000 | ||
68 | @@ -22,7 +22,12 @@ | ||
69 | |||
70 | |||
71 | /* ----------------------------------- OS Headers */ | ||
72 | +#include <linux/version.h> | ||
73 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
74 | +#include <generated/autoconf.h> | ||
75 | +#else | ||
76 | #include <linux/autoconf.h> | ||
77 | +#endif | ||
78 | #include <linux/module.h> | ||
79 | #include <linux/types.h> | ||
80 | #include <linux/kernel.h> | ||
81 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/arch/DM6467GEM/shmem/Linux/dm6467gem_phy_shmem.c dsplink_linux_1_64b/dsplink/gpp/src/arch/DM6467GEM/shmem/Linux/dm6467gem_phy_shmem.c | ||
82 | --- dsplink_linux_1_64a/dsplink/gpp/src/arch/DM6467GEM/shmem/Linux/dm6467gem_phy_shmem.c 2009-11-13 12:12:46.000000000 +0000 | ||
83 | +++ dsplink_linux_1_64b/dsplink/gpp/src/arch/DM6467GEM/shmem/Linux/dm6467gem_phy_shmem.c 2010-02-09 17:41:46.000000000 +0000 | ||
84 | @@ -22,7 +22,12 @@ | ||
85 | |||
86 | |||
87 | /* ----------------------------------- OS Headers */ | ||
88 | +#include <linux/version.h> | ||
89 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
90 | +#include <generated/autoconf.h> | ||
91 | +#else | ||
92 | #include <linux/autoconf.h> | ||
93 | +#endif | ||
94 | #include <linux/module.h> | ||
95 | #include <linux/types.h> | ||
96 | #include <linux/kernel.h> | ||
97 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/arch/DM648/pci/dm648_hal_pci_dma.c dsplink_linux_1_64b/dsplink/gpp/src/arch/DM648/pci/dm648_hal_pci_dma.c | ||
98 | --- dsplink_linux_1_64a/dsplink/gpp/src/arch/DM648/pci/dm648_hal_pci_dma.c 2009-11-13 12:12:46.000000000 +0000 | ||
99 | +++ dsplink_linux_1_64b/dsplink/gpp/src/arch/DM648/pci/dm648_hal_pci_dma.c 2010-02-09 17:42:02.000000000 +0000 | ||
100 | @@ -20,7 +20,12 @@ | ||
101 | * ============================================================================ | ||
102 | */ | ||
103 | |||
104 | +#include <linux/version.h> | ||
105 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
106 | +#include <generated/autoconf.h> | ||
107 | +#else | ||
108 | #include <linux/autoconf.h> | ||
109 | +#endif | ||
110 | #include <asm/page.h> | ||
111 | #include <asm/io.h> | ||
112 | |||
113 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/arch/DM648/pci/Linux/2.6.18/dm648_phy_pci.c dsplink_linux_1_64b/dsplink/gpp/src/arch/DM648/pci/Linux/2.6.18/dm648_phy_pci.c | ||
114 | --- dsplink_linux_1_64a/dsplink/gpp/src/arch/DM648/pci/Linux/2.6.18/dm648_phy_pci.c 2009-11-13 12:12:46.000000000 +0000 | ||
115 | +++ dsplink_linux_1_64b/dsplink/gpp/src/arch/DM648/pci/Linux/2.6.18/dm648_phy_pci.c 2010-02-09 17:42:21.000000000 +0000 | ||
116 | @@ -22,7 +22,12 @@ | ||
117 | |||
118 | |||
119 | /* ----------------------------------- OS Headers */ | ||
120 | +#include <linux/version.h> | ||
121 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
122 | +#include <generated/autoconf.h> | ||
123 | +#else | ||
124 | #include <linux/autoconf.h> | ||
125 | +#endif | ||
126 | #include <linux/module.h> | ||
127 | #include <linux/types.h> | ||
128 | #include <linux/kernel.h> | ||
129 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/arch/OMAP2530/shmem/Linux/omap2530_phy_shmem.c dsplink_linux_1_64b/dsplink/gpp/src/arch/OMAP2530/shmem/Linux/omap2530_phy_shmem.c | ||
130 | --- dsplink_linux_1_64a/dsplink/gpp/src/arch/OMAP2530/shmem/Linux/omap2530_phy_shmem.c 2009-11-13 12:12:47.000000000 +0000 | ||
131 | +++ dsplink_linux_1_64b/dsplink/gpp/src/arch/OMAP2530/shmem/Linux/omap2530_phy_shmem.c 2010-02-09 17:43:29.000000000 +0000 | ||
132 | @@ -25,7 +25,12 @@ | ||
133 | |||
134 | |||
135 | /* ----------------------------------- OS Headers */ | ||
136 | +#include <linux/version.h> | ||
137 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
138 | +#include <generated/autoconf.h> | ||
139 | +#else | ||
140 | #include <linux/autoconf.h> | ||
141 | +#endif | ||
142 | #include <linux/module.h> | ||
143 | #include <linux/types.h> | ||
144 | #include <linux/kernel.h> | ||
145 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/arch/OMAP3530/shmem/Linux/omap3530_phy_shmem.c dsplink_linux_1_64b/dsplink/gpp/src/arch/OMAP3530/shmem/Linux/omap3530_phy_shmem.c | ||
146 | --- dsplink_linux_1_64a/dsplink/gpp/src/arch/OMAP3530/shmem/Linux/omap3530_phy_shmem.c 2009-11-13 12:12:47.000000000 +0000 | ||
147 | +++ dsplink_linux_1_64b/dsplink/gpp/src/arch/OMAP3530/shmem/Linux/omap3530_phy_shmem.c 2010-02-09 17:43:50.000000000 +0000 | ||
148 | @@ -22,7 +22,12 @@ | ||
149 | |||
150 | |||
151 | /* ----------------------------------- OS Headers */ | ||
152 | +#include <linux/version.h> | ||
153 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
154 | +#include <generated/autoconf.h> | ||
155 | +#else | ||
156 | #include <linux/autoconf.h> | ||
157 | +#endif | ||
158 | #include <linux/module.h> | ||
159 | #include <linux/types.h> | ||
160 | #include <linux/kernel.h> | ||
161 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/arch/TNETV107XGEM/shmem/Linux/tnetv107xgem_phy_shmem.c dsplink_linux_1_64b/dsplink/gpp/src/arch/TNETV107XGEM/shmem/Linux/tnetv107xgem_phy_shmem.c | ||
162 | --- dsplink_linux_1_64a/dsplink/gpp/src/arch/TNETV107XGEM/shmem/Linux/tnetv107xgem_phy_shmem.c 2009-11-13 12:12:47.000000000 +0000 | ||
163 | +++ dsplink_linux_1_64b/dsplink/gpp/src/arch/TNETV107XGEM/shmem/Linux/tnetv107xgem_phy_shmem.c 2010-02-09 17:44:06.000000000 +0000 | ||
164 | @@ -22,7 +22,12 @@ | ||
165 | |||
166 | |||
167 | /* ----------------------------------- OS Headers */ | ||
168 | +#include <linux/version.h> | ||
169 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
170 | +#include <generated/autoconf.h> | ||
171 | +#else | ||
172 | #include <linux/autoconf.h> | ||
173 | +#endif | ||
174 | #include <linux/module.h> | ||
175 | #include <linux/types.h> | ||
176 | #include <linux/kernel.h> | ||
177 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/2.6.18/dpc.c dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/2.6.18/dpc.c | ||
178 | --- dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/2.6.18/dpc.c 2009-11-13 12:12:47.000000000 +0000 | ||
179 | +++ dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/2.6.18/dpc.c 2010-02-09 17:47:25.000000000 +0000 | ||
180 | @@ -22,7 +22,12 @@ | ||
181 | |||
182 | |||
183 | /* ----------------------------------- OS Specific Headers */ | ||
184 | +#include <linux/version.h> | ||
185 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
186 | +#include <generated/autoconf.h> | ||
187 | +#else | ||
188 | #include <linux/autoconf.h> | ||
189 | +#endif | ||
190 | #include <linux/spinlock.h> | ||
191 | #include <linux/sched.h> | ||
192 | #include <linux/interrupt.h> | ||
193 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/2.6.18/isr.c dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/2.6.18/isr.c | ||
194 | --- dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/2.6.18/isr.c 2009-11-13 12:12:47.000000000 +0000 | ||
195 | +++ dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/2.6.18/isr.c 2010-02-09 17:46:54.000000000 +0000 | ||
196 | @@ -22,7 +22,12 @@ | ||
197 | |||
198 | |||
199 | /* ----------------------------------- OS Specific Headers */ | ||
200 | +#include <linux/version.h> | ||
201 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
202 | +#include <generated/autoconf.h> | ||
203 | +#else | ||
204 | #include <linux/autoconf.h> | ||
205 | +#endif | ||
206 | #include <linux/version.h> | ||
207 | #include <linux/spinlock.h> | ||
208 | #include <linux/sched.h> | ||
209 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/2.6.18/kfiledef.c dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/2.6.18/kfiledef.c | ||
210 | --- dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/2.6.18/kfiledef.c 2009-11-13 12:12:47.000000000 +0000 | ||
211 | +++ dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/2.6.18/kfiledef.c 2010-02-09 17:46:39.000000000 +0000 | ||
212 | @@ -22,7 +22,12 @@ | ||
213 | |||
214 | |||
215 | /* ----------------------------------- OS Specific Headers */ | ||
216 | +#include <linux/version.h> | ||
217 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
218 | +#include <generated/autoconf.h> | ||
219 | +#else | ||
220 | #include <linux/autoconf.h> | ||
221 | +#endif | ||
222 | #include <linux/spinlock.h> | ||
223 | #include <linux/kernel.h> | ||
224 | #include <linux/mm.h> | ||
225 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/2.6.18/mem.c dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/2.6.18/mem.c | ||
226 | --- dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/2.6.18/mem.c 2009-11-13 12:12:47.000000000 +0000 | ||
227 | +++ dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/2.6.18/mem.c 2010-02-09 17:46:25.000000000 +0000 | ||
228 | @@ -22,7 +22,12 @@ | ||
229 | |||
230 | |||
231 | /* ----------------------------------- OS Specific Headers */ | ||
232 | +#include <linux/version.h> | ||
233 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
234 | +#include <generated/autoconf.h> | ||
235 | +#else | ||
236 | #include <linux/autoconf.h> | ||
237 | +#endif | ||
238 | #include <linux/spinlock.h> | ||
239 | #include <linux/sched.h> | ||
240 | #include <linux/types.h> | ||
241 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/2.6.18/notify_knl.c dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/2.6.18/notify_knl.c | ||
242 | --- dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/2.6.18/notify_knl.c 2009-11-13 12:12:47.000000000 +0000 | ||
243 | +++ dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/2.6.18/notify_knl.c 2010-02-09 17:47:12.000000000 +0000 | ||
244 | @@ -22,7 +22,12 @@ | ||
245 | |||
246 | |||
247 | /* ----------------------------------- OS Specific Headers */ | ||
248 | +#include <linux/version.h> | ||
249 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
250 | +#include <generated/autoconf.h> | ||
251 | +#else | ||
252 | #include <linux/autoconf.h> | ||
253 | +#endif | ||
254 | #include <linux/spinlock.h> | ||
255 | #include <linux/signal.h> | ||
256 | #include <linux/kernel.h> | ||
257 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/2.6.18/sync.c dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/2.6.18/sync.c | ||
258 | --- dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/2.6.18/sync.c 2009-11-13 12:12:47.000000000 +0000 | ||
259 | +++ dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/2.6.18/sync.c 2010-02-09 17:47:39.000000000 +0000 | ||
260 | @@ -22,7 +22,12 @@ | ||
261 | |||
262 | |||
263 | /* ----------------------------------- OS Specific Headers */ | ||
264 | +#include <linux/version.h> | ||
265 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
266 | +#include <generated/autoconf.h> | ||
267 | +#else | ||
268 | #include <linux/autoconf.h> | ||
269 | +#endif | ||
270 | #include <linux/spinlock.h> | ||
271 | #include <linux/timer.h> | ||
272 | #include <linux/sched.h> | ||
273 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/prcs.c dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/prcs.c | ||
274 | --- dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/prcs.c 2009-11-13 12:12:47.000000000 +0000 | ||
275 | +++ dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/prcs.c 2010-02-09 17:45:44.000000000 +0000 | ||
276 | @@ -22,7 +22,12 @@ | ||
277 | |||
278 | |||
279 | /* ----------------------------------- OS Specific Headers */ | ||
280 | +#include <linux/version.h> | ||
281 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
282 | +#include <generated/autoconf.h> | ||
283 | +#else | ||
284 | #include <linux/autoconf.h> | ||
285 | +#endif | ||
286 | #include <linux/spinlock.h> | ||
287 | #include <linux/module.h> | ||
288 | #include <linux/mm.h> | ||
289 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/print.c dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/print.c | ||
290 | --- dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/print.c 2009-11-13 12:12:47.000000000 +0000 | ||
291 | +++ dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/print.c 2010-02-09 17:45:30.000000000 +0000 | ||
292 | @@ -22,7 +22,12 @@ | ||
293 | |||
294 | |||
295 | /* ----------------------------------- OS Specific Headers */ | ||
296 | +#include <linux/version.h> | ||
297 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
298 | +#include <generated/autoconf.h> | ||
299 | +#else | ||
300 | #include <linux/autoconf.h> | ||
301 | +#endif | ||
302 | #include <linux/spinlock.h> | ||
303 | #include <stdarg.h> | ||
304 | #include <linux/types.h> | ||
305 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/user.c dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/user.c | ||
306 | --- dsplink_linux_1_64a/dsplink/gpp/src/osal/Linux/user.c 2009-11-13 12:12:47.000000000 +0000 | ||
307 | +++ dsplink_linux_1_64b/dsplink/gpp/src/osal/Linux/user.c 2010-02-09 17:46:07.000000000 +0000 | ||
308 | @@ -22,7 +22,12 @@ | ||
309 | |||
310 | |||
311 | /* ----------------------------------- OS Specific Headers */ | ||
312 | +#include <linux/version.h> | ||
313 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
314 | +#include <generated/autoconf.h> | ||
315 | +#else | ||
316 | #include <linux/autoconf.h> | ||
317 | +#endif | ||
318 | #include <linux/spinlock.h> | ||
319 | #include <linux/timer.h> | ||
320 | #include <linux/sched.h> | ||
321 | diff -uNr dsplink_linux_1_64a/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c dsplink_linux_1_64b/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c | ||
322 | --- dsplink_linux_1_64a/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c 2009-11-13 12:12:48.000000000 +0000 | ||
323 | +++ dsplink_linux_1_64b/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c 2010-02-09 17:40:59.000000000 +0000 | ||
324 | @@ -33,7 +33,11 @@ | ||
325 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) | ||
326 | #include <linux/device.h> | ||
327 | #endif | ||
328 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | ||
329 | +#include <generated/autoconf.h> | ||
330 | +#else | ||
331 | #include <linux/autoconf.h> | ||
332 | +#endif | ||
333 | #include <linux/spinlock.h> | ||
334 | #include <linux/module.h> | ||
335 | #include <linux/init.h> | ||
diff --git a/recipes-ti/dsplink/ti-dsplink/dsplink_1_65_kernel_3_7_0_fix-irq-mismatch.patch b/recipes-ti/dsplink/ti-dsplink/dsplink_1_65_kernel_3_7_0_fix-irq-mismatch.patch deleted file mode 100644 index 787c22e1..00000000 --- a/recipes-ti/dsplink/ti-dsplink/dsplink_1_65_kernel_3_7_0_fix-irq-mismatch.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | Index: dsplink_linux_1_65_00_03/dsplink/gpp/src/osal/Linux/2.6.18/isr.c | ||
2 | =================================================================== | ||
3 | --- dsplink_linux_1_65_00_03.orig/dsplink/gpp/src/osal/Linux/2.6.18/isr.c | ||
4 | +++ dsplink_linux_1_65_00_03/dsplink/gpp/src/osal/Linux/2.6.18/isr.c | ||
5 | @@ -286,7 +286,11 @@ ISR_Create (IN IsrProc fnIS | ||
6 | |||
7 | if (DSP_SUCCEEDED (status)) { | ||
8 | (*isrObj)->signature = SIGN_ISR ; | ||
9 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) | ||
10 | (*isrObj)->irq = intObj->intId ; | ||
11 | +#else | ||
12 | + (*isrObj)->irq = intObj->intId + NR_IRQS ; | ||
13 | +#endif | ||
14 | (*isrObj)->enabled = FALSE ; | ||
15 | (*isrObj)->dspId = intObj->dspId ; | ||
16 | (*isrObj)->checkFunc = intObj->checkFunc ; | ||
diff --git a/recipes-ti/dsplink/ti-dsplink/ti-dsplink-examples-loadmodules.sh b/recipes-ti/dsplink/ti-dsplink/ti-dsplink-examples-loadmodules.sh deleted file mode 100755 index 9cfb19d5..00000000 --- a/recipes-ti/dsplink/ti-dsplink/ti-dsplink-examples-loadmodules.sh +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | # | ||
2 | # Default Memory Map - for OMAP3530 dsplink examples | ||
3 | # | ||
4 | # Start Addr Size Description | ||
5 | # ------------------------------------------- | ||
6 | # 0x80000000 126 MB Linux | ||
7 | # 0x87E00000 2 MB DSPLINK (MEM) + DDR + DSPLINK (RESET) | ||
8 | |||
9 | # sanity check to verify that we're using the right mem=xxM (126M in this case) | ||
10 | awk '/MemTotal:/ { | ||
11 | mem=$2 | ||
12 | |||
13 | if (mem > 126 * 1024) | ||
14 | print "Warning! You need to use mem=126M or less on the kernel cmdline" | ||
15 | |||
16 | printf "You have %dkB total memory for Linux\n", mem | ||
17 | }' /proc/meminfo | ||
18 | |||
19 | # insert DSP/BIOS Link driver | ||
20 | # | ||
21 | modprobe dsplinkk | ||
22 | |||
23 | # make /dev/dsplink | ||
24 | #rm -f /dev/dsplink | ||
25 | #mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0 | ||
diff --git a/recipes-ti/dsplink/ti-dsplink/ti-dsplink-examples-run.sh b/recipes-ti/dsplink/ti-dsplink/ti-dsplink-examples-run.sh deleted file mode 100755 index b2f2faac..00000000 --- a/recipes-ti/dsplink/ti-dsplink/ti-dsplink-examples-run.sh +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | #! /bin/sh | ||
2 | |||
3 | echo "Running Loop Sample App" | ||
4 | ./loopgpp loop.out 1024 2000 0 | ||
5 | |||
6 | echo "Running Message Sample App" | ||
7 | ./messagegpp message.out 10000 0 | ||
8 | |||
9 | echo "Running Message Multi Sample App" | ||
10 | ./messagemultigpp messagemulti.out 128 1 0 | ||
11 | |||
12 | echo "Running MultiProcessor List Sample App" | ||
13 | ./mplistgpp mplist.out 128 128 0 | ||
14 | |||
15 | echo "Running MultiProcessorCriticalSection Transfer Sample App" | ||
16 | ./mpcsxfergpp mpcsxfer.out 128 1000 0 | ||
17 | |||
18 | echo "Running Ringio Sample App" | ||
19 | ./ringiogpp ringio.out 2048 128 0 | ||
20 | |||
21 | echo "Running Scale Sample App" | ||
22 | ./scalegpp scale.out 128 500 0 | ||
23 | |||
24 | #echo "Running Read/Write Sample App" | ||
25 | #./readwritegpp readwrite.out | ||
diff --git a/recipes-ti/dsplink/ti-dsplink/ti-dsplink-examples-unloadmodules.sh b/recipes-ti/dsplink/ti-dsplink/ti-dsplink-examples-unloadmodules.sh deleted file mode 100755 index 48fa84b0..00000000 --- a/recipes-ti/dsplink/ti-dsplink/ti-dsplink-examples-unloadmodules.sh +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | # Unload modules - DSPLINK - OMAP3530 | ||
2 | |||
3 | # remove DSP/BIOS Link driver | ||
4 | rmmod dsplinkk | ||
5 | #rm -f /dev/dsplink | ||
diff --git a/recipes-ti/dsplink/ti-dsplink_1.65.00.03.bb b/recipes-ti/dsplink/ti-dsplink_1.65.00.03.bb deleted file mode 100644 index 2606cfc6..00000000 --- a/recipes-ti/dsplink/ti-dsplink_1.65.00.03.bb +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | require ti-dsplink.inc | ||
2 | |||
3 | PE = "1" | ||
4 | PV = "1_65_00_03" | ||
5 | PV_dot = "1.65.00.03" | ||
6 | PV_major = "1_65" | ||
7 | |||
8 | PV_DL_PATH = "DSPLink/${PV_major}/${PV}/${PV_dot}" | ||
9 | |||
10 | SRC_URI += "file://dsplink-BKL-fix.patch \ | ||
11 | file://0001-remove-check-for-make-version-3.85-works-fine.patch \ | ||
12 | file://dsplink_1_65_kernel_3_7_0_fix-irq-mismatch.patch \ | ||
13 | " | ||
14 | |||
15 | SRC_URI[dsplinktarball.md5sum] = "1bda596b631bd2f517edc70f6be4f2ca" | ||
16 | SRC_URI[dsplinktarball.sha256sum] = "4b1bda89bd8465b887f5bcdf7b95018bc1d1f8968c0c44f8cbad2a9e1c52bcb7" | ||
17 | |||
18 | INSANE_SKIP_${PN} = "installed-vs-shipped" | ||
diff --git a/recipes-ti/local-power-manager/ti-local-power-manager.inc b/recipes-ti/local-power-manager/ti-local-power-manager.inc deleted file mode 100644 index 0e5d4f29..00000000 --- a/recipes-ti/local-power-manager/ti-local-power-manager.inc +++ /dev/null | |||
@@ -1,120 +0,0 @@ | |||
1 | DESCRIPTION = "TI Local Power Manager (LPM)" | ||
2 | HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/lpm" | ||
3 | SECTION = "devel" | ||
4 | LICENSE = "GPLv2" | ||
5 | |||
6 | LIC_FILES_CHKSUM = "file://gpl_2.0.txt;md5=ebb5c50ab7cab4baeffba14977030c07" | ||
7 | |||
8 | # TODO : Hardcoded path to evm3530 - need to fix when adding omap24xx/dm6446 (other lpm targets) | ||
9 | |||
10 | require ../includes/ti-paths.inc | ||
11 | require ../includes/ti-staging.inc | ||
12 | |||
13 | PROVIDES = "ti-lpm-module" | ||
14 | PROVIDES += "ti-lpm-utils" | ||
15 | |||
16 | # This package builds a kernel module, use kernel PR as base and append a local version | ||
17 | PR = "${MACHINE_KERNEL_PR}" | ||
18 | PR_append = "e" | ||
19 | |||
20 | S = "${WORKDIR}/local_power_manager_linux_${PV}" | ||
21 | |||
22 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/lpm/${PV}/exports/local_power_manager_linux_${PV}.tar.gz;name=lpmtarball" | ||
23 | |||
24 | DEPENDS = "ti-dsplink ti-xdctools-native" | ||
25 | DEPENDS += "virtual/kernel" | ||
26 | |||
27 | # SOC_FAMILY configuration | ||
28 | |||
29 | LPMDSPPOWERSOC_omap3 = "omap3530" | ||
30 | LPMDSPPOWERSOC_dm6446 = "dm6446" | ||
31 | LPMDSPPOWERSOC ?= "UNDEFINED_LPMDSPPOWERSOC" | ||
32 | |||
33 | XDC_PLATFORM_dm6446 = "ti.platforms.evmDM6446" | ||
34 | XDC_PLATFORM_omap3 = "ti.platforms.evm3530" | ||
35 | XDC_PLATFORM ?= "UNDEFINED_XDC_PLATFORM" | ||
36 | |||
37 | do_configure () { | ||
38 | |||
39 | # Generate a config.bld for XDC | ||
40 | |||
41 | cat > ${S}/config.bld <<EOF | ||
42 | |||
43 | /* Generated by ti-local-power-manager.inc OE recipe */ | ||
44 | |||
45 | var Build = xdc.useModule('xdc.bld.BuildEnvironment'); | ||
46 | |||
47 | var GCArmv5T = xdc.useModule('gnu.targets.arm.GCArmv5T'); | ||
48 | GCArmv5T.LONGNAME = "${TARGET_PREFIX}gcc"; | ||
49 | GCArmv5T.rootDir = "${TOOLCHAIN_PATH}"; | ||
50 | GCArmv5T.ccOpts.prefix += " -Wall -fno-strict-aliasing "; | ||
51 | GCArmv5T.lnkOpts.suffix = GCArmv5T.lnkOpts.suffix.replace("-lstdc++", ""); | ||
52 | GCArmv5T.lnkOpts.suffix += " -lpthread "; | ||
53 | GCArmv5T.platform = null; | ||
54 | GCArmv5T.platforms = [ | ||
55 | "${XDC_PLATFORM}" | ||
56 | ]; | ||
57 | |||
58 | /* remove profiles we don't use */ | ||
59 | delete GCArmv5T.profiles["coverage"]; | ||
60 | delete GCArmv5T.profiles["profile"]; | ||
61 | |||
62 | Build.targets.\$add(GCArmv5T); | ||
63 | EOF | ||
64 | |||
65 | } | ||
66 | |||
67 | do_prepsources () { | ||
68 | |||
69 | # Prepare the tree for rebuiling - generate makefiles and clean | ||
70 | XDCPATH=${S} ${XDC_INSTALL_DIR}/xdc .make -PR . | ||
71 | XDCPATH=${S} ${XDC_INSTALL_DIR}/xdc clean -PR . | ||
72 | } | ||
73 | |||
74 | addtask prepsources after do_configure before do_compile | ||
75 | |||
76 | do_compile () { | ||
77 | |||
78 | # Build the LPM kernel module | ||
79 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | ||
80 | cd ${S}/packages/ti/bios/power/modules/${LPMDSPPOWERSOC}/lpm | ||
81 | make \ | ||
82 | DSPLINK_REPO="${LINK_INSTALL_DIR}" \ | ||
83 | LINUXKERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" \ | ||
84 | MVTOOL_PREFIX="${TARGET_PREFIX}" \ | ||
85 | clean default | ||
86 | |||
87 | # Build the user space library | ||
88 | # TODO | ||
89 | |||
90 | # Build the utilities (lpmON/OFF) | ||
91 | cd ${S} | ||
92 | XDCPATH=${S} ${XDC_INSTALL_DIR}/xdc -PR . | ||
93 | } | ||
94 | |||
95 | KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}" | ||
96 | |||
97 | do_install () { | ||
98 | |||
99 | # Install the kernel module | ||
100 | install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp | ||
101 | install -m 0755 ${S}/packages/ti/bios/power/modules/${LPMDSPPOWERSOC}/lpm/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp | ||
102 | |||
103 | # Install the Utilities | ||
104 | install -d ${D}/${installdir}/ti-lpm-utils | ||
105 | install -m 0755 ${S}/packages/ti/bios/power/utils/bin/$(echo ${XDC_PLATFORM} | tr . _)/linux/release/* ${D}/${installdir}/ti-lpm-utils | ||
106 | |||
107 | # Install/Stage the Source Tree | ||
108 | install -d ${D}${LPM_INSTALL_DIR_RECIPE} | ||
109 | cp -pPrf ${S}/* ${D}${LPM_INSTALL_DIR_RECIPE} | ||
110 | } | ||
111 | |||
112 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
113 | PACKAGES += "ti-lpm-module" | ||
114 | FILES_ti-lpm-module = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/*lpm*ko" | ||
115 | RDEPENDS_ti-lpm-module += "ti-dsplink-module" | ||
116 | |||
117 | PACKAGES += "ti-lpm-utils" | ||
118 | RDEPENDS_ti-lpm-utils += "ti-lpm-module" | ||
119 | FILES_ti-lpm-utils = "${installdir}/ti-lpm-utils/*" | ||
120 | INSANE_SKIP_ti-lpm-utils = "1" | ||
diff --git a/recipes-ti/local-power-manager/ti-local-power-manager/lpm-1_24_01-replace-define-OPT.patch b/recipes-ti/local-power-manager/ti-local-power-manager/lpm-1_24_01-replace-define-OPT.patch deleted file mode 100644 index 120792b8..00000000 --- a/recipes-ti/local-power-manager/ti-local-power-manager/lpm-1_24_01-replace-define-OPT.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | diff -uNr local_power_manager_linux_1_24_01_orig/packages/ti/bios/power/modules/dm6446/lpm/Makefile local_power_manager_linux_1_24_01/packages/ti/bios/power/modules/dm6446/lpm/Makefile | ||
2 | --- local_power_manager_linux_1_24_01_orig/packages/ti/bios/power/modules/dm6446/lpm/Makefile 2009-07-22 23:10:04.000000000 -0500 | ||
3 | +++ local_power_manager_linux_1_24_01/packages/ti/bios/power/modules/dm6446/lpm/Makefile 2010-04-16 15:26:14.000000000 -0500 | ||
4 | @@ -54,7 +54,7 @@ | ||
5 | endif | ||
6 | |||
7 | MAKE_OPTS = ARCH=arm CROSS_COMPILE=$(MVTOOL_PREFIX) | ||
8 | -CFLAGS = -DUSE_UDEV -DOS_LINUX -DLINUX_KERNEL \ | ||
9 | +CFLAGS = -DUSE_UDEV -DOS_LINUX -DLINUX_KERNEL -DOPT="" \ | ||
10 | $(LINK_DEFS) $(LINK_INCS) $(LINK_INCS_INTERNAL) | ||
11 | |||
12 | # Invoke the kernel build system | ||
13 | diff -uNr local_power_manager_linux_1_24_01_orig/packages/ti/bios/power/modules/omap3530/lpm/Makefile local_power_manager_linux_1_24_01/packages/ti/bios/power/modules/omap3530/lpm/Makefile | ||
14 | --- local_power_manager_linux_1_24_01_orig/packages/ti/bios/power/modules/omap3530/lpm/Makefile 2009-07-22 23:10:05.000000000 -0500 | ||
15 | +++ local_power_manager_linux_1_24_01/packages/ti/bios/power/modules/omap3530/lpm/Makefile 2010-04-16 15:26:38.000000000 -0500 | ||
16 | @@ -54,7 +54,7 @@ | ||
17 | endif | ||
18 | |||
19 | MAKE_OPTS = ARCH=arm CROSS_COMPILE=$(MVTOOL_PREFIX) | ||
20 | -CFLAGS = -DUSE_UDEV -DOS_LINUX -DLINUX_KERNEL \ | ||
21 | +CFLAGS = -DUSE_UDEV -DOS_LINUX -DLINUX_KERNEL -DOPT="" \ | ||
22 | $(LINK_DEFS) $(LINK_INCS) $(LINK_INCS_INTERNAL) | ||
23 | |||
24 | # Invoke the kernel build system | ||
diff --git a/recipes-ti/local-power-manager/ti-local-power-manager/lpm-BKL-fix.patch b/recipes-ti/local-power-manager/ti-local-power-manager/lpm-BKL-fix.patch deleted file mode 100644 index 4b5a537a..00000000 --- a/recipes-ti/local-power-manager/ti-local-power-manager/lpm-BKL-fix.patch +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | From b7e83000f316f5f109b9237fde4d1c576534aa1a Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Tue, 4 Jan 2011 14:21:02 +0100 | ||
4 | Subject: [PATCH] Fix build with 2.6.37rcX | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | --- | ||
8 | .../bios/power/modules/omap3530/lpm/lpm_driver.c | 12 +++++++++--- | ||
9 | 1 files changed, 9 insertions(+), 3 deletions(-) | ||
10 | |||
11 | diff --git a/packages/ti/bios/power/modules/omap3530/lpm/lpm_driver.c b/packages/ti/bios/power/modules/omap3530/lpm/lpm_driver.c | ||
12 | index fa22ea3..4663fc9 100644 | ||
13 | --- a/packages/ti/bios/power/modules/omap3530/lpm/lpm_driver.c | ||
14 | +++ b/packages/ti/bios/power/modules/omap3530/lpm/lpm_driver.c | ||
15 | @@ -40,6 +40,7 @@ | ||
16 | #include <asm/semaphore.h> | ||
17 | #endif | ||
18 | #include <linux/io.h> | ||
19 | +#include <linux/slab.h> | ||
20 | |||
21 | #include "lpm_driver.h" | ||
22 | #include "lpm_dev.h" | ||
23 | @@ -95,7 +96,7 @@ static int enablevicp = -1; | ||
24 | module_param(enablevicp, int, S_IRUGO); | ||
25 | |||
26 | /* forward declaration of system calls (used by Linux driver) */ | ||
27 | -static int lpm_ioctl (struct inode *inode, struct file *filp, | ||
28 | +static long lpm_ioctl (struct file *filp, | ||
29 | unsigned int cmd, unsigned long args); | ||
30 | static int lpm_open (struct inode *inode, struct file *filp); | ||
31 | static int lpm_release (struct inode *inode, struct file *filp); | ||
32 | @@ -111,7 +112,7 @@ static void lpm_os_trace (char *fmt, ...); | ||
33 | |||
34 | static struct file_operations lpm_fops = { | ||
35 | .owner = THIS_MODULE, | ||
36 | - .ioctl = lpm_ioctl, | ||
37 | + .unlocked_ioctl = lpm_ioctl, | ||
38 | .open = lpm_open, | ||
39 | .release = lpm_release, | ||
40 | }; | ||
41 | @@ -244,7 +245,11 @@ static int __init lpm_init(void) | ||
42 | lpm->inst[i].major = MAJOR(lpm->first); | ||
43 | lpm->inst[i].minor = MINOR(lpm->first) + i; | ||
44 | INIT_LIST_HEAD(&lpm->inst[i].clients); | ||
45 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) | ||
46 | init_MUTEX(&lpm->inst[i].sem); | ||
47 | +#else | ||
48 | + sema_init(&lpm->inst[i].sem,1); | ||
49 | +#endif | ||
50 | init_completion(&lpm->inst[i].event); | ||
51 | lpm_devAttrs.os_instance = (void *)&lpm->inst[i]; | ||
52 | LPM_init(i, &lpm->inst[i].lpm, &lpm_devAttrs); | ||
53 | @@ -320,7 +325,7 @@ fail_02: | ||
54 | /* | ||
55 | * ======== lpm_ioctl ======== | ||
56 | */ | ||
57 | -static int lpm_ioctl(struct inode *inode, struct file *filp, | ||
58 | +static long lpm_ioctl(struct file *filp, | ||
59 | unsigned int cmd, unsigned long args) | ||
60 | { | ||
61 | struct LPM_Dev *dev; | ||
62 | @@ -328,6 +333,7 @@ static int lpm_ioctl(struct inode *inode, struct file *filp, | ||
63 | LPM_Client *client; | ||
64 | LPM_Status lpmStat = LPM_SOK; | ||
65 | int stat = 0; | ||
66 | + struct inode *inode = filp->f_dentry->d_inode; | ||
67 | |||
68 | TRACE(KERN_ALERT "--> lpm_ioctl, cmd: 0x%X\n", cmd); | ||
69 | |||
70 | -- | ||
71 | 1.6.6.1 | ||
72 | |||
diff --git a/recipes-ti/local-power-manager/ti-local-power-manager_1.24.02.09.bb b/recipes-ti/local-power-manager/ti-local-power-manager_1.24.02.09.bb deleted file mode 100644 index 195b1776..00000000 --- a/recipes-ti/local-power-manager/ti-local-power-manager_1.24.02.09.bb +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | require ti-local-power-manager.inc | ||
2 | |||
3 | PV = "1_24_02_09" | ||
4 | PE = "1" | ||
5 | |||
6 | SRC_URI += "file://lpm-BKL-fix.patch" | ||
7 | |||
8 | SRC_URI[lpmtarball.md5sum] = "3d05453df26dfc811de04839d74c2f2b" | ||
9 | SRC_URI[lpmtarball.sha256sum] = "7335959a6217df17289f81839e6c6948f31cc0797ebc5389edef7190ed3ea589" | ||
10 | |||
11 | INSANE_SKIP_${PN} = "installed-vs-shipped" | ||
diff --git a/recipes-ti/syslink/ti-syslink.inc b/recipes-ti/syslink/ti-syslink.inc deleted file mode 100644 index 5ff6af7c..00000000 --- a/recipes-ti/syslink/ti-syslink.inc +++ /dev/null | |||
@@ -1,225 +0,0 @@ | |||
1 | DESCRIPTION = "SYSLINK Inter-Processor Communications (IPC) for TI ARM/DSP processors" | ||
2 | HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/syslink/index.html" | ||
3 | SECTION = "devel" | ||
4 | LICENSE = "BSD" | ||
5 | |||
6 | LIC_FILES_CHKSUM = "file://docs/bsd.pdf;md5=9f2edd962cd129f8c24e9ef1bd641029" | ||
7 | |||
8 | # TODO :: multi-machine, add m3 build as well? | ||
9 | # TODO :: proper staging? | ||
10 | # TODO :: kernel module examples? | ||
11 | # TODO :: smarter handling of config.bld | ||
12 | # TODO :: review XDC parallel make - why not happening automatically? | ||
13 | # TODO :: smarter suffix management | ||
14 | |||
15 | require ../includes/ti-paths.inc | ||
16 | require ../includes/ti-staging.inc | ||
17 | |||
18 | PROVIDES = "ti-syslink-module" | ||
19 | PROVIDES += "ti-syslink-examples" | ||
20 | |||
21 | # This package builds a kernel module, use kernel PR as base and append a local version | ||
22 | PR = "${MACHINE_KERNEL_PR}" | ||
23 | PR_append = "a" | ||
24 | PVExtra = "" | ||
25 | |||
26 | inherit module pkgconfig | ||
27 | |||
28 | S = "${WORKDIR}/syslink_${PV}${PVExtra}" | ||
29 | |||
30 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/syslink/${PV}${PVExtra}/exports/syslink_${PV}${PVExtra}.tar.gz;name=syslinktarball \ | ||
31 | file://syslink.pc \ | ||
32 | " | ||
33 | |||
34 | DEPENDS = "ti-sysbios ti-xdctools-native ti-cgt6x ti-ipc ti-cgt470" | ||
35 | DEPENDS += "virtual/kernel" | ||
36 | |||
37 | #common frameq gateMP heapBufMP heapMemMP knlNotify listMP messageQ notify ringIO ringIO_gpp sharedRegion slaveLoader tilerDaemon | ||
38 | SYSLINKHLOSSAMPLES = "knlnotify slaveLoader frameq notify" | ||
39 | #SYSLINKRTOSSAMPLES = "frameq gateMP heapBufMP heapMemMP listMP messageQ notify ringIO ringIO_gpp sharedRegion" | ||
40 | |||
41 | # SOC_FAMILY configuration | ||
42 | |||
43 | SYSLINKPLATFORM_omap3 = "OMAP3530" | ||
44 | SYSLINKPLATFORM_omapl137 = "OMAPL1XX" | ||
45 | SYSLINKPLATFORM_omapl138 = "OMAPL1XX" | ||
46 | SYSLINKPLATFORM_ti816x = "TI81XX" | ||
47 | SYSLINKPLATFORM_ti814x = "TI81XX" | ||
48 | SYSLINKPLATFORM ?= "<UNDEFINED_SYSLINKPLATFORM>" | ||
49 | |||
50 | SYSLINKVARIANT_omap3 = "OMAP3530" | ||
51 | SYSLINKVARIANT_omapl137 = "OMAPL1XX" | ||
52 | SYSLINKVARIANT_omapl138 = "OMAPL1XX" | ||
53 | SYSLINKVARIANT_ti816x = "TI816X" | ||
54 | SYSLINKVARIANT_ti814x = "TI814X" | ||
55 | SYSLINKVARIANT ?= "<UNDEFINED_SYSLINKVARIANT>" | ||
56 | |||
57 | # COFF/ELF config - omap3 can be coff/elf, omapl only coff, ti816x and ti814x only elf | ||
58 | |||
59 | # this really needs to be a list... in the case of ELF/COFF (and this could use DSPSUFFIX?) | ||
60 | SYSLINKSUFFIX_omap3 = "x64P" | ||
61 | SYSLINKSUFFIX_omapl137 = "x674" | ||
62 | SYSLINKSUFFIX_omapl138 = "x674" | ||
63 | SYSLINKSUFFIX_ti816x = "xe674" | ||
64 | SYSLINKSUFFIX_ti814x = "xe674" | ||
65 | SYSLINKSUFFIX ?= "<UNDEFINED_SYSLINKSUFFIX>" | ||
66 | |||
67 | SYSLINKLOADER_omap3 = "COFF" | ||
68 | SYSLINKLOADER_omapl137 = "COFF" | ||
69 | SYSLINKLOADER_omapl138 = "COFF" | ||
70 | SYSLINKLOADER_ti816x = "ELF" | ||
71 | SYSLINKLOADER_ti814x = "ELF" | ||
72 | SYSLINKLOADER ?= "<UNDEFINED_SYSLINKLOADER>" | ||
73 | |||
74 | # Do we really need to configure this? - configured already in config.bld | ||
75 | XDCTARGETS_omap3 = "ti.targets.C64P" | ||
76 | XDCTARGETS_omapl137 = "ti.targets.C674" | ||
77 | XDCTARGETS_omapl138 = "ti.targets.C674" | ||
78 | # for ti816x and ti814x, we should later also build for ti.targets.arm.elf.M3 | ||
79 | XDCTARGETS_ti816x = "ti.targets.elf.C674 ti.targets.arm.elf.M3" | ||
80 | XDCTARGETS_ti814x = "ti.targets.elf.C674 ti.targets.arm.elf.M3" | ||
81 | XDCTARGETS ?= "<UNDEFINED_XDCTARGETS>" | ||
82 | export XDCTARGETS | ||
83 | |||
84 | # Exported Variable needed by build | ||
85 | export SYSLINK_ROOT = "${S}/packages/" | ||
86 | |||
87 | export XDCPATH = "${IPC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages" | ||
88 | |||
89 | do_configure() { | ||
90 | sed -i -e s:@VERSION@:${PV}:g ${WORKDIR}/syslink.pc | ||
91 | |||
92 | cp ${WORKDIR}/syslink.pc ${S} | ||
93 | } | ||
94 | |||
95 | do_prepsources () { | ||
96 | |||
97 | # Prepare the tree for rebuiling - clean and generate interfaces | ||
98 | cd ${SYSLINK_ROOT}/ti/syslink | ||
99 | ${XDC_INSTALL_DIR}/xdc --jobs=${BB_NUMBER_THREADS} .make -PR . | ||
100 | ${XDC_INSTALL_DIR}/xdc --jobs=${BB_NUMBER_THREADS} clean -PR . | ||
101 | ${XDC_INSTALL_DIR}/xdc --jobs=${BB_NUMBER_THREADS} .interfaces -PR . | ||
102 | } | ||
103 | |||
104 | addtask prepsources after do_configure before do_compile | ||
105 | |||
106 | do_compile() { | ||
107 | # TODO :: KERNEL_CC, should use for kernel module build? | ||
108 | # TODO :: Check the 'unset's | ||
109 | |||
110 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | ||
111 | |||
112 | do_make_scripts | ||
113 | |||
114 | # Build the gpp (hlos) kernel space | ||
115 | cd ${SYSLINK_ROOT}/ti/syslink/utils/hlos/knl/Linux && make \ | ||
116 | ARCH="${TARGET_ARCH}" \ | ||
117 | CROSS_COMPILE="${TARGET_PREFIX}" \ | ||
118 | SYSLINK_PLATFORM="${SYSLINKPLATFORM}" \ | ||
119 | SYSLINK_VARIANT="${SYSLINKVARIANT}" \ | ||
120 | SYSLINK_LOADER="${SYSLINKLOADER}" \ | ||
121 | SYSLINK_PKGPATH="${IPC_INSTALL_DIR}/packages" \ | ||
122 | KDIR="${STAGING_KERNEL_DIR}" | ||
123 | |||
124 | # # Build the gpp (hlos) kernel space samples. | ||
125 | # for sample in ${SYSLINKHLOSSAMPLES}; do | ||
126 | # cd ${SYSLINK_ROOT}/ti/syslink/samples/hlos/$sample/knl/Linux && make \ | ||
127 | # ARCH="${TARGET_ARCH}" \ | ||
128 | # CROSS_COMPILE="${TARGET_PREFIX}" \ | ||
129 | # SYSLINK_PLATFORM="${SYSLINKPLATFORM}" \ | ||
130 | # SYSLINK_VARIANT="${SYSLINKVARIANT}" \ | ||
131 | # SYSLINK_LOADER="${SYSLINKLOADER}" \ | ||
132 | # SYSLINK_PKGPATH="${IPC_INSTALL_DIR}/packages" \ | ||
133 | # SYSLINK_SDK=EZSDK \ | ||
134 | # KDIR="${STAGING_KERNEL_DIR}" | ||
135 | # done | ||
136 | |||
137 | # Build the gpp (hlos) user space | ||
138 | cd ${SYSLINK_ROOT}/ti/syslink/utils/hlos/usr/Linux && make \ | ||
139 | ARCH="${TARGET_ARCH}" \ | ||
140 | CROSS_COMPILE="${TARGET_PREFIX}" \ | ||
141 | TOOLCHAIN_PREFIX="${TOOLCHAIN_PATH}/${TARGET_PREFIX}" \ | ||
142 | SYSLINK_PLATFORM="${SYSLINKPLATFORM}" \ | ||
143 | SYSLINK_VARIANT="${SYSLINKVARIANT}" \ | ||
144 | SYSLINK_LOADER="${SYSLINKLOADER}" \ | ||
145 | SYSLINK_PKGPATH="${IPC_INSTALL_DIR}/packages" | ||
146 | |||
147 | # Build the gpp (hlos) user space samples | ||
148 | # First build the common lib for samples. | ||
149 | cd ${SYSLINK_ROOT}/ti/syslink/samples/hlos/common/usr/Linux && make \ | ||
150 | ARCH="${TARGET_ARCH}" \ | ||
151 | CROSS_COMPILE="${TARGET_PREFIX}" \ | ||
152 | TOOLCHAIN_PREFIX="${TOOLCHAIN_PATH}/${TARGET_PREFIX}" \ | ||
153 | SYSLINK_PLATFORM="${SYSLINKPLATFORM}" \ | ||
154 | SYSLINK_VARIANT="${SYSLINKVARIANT}" \ | ||
155 | SYSLINK_LOADER="${SYSLINKLOADER}" \ | ||
156 | SYSLINK_SDK=EZSDK \ | ||
157 | SYSLINK_PKGPATH="${IPC_INSTALL_DIR}/packages" | ||
158 | |||
159 | for sample in ${SYSLINKHLOSSAMPLES}; do | ||
160 | cd ${SYSLINK_ROOT}/ti/syslink/samples/hlos/$sample/usr/Linux && make \ | ||
161 | ARCH="${TARGET_ARCH}" \ | ||
162 | CROSS_COMPILE="${TARGET_PREFIX}" \ | ||
163 | TOOLCHAIN_PREFIX="${TOOLCHAIN_PATH}/${TARGET_PREFIX}" \ | ||
164 | SYSLINK_PLATFORM="${SYSLINKPLATFORM}" \ | ||
165 | SYSLINK_VARIANT="${SYSLINKVARIANT}" \ | ||
166 | SYSLINK_LOADER="${SYSLINKLOADER}" \ | ||
167 | SYSLINK_SDK=EZSDK \ | ||
168 | SYSLINK_PKGPATH="${IPC_INSTALL_DIR}/packages" | ||
169 | done | ||
170 | |||
171 | # Build the dsp/arm (rtos) code (system and samples) | ||
172 | # cd ${SYSLINK_ROOT}/ti/syslink && \ | ||
173 | # ${XDC_INSTALL_DIR}/xdc --jobs=${BB_NUMBER_THREADS} -PR . | ||
174 | export XDCOPTIONS=v | ||
175 | cd ${SYSLINK_ROOT}/ti/syslink && \ | ||
176 | ${XDC_INSTALL_DIR}/xdc -P \ | ||
177 | `${XDC_INSTALL_DIR}/bin/xdcpkg ${SYSLINK_ROOT}/ti/syslink | grep -v samples` | ||
178 | export XDCARGS="profile=debug" | ||
179 | cd ${SYSLINK_ROOT}/ti/syslink && \ | ||
180 | ${XDC_INSTALL_DIR}/xdc --jobs=${BB_NUMBER_THREADS} -P \ | ||
181 | `${XDC_INSTALL_DIR}/bin/xdcpkg ${SYSLINK_ROOT}/ti/syslink | grep samples` | ||
182 | } | ||
183 | |||
184 | KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}" | ||
185 | |||
186 | do_install () { | ||
187 | |||
188 | # Install the hlos kernel module | ||
189 | install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp | ||
190 | install -m 0755 ${SYSLINK_ROOT}/ti/syslink/bin/${SYSLINKVARIANT}/syslink.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/ | ||
191 | |||
192 | # Install the hlos example kernel modules and apps | ||
193 | install -d ${D}/${installdir}/ti-syslink-examples | ||
194 | install -m 0755 ${SYSLINK_ROOT}/ti/syslink/bin/${SYSLINKVARIANT}/samples/* ${D}/${installdir}/ti-syslink-examples/ | ||
195 | |||
196 | # Install the rtos example apps | ||
197 | install -d ${D}/${installdir}/ti-syslink-examples/dsp | ||
198 | cd ${SYSLINK_ROOT}/ti/syslink/samples/rtos | ||
199 | for i in $(find . -name "*.${SYSLINKSUFFIX}" | grep "${SOC_FAMILY}"); do | ||
200 | install ${i} ${D}/${installdir}/ti-syslink-examples/dsp/ | ||
201 | done | ||
202 | |||
203 | # TODO :: Fixup - library/headers installation - this shouldn't go into the examples directory.... | ||
204 | # Needs proper staging | ||
205 | # Install the library in the filesystem | ||
206 | # install -d ${D}/${installdir}/ti-syslink-examples | ||
207 | # install -m 0755 ${SYSLINK_ROOT}/ti/syslink/lib/syslink.a ${D}/${installdir}/ti-syslink-examples/ | ||
208 | |||
209 | # Install/Stage the Source Tree | ||
210 | install -d ${D}${SYSLINK_INSTALL_DIR_RECIPE} | ||
211 | cp -pPrf ${S}/* ${D}${SYSLINK_INSTALL_DIR_RECIPE} | ||
212 | |||
213 | install -d ${D}/${libdir}/pkgconfig | ||
214 | install ${S}/syslink.pc ${D}/${libdir}/pkgconfig/ | ||
215 | } | ||
216 | |||
217 | PACKAGES =+ "ti-syslink-module" | ||
218 | FILES_ti-syslink-module = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/syslink.ko" | ||
219 | |||
220 | PACKAGES =+ "ti-syslink-examples" | ||
221 | RRECOMMENDS_ti-syslink-examples_append = " ti-syslink-module" | ||
222 | FILES_ti-syslink-examples = "${installdir}/ti-syslink-examples/*" | ||
223 | INSANE_SKIP_ti-syslink-examples = "1" | ||
224 | |||
225 | FILES_${PN}-dev = "${libdir}/*" | ||
diff --git a/recipes-ti/syslink/ti-syslink/syslink.pc b/recipes-ti/syslink/ti-syslink/syslink.pc deleted file mode 100644 index c4d720f1..00000000 --- a/recipes-ti/syslink/ti-syslink/syslink.pc +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | prefix=/../..//syslink_@VERSION@ | ||
2 | libdir=${prefix}/ti/syslink/lib | ||
3 | includedir=${prefix}/ti/syslink | ||
4 | |||
5 | Name: TI Syslink | ||
6 | Description: Syslink ARM-DSP IPC (Inter Processor Communication) | ||
7 | Version: @VERSION@ | ||
8 | Requires: ipc | ||
9 | Libs: ${libdir}/syslink.a_release | ||
10 | Cflags: -I${includedir} -I${includedir}/inc -I${includedir}/utils | ||
diff --git a/recipes-ti/syslink/ti-syslink_2.00.00.78.bb b/recipes-ti/syslink/ti-syslink_2.00.00.78.bb deleted file mode 100644 index 71e96212..00000000 --- a/recipes-ti/syslink/ti-syslink_2.00.00.78.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | require ti-syslink.inc | ||
2 | |||
3 | PV = "2_00_00_78" | ||
4 | PVwithdots = "2.00.00.78" | ||
5 | |||
6 | SRC_URI[syslinktarball.md5sum] = "df7c92cd2cca38fdb38e59e4175aba61" | ||
7 | SRC_URI[syslinktarball.sha256sum] = "3409d080b08ec1d0bd24a715dbec783f1d52020e452485c165ad64e121548ebc" | ||
8 | |||