[oe-commits] org.oe.dev dsplink: add glue to hook in TI dspbios and TI c64x compiler trees into the build

[koen commit]

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: d164ddcc990d76af341eb6ee329c395f153b3bea
ViewMTN: http://monotone.openembedded.org/revision/info/d164ddcc990d76af341eb6ee329c395f153b3bea
Files:
1
packages/dsplink/dsplink.inc
packages/dsplink/dsplink_1.50.bb
packages/dsplink/dsplink_1.51.00.08.bb
packages/dsplink/files/c64xx_5.xx_linux.mk
Diffs:

#
# mt diff -rd4251a07b92e55abfd0c75b5e1df095bf0184d75 -rd164ddcc990d76af341eb6ee329c395f153b3bea
#
#
#
# patch "packages/dsplink/dsplink.inc"
#  from [9a18a0df88794b22a58645be2833819c6d551a38]
#    to [834b24de7fcb95b08ece3ca0a910e1a24ea8ac2e]
# 
# patch "packages/dsplink/dsplink_1.50.bb"
#  from [de8ff99089087c6bb2111519bc33ea11dcf00b8a]
#    to [7c50fa88c27a143ecaffccf1adaa106fad6cf643]
# 
# patch "packages/dsplink/dsplink_1.51.00.08.bb"
#  from [14446756523260c5cebb79d3bc3e7604947f2525]
#    to [0063cf4a9fd38f4a0da6489370bfd6820b3943ca]
# 
# patch "packages/dsplink/files/c64xx_5.xx_linux.mk"
#  from [b6836bf5cfa973564ebb43ebcbb75b126060bbcd]
#    to [1a9715b51a749a38da1104c8b3a2eafa3b4dbc36]
#
============================================================
--- packages/dsplink/dsplink.inc	9a18a0df88794b22a58645be2833819c6d551a38
+++ packages/dsplink/dsplink.inc	834b24de7fcb95b08ece3ca0a910e1a24ea8ac2e
@@ -11,6 +11,13 @@ export DSPLINK = "${S}"
 # 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 -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 = ""
============================================================
--- packages/dsplink/dsplink_1.50.bb	de8ff99089087c6bb2111519bc33ea11dcf00b8a
+++ packages/dsplink/dsplink_1.50.bb	7c50fa88c27a143ecaffccf1adaa106fad6cf643
@@ -1,6 +1,6 @@ require dsplink.inc
 require dsplink.inc
 
-PR = "r8"
+PR = "r9"
 PE = "1"
 PV = "1.50"
 
============================================================
--- packages/dsplink/dsplink_1.51.00.08.bb	14446756523260c5cebb79d3bc3e7604947f2525
+++ packages/dsplink/dsplink_1.51.00.08.bb	0063cf4a9fd38f4a0da6489370bfd6820b3943ca
@@ -1,6 +1,6 @@ require dsplink.inc
 require dsplink.inc
 
-PR = "r8"
+PR = "r9"
 PE = "1"
 PV = "1.51"
 
============================================================
--- packages/dsplink/files/c64xx_5.xx_linux.mk	b6836bf5cfa973564ebb43ebcbb75b126060bbcd
+++ packages/dsplink/files/c64xx_5.xx_linux.mk	1a9715b51a749a38da1104c8b3a2eafa3b4dbc36
@@ -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)/xdctoo
 #   ----------------------------------------------------------------------------
 #   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