1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-01 08:20:47 +00:00

c6accel: move to a seperate dir

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi
2011-08-08 08:59:56 +02:00
parent a502e14cf4
commit ec6a6c9427
5 changed files with 0 additions and 0 deletions
-94
View File
@@ -1,94 +0,0 @@
DESCRIPTION = "TI C6Accel - DSP Software Libraries on ARM"
HOMEPAGE = "https://gforge01.dal.design.ti.com/gf/project/dsplib4arm/"
SECTION = "devel"
LICENSE = "TI TSPA"
require recipes-ti/includes/ti-paths.inc
require recipes-ti/includes/ti-staging.inc
require recipes-ti/includes/ti-eula-unpack.inc
PLATFORM_omapl138 = "omapl138"
PLATFORM_omap3 = "omap3530"
PLATFORM ?= "<UNDEFINED_PLATFORM>"
COMPATIBLE_MACHINE = "(omapl138|omap3)"
PROVIDES += "ti-c6accel-apps"
# This recipe links statically against kernel dependant stuff, use kernel PR as base and append a local version
PR = "${MACHINE_KERNEL_PR}"
PR_append = "c"
S = "${WORKDIR}/c6accel_${PV}"
# http://software-dl.ti.com/dsps/dsps_public_sw/c6000/web/c6accel/latest/index_FDS.html
SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/c6000/web/c6accel/latest/exports//c6accel_${PV}_Linux-x86_Setup.bin;name=c6accelbin "
BINFILE="c6accel_${PV}_Linux-x86_Setup.bin"
TI_BIN_UNPK_CMDS="Y:workdir"
DEPENDS = "ti-codec-engine ti-xdais ti-dsplink ti-dspbios"
DEPENDS += "ti-edma3lld ti-cgt6x ti-xdctools ti-framework-components"
DEPENDS += "ti-biosutils"
TIARGS = ' \
PLATFORM="${PLATFORM}" \
CE_INSTALL_DIR="${CE_INSTALL_DIR}" \
XDAIS_INSTALL_DIR="${XDAIS_INSTALL_DIR}" \
LINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \
CMEM_INSTALL_DIR="${CMEM_INSTALL_DIR}" \
EDMA3_LLD_INSTALL_DIR="${EDMA3_LLD_INSTALL_DIR}" \
CODEGEN_INSTALL_DIR="${CODEGEN_INSTALL_DIR}" \
XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" \
FC_INSTALL_DIR="${FC_INSTALL_DIR}" \
BIOS_INSTALL_DIR="${BIOS_INSTALL_DIR}" \
BIOSUTILS_INSTALL_DIR="${BIOSUTILS_INSTALL_DIR}" \
LPM_INSTALL_DIR="${LPM_INSTALL_DIR}" \
SERVER_INSTALL_DIR="${CODEC_INSTALL_DIR}" \
C6ACCEL_INSTALL_DIR="${S}" \
CSTOOL_DIR="${TOOLCHAIN_PATH}" \
CSTOOL_PREFIX="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}" \
LINUXLIBS_INSTALL_DIR="${STAGING_DIR}/${BASE_PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}" \
CFLAGS=" ${TARGET_CC_ARCH} ${CFLAGS}" LDFLAGS="${LDFLAGS}" \
'
do_configure() {
unset VERBOSE
make ${TIARGS} clean
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
# Angstrom 2008 breaks with -Wl,-T, while angstrom 2010 needs it
if [ $(${TARGET_PREFIX}gcc -dumpversion | awk -F. '{print $2}') -gt 3 ] ; then
sed -i -e 's: $(XDC_CFG)/linker.cmd: -Wl,-T,$(XDC_CFG)/linker.cmd:g' ${S}/soc/app/Makefile
fi
}
do_compile() {
unset VERBOSE
make ${TIARGS} all
}
do_install() {
install -d ${D}${C6ACCEL_INSTALL_DIR_RECIPE}
cp -pPrf ${S}/* ${D}${C6ACCEL_INSTALL_DIR_RECIPE}
# update linker.cmd file to point to sysroot
sed -i ${i} -e s=${S}=${C6ACCEL_INSTALL_DIR}=g ${D}${C6ACCEL_INSTALL_DIR_RECIPE}/soc/app/c6accel_app_config/linker.cmd
cd ${S}
make \
PLATFORM="${PLATFORM}" \
CMEM_INSTALL_DIR="${CMEM_INSTALL_DIR}" \
LINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \
LPM_INSTALL_DIR="${LPM_INSTALL_DIR}" \
C6ACCEL_INSTALL_DIR="${S}" \
EXEC_DIR_C6ACCEL="${D}/${installdir}/c6accel-apps" \
install
}
PACKAGES += "ti-c6accel-apps"
FILES_ti-c6accel-apps = "${installdir}/c6accel-apps/*"
INSANE_SKIP_ti-c6accel-apps = True
RDEPENDS_ti-c6accel-apps += "ti-cmem-module ti-dsplink-module"
@@ -1,26 +0,0 @@
From 58c50064afdc2fd7093613e0ae3a9192ea189460 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Wed, 5 Jan 2011 10:10:33 +0100
Subject: [PATCH] soc/app: fix makefile to pass -Wl,-T, before the linkerscript
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
soc/app/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/soc/app/Makefile b/soc/app/Makefile
index 0bb7bdc..342e43a 100755
--- a/soc/app/Makefile
+++ b/soc/app/Makefile
@@ -33,7 +33,7 @@ XDC_CFG = $(TARGET)_config
XDC_CFLAGS = $(XDC_CFG)/compiler.opt
# Output linker file
-XDC_LFILE = $(XDC_CFG)/linker.cmd
+XDC_LFILE = -Wl,-T,$(XDC_CFG)/linker.cmd
# Input configuration file
XDC_CFGFILE = $(PLATFORM)/$(TARGET).cfg
--
1.6.6.1
@@ -1,82 +0,0 @@
From 192b19046a67263da44203bf50a5b51d0a655fec Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Fri, 31 Dec 2010 15:26:37 +0100
Subject: [PATCH] soc: honour buildsystem CFLAGS and LDFLAGS when set
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
soc/app/Makefile | 13 ++++---------
soc/c6accelw/Makefile | 14 ++++----------
2 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/soc/app/Makefile b/soc/app/Makefile
index 2647746..bed937e 100755
--- a/soc/app/Makefile
+++ b/soc/app/Makefile
@@ -53,15 +53,10 @@ CONFIGURO = $(XDC_INSTALL_DIR)/xs xdc.tools.configuro
CONFIG_BLD = ../../config.bld
ifeq ($(BUILD_TYPE), release)
-ifeq ($(ARM_ISA),armv7-a)
- C_FLAGS += -O3 -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp
-endif
-ifeq ($(ARM_ISA),armv5t)
- C_FLAGS += -mlittle-endian -march=armv5t -mtune=arm9tdmi -mabi=aapcs-linux -O
-endif
+C_FLAGS += $(CFLAGS)
else
CPP_FLAGS += -DNDEBUG
- C_FLAGS += -Wall -g
+ C_FLAGS += $(CFLAGS) -Wall -g
endif
@@ -72,7 +67,7 @@ ifeq ($(PLATFORM),omapl138)
C_FLAGS += -DPLATFORM=138
endif
-LD_FLAGS += -L$(LINUXLIBS_INSTALL_DIR)/lib -lm -lpthread
+LD_FLAGS += $(LDFLAGS) -L$(LINUXLIBS_INSTALL_DIR)/lib -lm -lpthread
C6ACCEL_LIB += ../c6accelw/lib/c6accelw_$(PLATFORM).a470MV
COMPILE.c = $(VERBOSE) $(CSTOOL_PREFIX)gcc $(CPP_FLAGS) $(C_FLAGS) $(CPP_FLAGS) -c
@@ -102,7 +97,7 @@ $(TARGET): $(OBJFILES) $(C6ACCEL_LIB) $(XDC_LFILE)
$(OBJFILES): %.o: %.c $(HEADERS) $(XDC_CFLAGS)
@echo Compiling $@ from $<..
- $(COMPILE.c) $(shell cat $(XDC_CFLAGS)) -o $@ $<
+ $(COMPILE.c) $(shell cat $(XDC_CFLAGS) | sed 's:-march=armv5t::g') -o $@ $<
$(XDC_LFILE) $(XDC_CFLAGS): $(XDC_CFGFILE)
@echo
diff --git a/soc/c6accelw/Makefile b/soc/c6accelw/Makefile
index cc58acf..298ab3b 100755
--- a/soc/c6accelw/Makefile
+++ b/soc/c6accelw/Makefile
@@ -21,19 +21,13 @@ BUILD_TYPE=release
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
ifeq ($(BUILD_TYPE), release)
-ifeq ($(ARM_ISA),armv7-a)
- C_FLAGS += -O3 -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp
- endif
-ifeq ($(ARM_ISA),armv5t)
- C_FLAGS += -mlittle-endian -march=armv5t -mtune=arm9tdmi -mabi=aapcs-linux -O
- endif
-
+C_FLAGS += $(CFLAGS)
else
- CPP_FLAGS += -DNDEBUG
- C_FLAGS += -Wall -g
+ CPP_FLAGS += -DNDEBUG
+ C_FLAGS += $(CFLAGS) -Wall -g
endif
-LD_FLAGS += -L$(LINUXLIBS_INSTALL_DIR)/lib
+LD_FLAGS += $(LDFLAGS) -L$(LINUXLIBS_INSTALL_DIR)/lib
AR_FLAGS +=
COMPILE.c = $(VERBOSE) $(CSTOOL_PREFIX)gcc $(CPP_FLAGS) $(C_FLAGS) -c
--
1.6.6.1
@@ -1,81 +0,0 @@
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
--- c6accel_1_00_00_04_orig/soc/app/omap3530/loadmodules_omap3530_c6accel.sh 2010-07-26 16:18:35.000000000 -0500
+++ c6accel_1_00_00_04/soc/app/omap3530/loadmodules_omap3530_c6accel.sh 2010-09-12 11:50:46.129159981 -0500
@@ -1,4 +1,4 @@
-# loadmodules.sh
+#!/bin/sh
#
# Copyright (C) $year Texas Instruments Incorporated - http://www.ti.com/
#
@@ -11,34 +11,16 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
-#
-# Default Memory Map
-#
-# Start Addr Size Description
-# -------------------------------------------
-# 0x80000000 88 MB Linux
-# 0x85800000 08 MB CMEM
-# 0x86800000 24 MB DDRALGHEAP
-# 0x87800000 6 MB DDR2 (BIOS, Codecs, Applications)
-# 0x87E00000 1 MB DSPLINK (MEM)
-# 0x87F00000 4 KB DSPLINK (RESET)
-# 0x87F01000 1020 KB unused
-rmmod cmemk.ko
-rmmod lpm_omap3530.ko
-rmmod dsplinkk
-# Allocate 15MB for CMEM
-insmod cmemk.ko phys_start=0x86300000 phys_end=0x87200000 pools=20x4096
+# remove previously loaded cmem to ensure that it configured to use our pool configuration
+rmmod cmemk 2>/dev/null
-# insert DSP/BIOS Link driver
-#
-insmod dsplinkk.ko
+# Allocate 15MB for CMEM
+modprobe cmemk phys_start=0x86300000 phys_end=0x87200000 pools=20x4096 allowOverlap=1
+modprobe dsplinkk
+modprobe lpm_omap3530
# make /dev/dsplink
rm -rf /dev/dsplink
mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0
-# insert Local Power Manager driver
-#
-insmod lpm_omap3530.ko
-
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
--- c6accel_1_00_00_04_orig/soc/app/omapl138/loadmodules_omapl138_c6accel.sh 2010-07-27 09:45:37.000000000 -0500
+++ c6accel_1_00_00_04/soc/app/omapl138/loadmodules_omapl138_c6accel.sh 2010-09-12 11:52:07.193160179 -0500
@@ -1,4 +1,4 @@
-#
+#!/bin/sh
# Copyright (c) 2008, Texas Instruments Incorporated
# All rights reserved.
#
@@ -29,15 +29,14 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-rmmod dsplinkk.ko
-rmmod cmemk.ko
+
+# remove previously loaded cmem to ensure that its configured to use our pool configuration.
+rmmod cmemk 2>/dev/null
+
# insert cmemk, tell it to occupy physical 120MB-128MB, create
# 20 4K buffers, 10 128K buffers and two 1MB buffers
-insmod cmemk.ko phys_start=0xC2000000 phys_end=0xC4000000 pools=20x4096
-
-# insert DSP/BIOS Link driver
-#
-insmod dsplinkk.ko
+modprobe cmemk phys_start=0xC2000000 phys_end=0xC4000000 pools=20x4096 allowOverlap=1
+modprobe dsplinkk
# make /dev/dsplink
rm -f /dev/dsplink
@@ -1,14 +0,0 @@
require ti-c6accel.inc
SRC_URI[c6accelbin.md5sum] = "0ddf37fd9dad91fa3a914e549da933b9"
SRC_URI[c6accelbin.sha256sum] = "453399a84bf117bd7a91393242c7c005e2829692db5ede18e4be166c61e4354c"
SRC_URI_append = "file://fix-loadmodule.patch \
file://0001-soc-honour-buildsystem-CFLAGS-and-LDFLAGS-when-set.patch \
"
PV = "1_01_00_03"
CFLAGS += "-fPIC"