Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...

Conflicts:

	packages/dsplink/codec-engine_2.21.bb
	packages/dsplink/dsplink.inc

diff --cc conf/checksums.ini
Simple merge

diff --cc packages/dsplink/dsplink.inc
index 5253f00,9955d4d..10e7c23
--- 1/packages/dsplink/dsplink.inc
--- 2/packages/dsplink/dsplink.inc
+++ b/packages/dsplink/dsplink.inc
@@@ -13,34 -13,9 +13,32 @@@ export DSPLINK="${S}
  
  require ti-paths.inc
  
 +DSPLINKPLATFORM ?= "DAVINCI"
 +DSPLINKPLATFORM_omap5912osk = "OMAP"
 +DSPLINKPLATFORM_beagleboard = "OMAP3530"
 +DSPLINKPLATFORM_davinci-sffsdr = "DAVINCI"
 +DSPLINKPLATFORM_davinci-dvevm = "DAVINCI"
 +
 +DSPLINKDSP ?= "C64XX"
 +
 +DSPLINKSOC ?= "DM6446"
 +DSPLINKSOC_beagleboard = "3530"
 +
 +DSPCFG ?= "DM6446GEMSHMEM"
 +DSPCFG_beagleboard ?= "OMAP3530SHMEM"
 +
 +GPPOS ?= "DAVINCILSP"
 +GPPOS_beagleboard = "OMAPLSP"
 +
 +export DSPLINKPLATFORM 
 +export DSPLINKDSP
 +export DSPLINKSOC
 +export DSPCFG
 +export GPPOS
 +
  do_configure () {
- 
- # Run perl script to create appropriate makefiles (v1.60 and up)
- DSPLINK=${S} perl config/bin/dsplinkcfg.pl --platform=${DSPLINKPLATFORM} --nodsp=1 --dspcfg_0=${DSPCFG} --dspos_0=DSPBIOS5XX  --gppos=${GPPOS} --comps=ponslrm
- 
+       # Run perl script to create appropriate makefiles (v1.60 and up)
+       perl config/bin/dsplinkcfg.pl --platform=${DSPLINKPLATFORM} --nodsp=1 --dspcfg_0=${DSPCFG} --dspos_0=DSPBIOS5XX  --gppos=${GPPOS} --comps=ponslrm
  }
  
  PARALLEL_MAKE = ""