From 4ff8f98603885e1647668f4c218969b65d778f54 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 16 Jul 2008 08:33:56 +0000 Subject: dsplink: add glue to hook in TI dspbios and TI c64x compiler trees into the build * The user needs to obtain dspbios and cgtools on its own and override the TI*DIR vars in local.conf to point to the correct location, default is /OE/TI --- packages/dsplink/dsplink.inc | 16 +++++++++++++++- packages/dsplink/dsplink_1.50.bb | 2 +- packages/dsplink/dsplink_1.51.00.08.bb | 2 +- packages/dsplink/files/c64xx_5.xx_linux.mk | 8 ++++---- 4 files changed, 21 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/dsplink/dsplink.inc b/packages/dsplink/dsplink.inc index d9c3c07e02..29633dae59 100644 --- a/packages/dsplink/dsplink.inc +++ b/packages/dsplink/dsplink.inc @@ -11,6 +11,13 @@ S = "${WORKDIR}/dsplink_1_50/dsplink" # Needed for buildscripts export DSPLINK = "${S}" +# Path to the dir where the TI tools are unpacked +TITOOLSDIR ?= "/OE/TI" +# Path under TITOOLSDIR where dspbios is unpacked +TIBIOSDIR ?= "bios_5_32_03" +# Path under TITOOLSDIR where the dsp toolchain is unpacked +TICGTOOLSDIR ?= "cg6x_6_1_2" + DSPLINKPLATFORM ?= "Davinci" DSPLINKPLATFORM_omap5912osk = "OMAP" @@ -48,6 +55,8 @@ KERNELARMFLAGS_armv7a = "-c -nostdinc -include $(BASE_OSINC)/linux/autoconf.h -i -Wdeclaration-after-statement -Os -marm -mabi=aapcs-linux \ -D__KERNEL__ -mno-thumb-interwork -msoft-float -fno-optimize-sibling-calls -g -fno-stack-protector -Wno-pointer-sign -g -DUSE_UDEV=1 -DOS_LINUX -DLINUX_KERNEL" +DSPFLAGS = "-q -pdr -pdv -pden -ml3 -mv64+ " + export DSPLINKPLATFORM export DSPLINKDSP @@ -59,7 +68,7 @@ do_configure () { sed -i -e s:SED_ME_SOURCEDIR:${S}:g \ -e s:SED_ME_GPPDISTRO:openembedded:g \ -e s:SED_ME_KERNELVERSION:${KERNEL_VERSION}:g \ - -e s:SED_ME_DSPDISTRO:openembedded:g \ + -e s:SED_ME_DSPDISTRO:c64xx_5.xx_linux:g \ -e s:SED_ME_PLATFORM:${DSPLINKPLATFORM}:g \ -e s:SED_ME_DSP:${DSPLINKDSP}:g \ -e s:SED_ME_SOC:${DSPLINKSOC}:g \ @@ -73,6 +82,11 @@ do_configure () { -e 's:SEDME_USER_ARMFLAGS:${USERARMFLAGS}:g' \ ${S}/make/Linux/openembedded.mk + sed -i -e s:SEDME_TITOOLS_BASEPATH:${TITOOLSDIR}:g \ + -e s:SEDME_BIOSUNPACKDIR:${TIBIOSDIR}:g \ + -e s:SEDME_CGTOOLSDIR:${TICGTOOLSDIR}:g \ + -e 's:SEDME_DSPFLAGS:${DSPFLAGS}:g' \ + ${S}/make/DspBios/c64xx_5.xx_linux.mk } PARALLEL_MAKE = "" diff --git a/packages/dsplink/dsplink_1.50.bb b/packages/dsplink/dsplink_1.50.bb index cba9bf1f97..9132389923 100644 --- a/packages/dsplink/dsplink_1.50.bb +++ b/packages/dsplink/dsplink_1.50.bb @@ -1,6 +1,6 @@ require dsplink.inc -PR = "r8" +PR = "r9" PE = "1" PV = "1.50" diff --git a/packages/dsplink/dsplink_1.51.00.08.bb b/packages/dsplink/dsplink_1.51.00.08.bb index d4a71b437e..36ac50f4cf 100644 --- a/packages/dsplink/dsplink_1.51.00.08.bb +++ b/packages/dsplink/dsplink_1.51.00.08.bb @@ -1,6 +1,6 @@ require dsplink.inc -PR = "r8" +PR = "r9" PE = "1" PV = "1.51" diff --git a/packages/dsplink/files/c64xx_5.xx_linux.mk b/packages/dsplink/files/c64xx_5.xx_linux.mk index d0b27d7a55..8e0e8cd116 100644 --- a/packages/dsplink/files/c64xx_5.xx_linux.mk +++ b/packages/dsplink/files/c64xx_5.xx_linux.mk @@ -35,8 +35,8 @@ USE_DISTRIBUTION := 1 # ---------------------------------------------------------------------------- # Base directory for the DSP OS # ---------------------------------------------------------------------------- -BASE_INSTALL := /opt/ti-tools -BASE_SABIOS := $(BASE_INSTALL)/bios +BASE_INSTALL := SEDME_TITOOLS_BASEPATH +BASE_SABIOS := $(BASE_INSTALL)/SEDME_BIOSUNPACKDIR BASE_BUILDOS := $(BASE_SABIOS)/packages/ti/bios # ---------------------------------------------------------------------------- @@ -47,7 +47,7 @@ XDCTOOLS_DIR := $(BASE_SABIOS)/xdctools # ---------------------------------------------------------------------------- # Base for code generation tools - compiler, linker, archiver etc. # ---------------------------------------------------------------------------- -BASE_CGTOOLS := $(BASE_INSTALL)/c6000/cgtools +BASE_CGTOOLS := $(BASE_INSTALL)/SEDME_CGTOOLSDIR BASE_CGTOOLSBIN := $(BASE_CGTOOLS)/bin # ---------------------------------------------------------------------------- @@ -135,7 +135,7 @@ CC_SW_REL := -o3 # ---------------------------------------------------------------------------- # Standard flags for the compiler # ---------------------------------------------------------------------------- -STD_CC_FLAGS := -q -pdr -pdv -pden -ml3 -mv6400 -d"CHIP_DM642" +STD_CC_FLAGS := SEDME_DSPFLAGS -d"CHIP_DM642" # ---------------------------------------------------------------------------- # Standard flags for the compiler when building an executable -- cgit v1.2.3