dvsdk: merge in new versions from arago and clean them up a bit
authorKoen Kooi <koen@openembedded.org>
Wed, 26 Aug 2009 09:34:23 +0000 (11:34 +0200)
committerKoen Kooi <koen@openembedded.org>
Wed, 26 Aug 2009 09:34:23 +0000 (11:34 +0200)
41 files changed:
conf/checksums.ini
recipes/dvsdk/README [new file with mode: 0644]
recipes/dvsdk/files/cmem-remove-show-pte-function.patch [new file with mode: 0644]
recipes/dvsdk/files/dvsdk-rules/Makefile
recipes/dvsdk/files/gstreamer-ti-tracker-824.patch [new file with mode: 0644]
recipes/dvsdk/gstreamer-ti/codec_combo_directory_fix.patch
recipes/dvsdk/gstreamer-ti_svn.bb
recipes/dvsdk/readme.txt [deleted file]
recipes/dvsdk/ti-cgt6x-native_6.0.21.bb
recipes/dvsdk/ti-cgt6x-native_6.1.9.bb [new file with mode: 0644]
recipes/dvsdk/ti-cgt6x-sdk_6.0.21.bb [deleted file]
recipes/dvsdk/ti-cmem-module_2.23.1.bb
recipes/dvsdk/ti-codec-combo-dm355-sdk_1.13.bb [deleted file]
recipes/dvsdk/ti-codec-combo-dm355_1.13.bb
recipes/dvsdk/ti-codec-combo-dm6446-sdk_2.05.bb [deleted file]
recipes/dvsdk/ti-codec-combo-dm6446.inc [new file with mode: 0644]
recipes/dvsdk/ti-codec-combo-dm6446_2.05.bb
recipes/dvsdk/ti-codec-combo-omap3530-sdk_3.16.1.bb [deleted file]
recipes/dvsdk/ti-codec-combo-omap3530_3.16.1.bb
recipes/dvsdk/ti-codec-combo-omapl137_1.0.bb [new file with mode: 0644]
recipes/dvsdk/ti-codec-combos_3.16.bb
recipes/dvsdk/ti-codec-engine-sdk_2.23.1.bb [deleted file]
recipes/dvsdk/ti-codec-engine_2.23.1.bb
recipes/dvsdk/ti-codec-engine_2.24.01.bb [new file with mode: 0644]
recipes/dvsdk/ti-cs1-omap3530.inc [new file with mode: 0644]
recipes/dvsdk/ti-cs1-omap3530_1.0.1.bb [new file with mode: 0644]
recipes/dvsdk/ti-dm355mm-module_1.13.bb
recipes/dvsdk/ti-dmai-sdk_svn.bb [deleted file]
recipes/dvsdk/ti-dmai.inc
recipes/dvsdk/ti-dmai_svn.bb
recipes/dvsdk/ti-dspbios-native_5.33.02.bb
recipes/dvsdk/ti-dspbios-native_5.33.04.bb [new file with mode: 0644]
recipes/dvsdk/ti-dspbios-sdk_5.33.02.bb [deleted file]
recipes/dvsdk/ti-dsplink-module_1.61.3.bb
recipes/dvsdk/ti-lpm-module_2.23.1.bb
recipes/dvsdk/ti-paths.inc
recipes/dvsdk/ti-rules-make-sdk.bb [deleted file]
recipes/dvsdk/ti-sdma-module_2.23.1.bb
recipes/dvsdk/ti-xdctools-native_3.10.03.bb
recipes/dvsdk/ti-xdctools-native_3.15.01.59.bb [new file with mode: 0644]
recipes/dvsdk/ti-xdctools-sdk_3.10.03.bb [deleted file]

index 46ac388..4fd52bb 100644 (file)
@@ -2730,6 +2730,10 @@ sha256=18f72b922a9a346f6c43b20fd86eba76cfd27a8d118ea32fa879050ddebe0267
 md5=64f61b08d091625c0912cb9de33242af
 sha256=506e07715028811b8d945c85c54ae07bc33bdd8afff1611cbb30d154ba86d04e
 
+[http://install.source.dir.com/bios_setuplinux_5_33_04.bin]
+md5=fcffe1618f20024fd6580f47cdc0059b
+sha256=2c1e7feec569a19d3093b136da6aa03574f94052810fe7a78cc81eb37adda24b
+
 [ftp://ftp.gnu.org/gnu/bison/bison-2.0.tar.gz]
 md5=c17f964fd5504b88b07a183420de25e3
 sha256=31b816846903d319a6f6cd1c9aada5ff83914206cb7df69c235ae909785109a1
@@ -4282,6 +4286,10 @@ sha256=8b718c344cf19417447cbc16867d2e04434654c13b330598b96720ead146b961
 md5=0aa2f94c39123f1a0352983e5366179c
 sha256=4bab529afa00cafde3bc5df2769578c88438f80c5152d4257cd0e86986f95bc4
 
+[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/DVSDK_3_00/latest//exports/cs1omap3530_setuplinux_1_00_01.bin]
+md5=779415872c771b580e4c6d10346b3a79
+sha256=0903c37aaa9ced2c12a9e7d4a418b7d57d5a92a0f1451afd29f70bd0da240bc8
+
 [http://downloads.sourceforge.net/cscope/cscope-15.5.tar.gz]
 md5=beb6032a301bb11524aec74bfb5e4840
 sha256=be49cda0a9d33add89cabe0dfcef436a2863a7b0b833767875e0b7a6e8b4c4d1
@@ -4978,6 +4986,10 @@ sha256=39f80c1810be22c5ea7f6a44bbb449c3e29902895dcff9da6a8440891a67b8b4
 md5=f6221188bea76b7aaf0c45e9bcf26329
 sha256=f1a6dea51be9798903a0543fb50f463b0594b1f11b897bc50e40825fb7527c61
 
+[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/S1SDKLNX/DVSDK_2_00/exports/dm6446_codecs_setuplinux_2_00_00_22.bin]
+md5=2ce99015bb1ed1df0491403c5e8d99fb
+sha256=6467ea4854abbff3cbc224df1f163d01c7fb387f15483129a40a1f68e6742b62
+
 [http://dmalloc.com/releases/dmalloc-5.5.2.tgz]
 md5=f92e5606c23a8092f3d5694e8d1c932e
 sha256=d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a
@@ -5214,6 +5226,10 @@ sha256=15dd793e32fc9aba1266c2ccb8e98856c61be2e9de214285aa09152a47da1836
 md5=2b53c067c683266379dddbb38e65cb45
 sha256=b1a0508444241c61585321eaadc32f476ef441f267636fbd0fb2f0c7ebf0fcbb
 
+[http://install.source.dir.com/dsplink_1_61_03.tar.gz]
+md5=9df12389c8b955b5f8cfefe6df20b1d6
+sha256=1037b9cb872590356d055dbf8006e25d68370721e0e5b4518529495db6de70d9
+
 [http://home.comcast.net/~SCSIguy/SCSI_FAQ/RMiller_Tools/ftp/dt/dt-source.tar.gz]
 md5=5776233a2d301a50b314306538257a45
 sha256=2f27fda643093e07161d128a9cc23cf30c0387f87cd911b904d84217f60a9a2a
@@ -21978,6 +21994,10 @@ sha256=e8890518a8818e72d44daa1448246df8a6b5958215835f4c72abc833077d1f68
 md5=86a847f3128a43a9cf23b7029a656f50
 sha256=0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732
 
+[http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2]
+md5=ceef10579a75c92483171f3bd7f77df2
+sha256=3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7
+
 [http://osdn.dl.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2]
 md5=ceef10579a75c92483171f3bd7f77df2
 sha256=3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7
@@ -23762,6 +23782,10 @@ sha256=6b964fb220a46438adf6ec37082da66332a3ce74ca4913b863b17d9ab720681f
 md5=5bfeaacb628b56005a8865a177af01e4
 sha256=fcfa98e2c8ff18e8e6d5b2ff5e94f20b719150fe7bb4a130cfa360e02df2156a
 
+[http://install.source.dir.com/ti_cgt_c6000_6.1.9_setup_linux_x86.bin]
+md5=8354845032c0ce8e3da3f250505d0e21
+sha256=da26d02c1b98b95343f19ea273b3536beddd94feb2a773a6cb66efebfdff35c0
+
 [http://www.openzaurus.org/download/3.5.4/sources/tickypip-0.1.2.tar.gz]
 md5=5a085296b1147fe970a256a9b2d0f91f
 sha256=f3b5722c145ebeee3523b4941afdaf75d03a56f1922a9d3662dc1715aa24ca34
@@ -25634,6 +25658,10 @@ sha256=4511dc4df6ebb320a4a516b3b712c86f6924e5ee9832618f58ebba06c64712ea
 md5=8f0f8af016b97fb612ec11afaaf5a9e7
 sha256=d398bfb7a5d9657b802db835c28db892ec8fe54cf332420edef0b3ba1c231fcb
 
+[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/xdctools_3_15//exports/xdctools_setuplinux_3_15_01_59.bin]
+md5=c7cd094cdc49459018b6f0e1eb95af30
+sha256=0d5fbc8cfdaa968090ad11b0b84cfb122e2a1c54c4d261fd722b27c6d6972c23
+
 [http://gpe.linuxtogo.org/download/source/xdemineur-2.1.1.tar.bz2]
 md5=b3884eaec59a63691f66bc29ce57a56d
 sha256=75378ad3eacbe32c625de3b4af3e1f6fc9772ab45c1cd1393483d95ac4da3b22
diff --git a/recipes/dvsdk/README b/recipes/dvsdk/README
new file mode 100644 (file)
index 0000000..fa1b481
--- /dev/null
@@ -0,0 +1,30 @@
+Depending on platform you need to download one or more components from the external URL and put in downloads directory.
+
+DM355
+-----
+ - Code Engine 2.24
+
+OMAP3530/DM6446
+------
+  - Code Engine 2.24
+  - DSP/BIOS Link for Linux 1.61.03  
+  - DSP/BIOS 5.33.04
+  - C6000 Code Generation Tools v6.1.9 Linux
+
+URL's:
+------
+* CE 2.24 (codec_engine_2_24.tar.gz)
+       http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/CE/ce_2_24/index.html
+
+* DSP/BIOS 5.33.04 (bios_setuplinux_5_33_04.bin) 
+       http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/bios/bios_5_33/bios_5_33_04/index_external.html
+
+* DSP/BIOS Link for Linux 1.61.03 (dsplink_1_61_03.tar.gz)
+       http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/link/link_1_60/index.html
+
+* C6000 Code Generation Tools v6.1.9 Linux (ti_cgt_c6000_6.1.9_setup_linux_x86.bin)
+       https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm
+
+* Generic download URI
+       http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/
+
diff --git a/recipes/dvsdk/files/cmem-remove-show-pte-function.patch b/recipes/dvsdk/files/cmem-remove-show-pte-function.patch
new file mode 100644 (file)
index 0000000..2d0fe67
--- /dev/null
@@ -0,0 +1,56 @@
+--- codec_engine_2_23_01/cetools/packages/ti/sdo/linuxutils/cmem/src/module/cmemk.c    2009-04-20 14:43:31.000000000 -0400
++++ codec_engine_2_23_01.new/cetools/packages/ti/sdo/linuxutils/cmem/src/module/cmemk.c        2009-07-28 10:48:38.000000000 -0400
+@@ -1018,53 +1018,6 @@
+ }
+-/*
+- * This is useful to dump out the page tables associated with
+- * 'addr' in mm 'mm'.
+- */
+-void show_pte(struct mm_struct *mm, unsigned long addr)
+-{
+-        pgd_t *pgd;
+-
+-        if (!mm)
+-                mm = &init_mm;
+-
+-        printk(KERN_ALERT "pgd = %p\n", mm->pgd);
+-        pgd = pgd_offset(mm, addr);
+-        printk(KERN_ALERT "[%08lx] *pgd=%08lx", addr, pgd_val(*pgd));
+-
+-        do {
+-                pmd_t *pmd;
+-                pte_t *pte;
+-
+-                if (pgd_none(*pgd))
+-                        break;
+-
+-                if (pgd_bad(*pgd)) {
+-                        printk("(bad)");
+-                        break;
+-                }
+-
+-                pmd = pmd_offset(pgd, addr);
+-
+-                if (pmd_none(*pmd))
+-                        break;
+-
+-                if (pmd_bad(*pmd)) {
+-                        printk("(bad)");
+-                        break;
+-                }
+-
+-                /* We must not map this if we have highmem enabled */
+-                pte = pte_offset_map(pmd, addr);
+-                printk(", *pte=%08lx", pte_val(*pte));
+-                printk(", *ppte=%08lx", pte_val(pte[-PTRS_PER_PTE]));
+-                pte_unmap(pte);
+-        } while(0);
+-
+-        printk("\n");
+-}
+-
+ static int set_noncached(struct vm_area_struct *vma)
+ {
+     vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
index edb74e0..bc1eabf 100644 (file)
@@ -6,20 +6,20 @@ REPOSITORIES:=$(addsuffix /packages, $(COMPONENTS))
 
 CHECKLIST:=$(REPOSITORIES) $(CODEGEN_INSTALL_DIR)/bin/cl6x $(MVTOOL_PREFIX)gcc $(LINUXKERNEL_INSTALL_DIR)/Documentation $(DEMO_INSTALL_DIR)/$(PLATFORM) $(PSP_INSTALL_DIR)/docs
 
-.PHONY:        all clean everything clobber help cmem cmem_clean dmai dmai_clean demos demos_clean examples examples_clean dvtb dvtb_clean dm355mm dm355mm_clean dsplink dsplink_arm dsplink_dsp dsplink_samples dsplink_clean codecs codecs_clean linux linux_clean psp_examples psp_clean info check install
+.PHONY:        all clean everything clobber help cmem cmem_clean dmai dmai_clean dm355mm dm355mm_clean dsplink dsplink_arm dsplink_dsp dsplink_samples dsplink_clean codecs codecs_clean linux linux_clean info check install
 
 #==============================================================================
 # Set up platform dependent variables.
 #==============================================================================
 ifeq ($(PLATFORM),dm6446)
-LINUXKERNEL_CONFIG=davinci_dm644x_defconfig
+LINUXKERNEL_CONFIG=davinci_all_defconfig
 LINUXSAMPLES_PLATFORM=dm644x
 DSPLINK_CONFIG=--platform=DAVINCI --nodsp=1 --dspcfg_0=DM6446GEMSHMEM --dspos_0=DSPBIOS5XX --gppos=MVL5G --comps=ponslrm
 DSPLINK_MODULE=$(LINK_INSTALL_DIR)/packages/dsplink/gpp/export/BIN/Linux/DAVINCI/RELEASE/dsplinkk.ko
 DMAI_PLATFORM=dm6446_al
 else
 ifeq ($(PLATFORM),dm6467)
-LINUXKERNEL_CONFIG=davinci_dm6467_defconfig
+LINUXKERNEL_CONFIG=davinci_all_defconfig
 LINUXSAMPLES_PLATFORM=dm646x
 DSPLINK_CONFIG=--platform=DAVINCIHD --nodsp=1 --dspcfg_0=DM6467GEMSHMEM --dspos_0=DSPBIOS5XX --gppos=MVL5G --comps=ponslrm
 DSPLINK_MODULE=$(LINK_INSTALL_DIR)/packages/dsplink/gpp/export/BIN/Linux/DAVINCIHD/RELEASE/dsplinkk.ko
@@ -38,22 +38,22 @@ endif
 #==============================================================================
 # The default build target.
 #==============================================================================
-all:   check cmem dm355mm dmai demos examples dvtb
+all:   check cmem dm355mm dmai
 
 #==============================================================================
 # Clean up the targets built by 'make all'.
 #==============================================================================
-clean: cmem_clean dm355mm_clean dmai_clean demos_clean examples_clean dvtb_clean
+clean: cmem_clean dm355mm_clean dmai_clean
 
 #==============================================================================
 # Build everything rebuildable.
 #==============================================================================
-everything: check codecs linux dsplink psp_examples all
+everything: check codecs linux dsplink all
 
 #==============================================================================
 # Clean up all targets.
 #==============================================================================
-clobber:       clean dsplink_clean linux_clean codecs_clean psp_clean
+clobber:       clean dsplink_clean linux_clean codecs_clean
 
 #==============================================================================
 # A help message target.
@@ -63,48 +63,36 @@ help:
        @echo "Available build targets are:"
        @echo
        @echo "    check                   : Make sure Rules.make is set up properly"
-       @echo "    info                    : List versions of DVSDK components"
+       @echo "    info            : List versions of DVSDK components"
        @echo
        @echo "    all                     : Build the components below"
        @echo "    clean                   : Remove files generated by the 'all' target"
        @echo
-       @echo "    cmem                    : Build the CMEM kernel module for $(PLATFORM)"
-       @echo "    cmem_clean      : Remove generated cmem files."
+       @echo "    cmem            : Build the CMEM kernel module for $(PLATFORM)"
+       @echo "    cmem_clean              : Remove generated cmem files."
        @echo
-       @echo "    dmai                    : Build DMAI for $(PLATFORM)_al"
-       @echo "    dmai_clean      : Remove generated DMAI files."
-       @echo
-       @echo "    demos                   : Build the DVSDK demos for $(PLATFORM)"
-       @echo "    demos_clean     : Remove generated DVSDK demo files."
-       @echo
-       @echo "    examples                : Build examples for $(PLATFORM)"
-       @echo "    examples_clean  : Build examples for $(PLATFORM)"
-       @echo
-       @echo "    dvtb                    : Build DVTB for $(PLATFORM)"
-       @echo "    dvtb_clean      : Remove generated DVTB files"
+       @echo "    dmai            : Build DMAI for $(PLATFORM)_al"
+       @echo "    dmai_clean              : Remove generated DMAI files."
        @echo
        @echo "    dm355mm                 : Build the dm355mm kernel module"
-       @echo "    dm355mm_clean   : Remove generated dm355mm files"
+       @echo "    dm355mm_clean           : Remove generated dm355mm files"
        @echo
        @echo "The following targets have to be explicitly built and cleaned:"
        @echo
-       @echo "    everything      : Rebuild everything including below targets"
+       @echo "    everything              : Rebuild everything including below targets"
        @echo "    clobber                 : Remove all generated files"
        @echo
        @echo "    dsplink                 : Configure and build DSP Link for $(PLATFORM) ARM and DSP"
-       @echo "    dsplink_arm     : Configure and build DSP Link for $(PLATFORM) ARM"
-       @echo "    dsplink_dsp     : Configure and build DSP Link for $(PLATFORM) DSP"
-       @echo "    dsplink_samples : Build DSP Link ARM and DSP sample applications for $(PLATFORM)"
-       @echo "    dsplink_clean   : Remove generated DSP Link files"
+       @echo "    dsplink_arm             : Configure and build DSP Link for $(PLATFORM) ARM"
+       @echo "    dsplink_dsp             : Configure and build DSP Link for $(PLATFORM) DSP"
+       @echo "    dsplink_samples         : Build DSP Link ARM and DSP sample applications "
+       @echo "    dsplink_clean           : Remove generated DSP Link files"
        @echo
        @echo "    codecs                  : Build codec servers for $(PLATFORM)"
-       @echo "    codecs_clean    : Remove generated codec server files"
+       @echo "    codecs_clean    : Remove generated codec server files"
        @echo
        @echo "    linux                   : Build Linux kernel uImage for $(PLATFORM)"
-       @echo "    linux_clean     : Remove generated Linux kernel files"
-       @echo
-       @echo "    psp_examples    : Build Linux examples for $(PLATFORM)"
-       @echo "    psp_clean       : Build Linux examples for $(PLATFORM)"
+       @echo "    linux_clean             : Remove generated Linux kernel files"
        @echo
        @echo "    install                 : Install binaries to $(EXEC_DIR)"
        @echo
@@ -121,28 +109,6 @@ info:      check
 check:
        @CHECKLIST="$(CHECKLIST)" $(DVSDK_INSTALL_DIR)/bin/check.sh
 
-#==============================================================================
-# Build the dvsdk demos for the configured platform. Also, an explicit cleanup
-# target is defined.
-#==============================================================================
-demos:
-       $(MAKE) -C $(DEMO_INSTALL_DIR)/$(PLATFORM)
-
-demos_clean:
-       $(MAKE) -C $(DEMO_INSTALL_DIR)/$(PLATFORM) clean
-
-#==============================================================================
-# Build the Digital Video Test Bench for the configured platform. Also, an
-# explicit cleanup target is defined.
-#==============================================================================
-dvtb:
-       $(MAKE) -C $(DVTB_INSTALL_DIR) $(PLATFORM)
-       @echo
-       @echo "dvtb can be found under $(DVTB_INSTALL_DIR)/packages/ti/sdo/dvtb/$(PLATFORM)/bin"
-
-dvtb_clean:
-       $(MAKE) -C $(DVTB_INSTALL_DIR) clean
-
 #==============================================================================
 # Build the Linux kernel. Also, an explicit cleanup target is defined.
 #==============================================================================
@@ -155,17 +121,6 @@ linux:
 linux_clean:
        $(MAKE) -C $(LINUXKERNEL_INSTALL_DIR) CROSS_COMPILE=$(MVTOOL_PREFIX) clean
 
-#==============================================================================
-# Build the PSP Linux examples. Also, an explicit cleanup target is defined.
-#==============================================================================
-psp_examples:
-       $(MAKE) -C $(PSP_INSTALL_DIR)/examples PLATFORM=$(LINUXSAMPLES_PLATFORM) LINUXKERNEL_INSTALL_DIR=$(LINUXKERNEL_INSTALL_DIR) CROSS_COMPILE=$(MVTOOL_PREFIX)
-       @echo
-       @echo "PSP examples can be found under $(PSP_INSTALL_DIR)/examples/$(LINUXSAMPLES_PLATFORM)"
-
-psp_clean:
-       $(MAKE) -C $(PSP_INSTALL_DIR)/examples PLATFORM=$(LINUXSAMPLES_PLATFORM) LINUXKERNEL_INSTALL_DIR=$(LINUXKERNEL_INSTALL_DIR) clean
-
 #==============================================================================
 # Build the CMEM kernel module for the configured platform, and make sure the
 # kernel_binaries directory is kept in sync. Also, an explicit cleanup target
@@ -215,16 +170,6 @@ ifeq ($(PLATFORM),dm355)
        $(MAKE) -C $(CODEC_INSTALL_DIR)/dm355mm/module KERNEL_DIR=$(LINUXKERNEL_INSTALL_DIR) clean
 endif
 
-#==============================================================================
-# Build the DVSDK examples for the configured platform. Also, an explicit
-# cleanup target is defined.
-#==============================================================================
-examples:
-       $(MAKE) -C examples/$(PLATFORM)
-
-examples_clean:
-       $(MAKE) -C examples/$(PLATFORM) clean
-
 #==============================================================================
 # Build the Davinci Multimedia Application Interface for the configured
 # platform. Also, an explicit cleanup target is defined.
@@ -232,18 +177,18 @@ examples_clean:
 dmai:
        @$(MAKE) -C $(DMAI_INSTALL_DIR) PLATFORM=${DMAI_PLATFORM} \
                        CE_INSTALL_DIR_${DMAI_PLATFORM}=$(CE_INSTALL_DIR) \
-                               CODEC_INSTALL_DIR_${DMAI_PLATFORM}=$(CODEC_INSTALL_DIR) \
-                               LINK_INSTALL_DIR_${DMAI_PLATFORM}=$(LINK_INSTALL_DIR) \
-                               CMEM_INSTALL_DIR_${DMAI_PLATFORM}=$(CMEM_INSTALL_DIR) \
-                               FC_INSTALL_DIR_${DMAI_PLATFORM}=$(FC_INSTALL_DIR) \
-                               LPM_INSTALL_DIR_${DMAI_PLATFORM}=$(LPM_INSTALL_DIR) \
-                               XDAIS_INSTALL_DIR_${DMAI_PLATFORM}=$(XDAIS_INSTALL_DIR) \
-                               BIOS_INSTALL_DIR_${DMAI_PLATFORM}=$(BIOS_INSTALL_DIR) \
-                               LINUXLIBS_INSTALL_DIR_${DMAI_PLATFORM}=$(LINUXLIBS_INSTALL_DIR)\
-                               LINUXKERNEL_INSTALL_DIR_${DMAI_PLATFORM}=$(LINUXKERNEL_INSTALL_DIR) \
-                               CROSS_COMPILE_${DMAI_PLATFORM}=$(CSTOOL_PREFIX) \
-                               XDC_INSTALL_DIR_${DMAI_PLATFORM}=$(XDC_INSTALL_DIR) \
-                               EXEC_DIR_${DMAI_PLATFORM}=$(EXEC_DIR) all
+                       CODEC_INSTALL_DIR_${DMAI_PLATFORM}=$(CODEC_INSTALL_DIR) \
+                       LINK_INSTALL_DIR_${DMAI_PLATFORM}=$(LINK_INSTALL_DIR) \
+                       CMEM_INSTALL_DIR_${DMAI_PLATFORM}=$(CMEM_INSTALL_DIR) \
+                       FC_INSTALL_DIR_${DMAI_PLATFORM}=$(FC_INSTALL_DIR) \
+                       LPM_INSTALL_DIR_${DMAI_PLATFORM}=$(LPM_INSTALL_DIR) \
+                       XDAIS_INSTALL_DIR_${DMAI_PLATFORM}=$(XDAIS_INSTALL_DIR) \
+                       BIOS_INSTALL_DIR_${DMAI_PLATFORM}=$(BIOS_INSTALL_DIR) \
+                       LINUXLIBS_INSTALL_DIR_${DMAI_PLATFORM}=$(LINUXLIBS_INSTALL_DIR)\
+                       LINUXKERNEL_INSTALL_DIR_${DMAI_PLATFORM}=$(LINUXKERNEL_INSTALL_DIR) \
+                       CROSS_COMPILE_${DMAI_PLATFORM}=$(CSTOOL_PREFIX) \
+                       XDC_INSTALL_DIR_${DMAI_PLATFORM}=$(XDC_INSTALL_DIR) \
+                       EXEC_DIR_${DMAI_PLATFORM}=$(EXEC_DIR) all
 
        @echo
        @echo "DMAI applications can be found under $(DMAI_INSTALL_DIR)/packages/ti/sdo/dmai/apps"
diff --git a/recipes/dvsdk/files/gstreamer-ti-tracker-824.patch b/recipes/dvsdk/files/gstreamer-ti-tracker-824.patch
new file mode 100644 (file)
index 0000000..852e60a
--- /dev/null
@@ -0,0 +1,125 @@
+diff -uNr ticodecplugin/src/gstticodecplugin_omap3530.cfg ticodecplugin.new/src/gstticodecplugin_omap3530.cfg
+--- ticodecplugin/src/gstticodecplugin_omap3530.cfg    2009-06-10 17:29:59.000000000 -0500
++++ ticodecplugin.new/src/gstticodecplugin_omap3530.cfg        2009-08-07 16:17:24.000000000 -0500
+@@ -12,8 +12,6 @@
+  *
+  */
+-prog.build.platform = "ti.platforms.evm3530";
+-
+ /* Load the Codec Engine 'Operating System Abstraction Layer' */
+ var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global');
+@@ -27,21 +25,15 @@
+ /*
+  *  ======== Engine Configuration ========
+  */
+-var Engine    = xdc.useModule('ti.sdo.ce.Engine');
+-var encEngine = Engine.createFromServer(
+-    "encode",
+-    "./encodeCombo.x64P",
+-    "ti.sdo.servers.encode"
+-    );
+-var decEngine = Engine.createFromServer(
+-    "decode",
+-    "./decodeCombo.x64P",
+-    "ti.sdo.servers.decode"
++var Engine = xdc.useModule('ti.sdo.ce.Engine');
++var demoEngine = Engine.createFromServer(
++    "codecServer",
++    "./bin/cs.x64P",
++    "ti.sdo.server.cs"
+     );
+ /* Load support for the DMAI module */
+ var DMAI = xdc.loadPackage('ti.sdo.dmai');
+-/* Load support for user space DMA */
+-var SCPY = xdc.useModule("ti.sdo.fc.scpy.SCPY");
+-var SDMA = xdc.useModule("ti.sdo.linuxutils.sdma.SDMA");
++var SCPY = xdc.useModule('ti.sdo.fc.scpy.SCPY');
++var SDMA = xdc.useModule('ti.sdo.linuxutils.sdma.SDMA');
+diff -uNr ticodecplugin/src/gstticodecs_omap3530.c ticodecplugin.new/src/gstticodecs_omap3530.c
+--- ticodecplugin/src/gstticodecs_omap3530.c   2009-06-10 17:29:59.000000000 -0500
++++ ticodecplugin.new/src/gstticodecs_omap3530.c       2009-08-07 16:17:24.000000000 -0500
+@@ -22,8 +22,7 @@
+ #include "gstticodecs.h"
+ /* Declaration of the production engine and decoders shipped with the DVSDK */
+-static Char decodeEngine[] = "decode";
+-static Char encodeEngine[] = "encode";
++static Char codecServer[] = "codecServer";
+ /* NULL terminated list of speech decoders in the engine to use in the demo */
+ GstTICodec gst_ticodec_codecs[] = {
+@@ -32,59 +31,55 @@
+     {
+         "AAC Audio Decoder",     /* String name of codec used by plugin      */
+         "aachedec",              /* String name of codec used by CE          */
+-        decodeEngine             /* Engine that contains this codec          */
++        codecServer              /* Engine that contains this codec          */
+     }, {
+         "MPEG1L2 Audio Decoder", /* String name of codec used by plugin      */
+         "mp3dec",                /* String name of codec used by CE          */
+-        decodeEngine             /* Engine that contains this codec          */
++        codecServer              /* Engine that contains this codec          */
+     }, {
+         "MPEG1L3 Audio Decoder", /* String name of codec used by plugin      */
+         "mp3dec",                /* String name of codec used by CE          */
+-        decodeEngine             /* Engine that contains this codec          */
+-    }, {
+-        "WMA Audio Decoder",     /* String name of codec used by plugin      */
+-        "wmadec",                /* String name of codec used by CE          */
+-        decodeEngine             /* Engine that contains this codec          */
++        codecServer              /* Engine that contains this codec          */
+     },
+-    
++
+     /* Video Decoders */
+     {
+         "H.264 Video Decoder",   /* String name of codec used by plugin      */
+         "h264dec",               /* String name of codec used by CE          */
+-        decodeEngine             /* Engine that contains this codec          */
++        codecServer              /* Engine that contains this codec          */
+     }, {
+         "MPEG4 Video Decoder",   /* String name of codec used by plugin      */
+         "mpeg4dec",              /* String name of codec used by CE          */
+-        decodeEngine             /* Engine that contains this codec          */
++        codecServer              /* Engine that contains this codec          */
+     }, {
+         "MPEG2 Video Decoder",   /* String name of codec used by plugin      */
+         "mpeg2dec",              /* String name of codec used by CE          */
+-        decodeEngine             /* Engine that contains this codec          */
++        codecServer              /* Engine that contains this codec          */
+     },
+     /* Image Decoders */
+     {
+         "JPEG Image Decoder",    /* String name of codec used by plugin      */
+         "jpegdec",               /* String name of codec used by CE          */
+-        decodeEngine             /* Engine that contains this codec          */
++        codecServer              /* Engine that contains this codec          */
+     },
+     /* Video Encoders */
+     {
+         "H.264 Video Encoder",   /* String name of codec used by plugin      */
+         "h264enc",               /* String name of codec used by CE          */
+-        encodeEngine             /* Engine that contains this codec          */
++        codecServer              /* Engine that contains this codec          */
+     }, {
+         "MPEG4 Video Encoder",   /* String name of codec used by plugin      */
+         "mpeg4enc",              /* String name of codec used by CE          */
+-        encodeEngine             /* Engine that contains this codec          */
++        codecServer              /* Engine that contains this codec          */
+     },
+     /* Image Encoders */
+     {
+         "JPEG Image Encoder",    /* String name of codec used by plugin      */
+         "jpegenc",               /* String name of codec used by CE          */
+-        encodeEngine             /* Engine that contains this codec          */
++        codecServer              /* Engine that contains this codec          */
+     },
+     { NULL }
index 72a0ab3..7c03641 100644 (file)
@@ -21,8 +21,8 @@ diff -Naur ticodecplugin.orig/src/gstticodecplugin_dm6446.cfg ticodecplugin/src/
      "./encodeCombo.x64P",
      "ti.sdo.servers.encode"
      );
-+encodeEngine.server = "/usr/share/ti-codec-combos/encodeCombo.x64P";
-+decodeEngine.server = "/usr/share/ti-codec-combos/decodeCombo.x64P";
++codecServer.server = "/usr/share/ti-codec-combos/cs.x64P";
++
  
  /* Load support for the 'Davinci Multimedia Application Interface' modules */
  var DMAI = xdc.loadPackage('ti.sdo.dmai');
@@ -33,8 +33,8 @@ diff -Naur ticodecplugin.orig/src/gstticodecplugin_dm6467.cfg ticodecplugin/src/
      "./encodeCombo.x64P",
      "ti.sdo.servers.encode"
      );
-+encodeEngine.server = "/usr/share/ti-codec-combos/encodeCombo.x64P";
-+decodeEngine.server = "/usr/share/ti-codec-combos/decodeCombo.x64P";
++codecServer.server = "/usr/share/ti-codec-combos/cs.x64P";
++
  
  /* Load support for the 'Davinci Multimedia Application Interface' modules */
  var DMAI = xdc.loadPackage('ti.sdo.dmai');
@@ -45,8 +45,8 @@ diff -Naur ticodecplugin.orig/src/gstticodecplugin_omap3530.cfg ticodecplugin/sr
      "./decodeCombo.x64P",
      "ti.sdo.servers.decode"
      );
-+encEngine.server = "/usr/share/ti-codec-combos/encodeCombo.x64P";
-+decEngine.server = "/usr/share/ti-codec-combos/decodeCombo.x64P";
++codecServer.server = "/usr/share/ti-codec-combos/cs.x64P";
++
  
  /* Load support for the DMAI module */
  var DMAI = xdc.loadPackage('ti.sdo.dmai');
index e1c4c1e..7d13c71 100644 (file)
@@ -1,47 +1,27 @@
 DESCRIPTION = "Gstreamer plugin for TI Davinci and OMAP processors"
 
+require ti-paths.inc
+
 inherit autotools
 
 DEPENDS = "ti-dmai gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly"
 
 # Fetch source from svn repo
-SRCREV = "308"
+SRCREV = "285"
 SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https;user=anonymous;pswd='' \
-file://codec_combo_directory_fix.patch;patch=1 \
-       "
+           file://gstreamer-ti-tracker-824.patch;patch=1 \
+"
 
 # Again, no '.' in PWD allowed :(
-PR = "r24"
+PR = "r28"
 PV = "svnr${SRCREV}"
 
 S = "${WORKDIR}/gstreamer_ti/ti_build/ticodecplugin"
 
-installdir = "${datadir}/ti"
-
-META_SDK_PATH ?= "${CROSS_DIR}"
-
-DMAI_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dmai"
-CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine"
-FC_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools"
-CODEC_INSTALL_DIR_dm355-evm="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-dm355"
-CODEC_INSTALL_DIR_dm6446-evm="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-dm6446"
-CODEC_INSTALL_DIR_omap3evm="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-omap3530"
-CODEC_INSTALL_DIR_beagleboard="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-omap3530"
-XDC_INSTALL_DIR="${STAGING_DIR}/${BUILD_SYS}/ti-xdctools-native"
-CODEGEN_INSTALL_DIR="${STAGING_DIR}/${BUILD_SYS}/ti-cgt6x-native"
-
-export DMAI_INSTALL_DIR
-export CE_INSTALL_DIR
-export FC_INSTALL_DIR
-export CODEC_INSTALL_DIR
-export XDC_INSTALL_DIR
-export CODEGEN_INSTALL_DIR
-
 XDC_TARGET                             = gnu.targets.arm.GCArmv5T
 XDC_PLATFORM_dm355-evm                 = ti.platforms.evmDM355
 XDC_PLATFORM_dm6446-evm        = ti.platforms.evmDM6446
-XDC_PLATFORM_omap3evm                  = ti.platforms.evm3530
-XDC_PLATFORM_beagleboard       = ti.platforms.evm3530
+XDC_PLATFORM_da830-omapl137-evm        = ti.platforms.omapl137
 PLATFORM_XDC                           = ${XDC_PLATFORM}
 
 export XDC_TARGET
@@ -50,17 +30,7 @@ export PLATFORM_XDC
 
 PLATFORM_dm355-evm                     = "dm355"
 PLATFORM_dm6446-evm            = "dm6446"
-PLATFORM_omap3evm                      = "omap3530"
-PLATFORM_beagleboard           = "omap3530"
-
-export PLATFORM
-
-CROSS_COMPILE=${META_SDK_PATH}/bin/${TARGET_PREFIX}
-CSTOOL_DIR=${META_SDK_PATH}
-MVTOOL_DIR=${META_SDK_PATH}
-export CROSS_COMPILE
-export CSTOOL_DIR
-export MVTOOL_DIR
+PLATFORM_da830-omapl137-evm = "ol137"
 
 CPPFLAGS_append                        = " -DPlatform_${PLATFORM}"
 
diff --git a/recipes/dvsdk/readme.txt b/recipes/dvsdk/readme.txt
deleted file mode 100644 (file)
index daf7bf6..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-
-The software needed can be downloaded from:
-* http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/
-* https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm
-
index d980f46..e030b81 100644 (file)
@@ -1,6 +1,8 @@
 require ti-cgt6x.inc
 inherit native
 
+# download ti_cgt_c6000_6.0.21_setup_linux_x86.bin from https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm and copy in Arago (or OE) download directory.
+
 SRC_URI        = "http://install.source.dir.com/ti_cgt_c6000_6.0.21_setup_linux_x86.bin"
 
 BINFILE="ti_cgt_c6000_6.0.21_setup_linux_x86.bin"
@@ -16,5 +18,5 @@ do_stage() {
     cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/${PN}/ 
 }
 
-AUTOTOOLS_NATIVE_STAGE_INSTALL="1"
+AUTOTOOLS_NATIVE_STAGE_INSTALL = "1"
 
diff --git a/recipes/dvsdk/ti-cgt6x-native_6.1.9.bb b/recipes/dvsdk/ti-cgt6x-native_6.1.9.bb
new file mode 100644 (file)
index 0000000..55c1b6c
--- /dev/null
@@ -0,0 +1,22 @@
+require ti-cgt6x.inc
+inherit native
+
+# download ti_cgt_c6000_6.1.9_setup_linux_x86.bin from https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm and copy in Arago (or OE) download directory.
+
+SRC_URI        = "http://install.source.dir.com/ti_cgt_c6000_6.1.9_setup_linux_x86.bin"
+
+BINFILE = "ti_cgt_c6000_6.1.9_setup_linux_x86.bin"
+
+S = "${WORKDIR}/cgt"
+
+# Yes, the xdc stuff still breaks with a '.' in PWD
+PV = "6190"
+PR = "r1"
+
+do_stage() {
+    install -d ${STAGING_DIR_NATIVE}/${PN}
+    cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/${PN}/ 
+}
+
+AUTOTOOLS_NATIVE_STAGE_INSTALL = "1"
+
diff --git a/recipes/dvsdk/ti-cgt6x-sdk_6.0.21.bb b/recipes/dvsdk/ti-cgt6x-sdk_6.0.21.bb
deleted file mode 100644 (file)
index f0ad126..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-require ti-cgt6x.inc
-inherit sdk
-
-SRC_URI        = "http://install.source.dir.com/ti_cgt_c6000_6.0.21_setup_linux_x86.bin"
-
-S = "${WORKDIR}/cgt"
-
-# Yes, the xdc stuff still breaks with a '.' in PWD
-PV = "6021"
-PR = "r3"
-
-do_install() {
-       install -d ${D}/${prefix}/dvsdk/cg6x_6_0_21
-    cp -pPrf ${S}/* ${D}/${prefix}/dvsdk/cg6x_6_0_21
-       
-       # Creates rules.make file
-       mkdir -p ${STAGING_DIR_HOST}/ti-sdk-rules
-       echo "# Where the TI C6x codegen tool is installed." >  ${STAGING_DIR_HOST}/ti-sdk-rules/cgt6x.Rules.make
-       echo "CODEGEN_INSTALL_DIR=${prefix}/dvsdk/cg6x_6_0_21" >> ${STAGING_DIR_HOST}/ti-sdk-rules/cgt6x.Rules.make
-  echo "" >>   ${STAGING_DIR_HOST}/ti-sdk-rules/cgt6x.Rules.make
-}
-
-INHIBIT_PACKAGE_STRIP = "1"
-FILES_${PN} = "${prefix}/dvsdk/cg6x_6_0_21"
-INSANE_SKIP_${PN} = True
-
index f02383d..0704993 100644 (file)
@@ -5,16 +5,17 @@ inherit module
 DEPENDS        = "virtual/kernel perl-native"
 RDEPENDS       = "update-modules"
 
-# Download codec_engine_2_23_01.tar.gz from 
-# https://www-a.ti.com/downloads/sds_support/targetcontent/CE/ce_2_23/index.html
+# Download codec_engine_2_23_01.tar.gz from https://www-a.ti.com/downloads/sds_support/targetcontent/CE/ce_2_23/index.html and copy in Arago (or OE) download directory.
 
-SRC_URI = "http://install.source.dir.com/codec_engine_2_23_01.tar.gz"
+SRC_URI = "http://install.source.dir.com/codec_engine_2_23_01.tar.gz \
+                       file://cmem-remove-show-pte-function.patch;patch=1 "
 
 # Set the source directory
 S = "${WORKDIR}/codec_engine_2_23_01"
 
 #This is a kernel module, don't set PR directly
 MACHINE_KERNEL_PR_append = "a"
+
 PV = "2231"
 
 do_compile() {
diff --git a/recipes/dvsdk/ti-codec-combo-dm355-sdk_1.13.bb b/recipes/dvsdk/ti-codec-combo-dm355-sdk_1.13.bb
deleted file mode 100644 (file)
index 05952d2..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "DM355 Codec Combo 1.13"
-
-inherit sdk
-require ti-codec-combo-dm355.inc
-
-SRC_URI        = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/codecs/dm355_codecs_setuplinux_1_13_000.bin\
-                  file://dm355mm_1_30.patch;patch=1 \
-                "
-
-S = "${WORKDIR}/dm355_codecs_1_13_000"
-BINFILE="dm355_codecs_setuplinux_1_13_000.bin"
-
-# Yes, the xdc stuff still breaks with a '.' in PWD
-PV = "113"
-PR = "r16"
-
-do_compile() {
-       echo "Do nothing"
-}
-
-do_install() {
-    install -d ${D}/${prefix}/dvsdk/dm355_codecs_1_13_000
-    cp -pPrf ${S}/* ${D}/${prefix}/dvsdk/dm355_codecs_1_13_000
-
-    # Creates rules.make file
-         mkdir -p ${STAGING_DIR_HOST}/ti-sdk-rules
-               echo "# Where the codec servers are installed." > ${STAGING_DIR_HOST}/ti-sdk-rules/codec.Rules.make
-    echo "CODEC_INSTALL_DIR=${prefix}/dvsdk/dm355_codecs_1_13_000" >> ${STAGING_DIR_HOST}/ti-sdk-rules/codec.Rules.make
-}
-
-INHIBIT_PACKAGE_STRIP = "1"
-INSANE_SKIP_${PN} = True
-FILES_${PN} = "${prefix}/dvsdk/dm355_codecs_1_13_000/*"
-
index cfc1c90..2db0720 100644 (file)
@@ -1,13 +1,13 @@
-DESCRIPTION = "DM355 Codec Combo 1.13"
-
+require ti-codec.inc
 require ti-codec-combo-dm355.inc
+
 SRC_URI        = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/codecs/dm355_codecs_setuplinux_1_13_000.bin \
                   file://mapdmaq \
                 "
 
+BINFILE = "dm355_codecs_setuplinux_1_13_000.bin"
+
 S = "${WORKDIR}/dm355_codecs_1_13_000"
-BINFILE="dm355_codecs_setuplinux_1_13_000.bin"
-installdir = "${datadir}/ti"
 
 # Yes, the xdc stuff still breaks with a '.' in PWD
 PV = "113"
@@ -23,13 +23,6 @@ do_install () {
      install -m 0755 ${WORKDIR}/mapdmaq ${D}/${installdir}/codec-combo
 }
 
-do_stage() {
-    install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}
-    cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/ 
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 INHIBIT_PACKAGE_STRIP = "1"
 INSANE_SKIP_${PN} = True
-FILES_${PN} = "${installdir}/codec-combo/mapdmaq"
 
diff --git a/recipes/dvsdk/ti-codec-combo-dm6446-sdk_2.05.bb b/recipes/dvsdk/ti-codec-combo-dm6446-sdk_2.05.bb
deleted file mode 100644 (file)
index f02d49a..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "DM6446 Codec Combo 2.05"
-inherit sdk
-
-# Should be replaced with real http URL, but for now create codec combo tar from DVSDK installation.
-SRC_URI        = "ftp://install.source.dir.com/dm6446_dvsdk_combos_2_05.tar.gz"
-
-S = "${WORKDIR}/dm6446_dvsdk_combos_2_05"
-
-# Yes, the xdc stuff still breaks with a '.' in PWD
-PV = "205"
-PR = "r10"
-
-# DM6446 combo has Makefile. We don't want to rebuild anything here.
-do_compile() {
-       echo "do nothing"
-}
-
-do_install() {
-    install -d ${D}/${prefix}/dvsdk/dm6446_dvsdk_combos_2_05
-    cp -pPrf ${S}/* ${D}/${prefix}/dvsdk/dm6446_dvsdk_combos_2_05
-
-    # Creates rules.make file
-         mkdir -p ${STAGING_DIR_HOST}/ti-sdk-rules
-         echo "# Where the codec servers are installed." > ${STAGING_DIR_HOST}/ti-sdk-rules/codec.Rules.make
-    echo "CODEC_INSTALL_DIR=${prefix}/dvsdk/dm6446_dvsdk_combos_2_05" >> ${STAGING_DIR_HOST}/ti-sdk-rules/codec.Rules.make
-}
-
-INHIBIT_PACKAGE_STRIP = "1"
-INSANE_SKIP_${PN} = True
-FILES_${PN} = "${prefix}/dvsdk/dm6446_dvsdk_combos_2_05/*"
-
diff --git a/recipes/dvsdk/ti-codec-combo-dm6446.inc b/recipes/dvsdk/ti-codec-combo-dm6446.inc
new file mode 100644 (file)
index 0000000..44508bf
--- /dev/null
@@ -0,0 +1,39 @@
+# This file defines function used for extracting .bin file
+
+python do_unpack () {
+    bb.build.exec_func('base_do_unpack', d)
+    bb.build.exec_func('ti_bin_do_unpack', d)
+}
+
+python ti_bin_do_unpack() {
+
+    import os
+
+    localdata = bb.data.createCopy(d)
+    bb.data.update_data(localdata)
+
+    binfile  = bb.data.getVar('BINFILE', localdata)
+
+    # Change to the working directory
+    save_cwd = os.getcwd()
+    workdir  = bb.data.getVar('WORKDIR', localdata)
+    workdir  = bb.data.expand(workdir, localdata)
+    os.chdir(workdir)
+
+    # Make the InstallJammer binary executable so we can run it
+    os.chmod(binfile, 0755)
+
+    # Run the InstallJammer binary and accept the EULA
+    filename = "HOME=%s ./%s" % (workdir, binfile)
+    f = os.popen(filename,'w')
+    print >>f, "Y\n"
+    print >>f, "Y\n"
+    print >>f, " \n"
+    print >>f, " qY\n"
+    print >>f, "%s\n" % workdir
+    f.close()
+
+    # Return to the previous directory
+    os.chdir(save_cwd)
+}
+
index 04f946b..07d9dff 100644 (file)
@@ -1,17 +1,33 @@
-DESCRIPTION = "DM6446 Codec Combo 2.05"
+DEPENDS="ti-codec-engine ti-dsplink-module"
 
-# Should be replaced with real http URL, but for now create codec combo tar from DVSDK installation.
-SRC_URI        = "http://install.source.dir.com/dm6446_dvsdk_combos_2_05.tar.gz"
+require ti-codec.inc
+require ti-codec-combo-dm6446.inc
 
-S = "${WORKDIR}/dm6446_dvsdk_combos_2_05"
+SRC_URI        = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/S1SDKLNX/DVSDK_2_00/exports/dm6446_codecs_setuplinux_2_00_00_22.bin"
+
+S = "${WORKDIR}/dvsdk_2_00_00_22/dm6446_dvsdk_combos_2_05"
+BINFILE = "dm6446_codecs_setuplinux_2_00_00_22.bin"
+
+export ${CODEGEN_INSTALL_DIR}
 
 # Yes, the xdc stuff still breaks with a '.' in PWD
 PV = "205"
-PR = "r11"
+PR = "r15"
+
+do_configure () {
+       find . -name *.x64P | xargs rm -rf {} 
+}
 
-installdir = "${datadir}/ti"
 do_compile() {
-       echo "do nothing"
+       make BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
+               XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
+               CE_INSTALL_DIR=${CE_INSTALL_DIR} \
+               FC_INSTALL_DIR=${FC_INSTALL_DIR} \
+               CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
+               XDAIS_INSTALL_DIR=${XDAIS_INSTALL_DIR} \
+               LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
+               CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
+               XDCARGS=\"eval\"
 }
 
 do_install () {
@@ -22,11 +38,3 @@ do_install () {
        done
 }
 
-do_stage() {
-    install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}
-    cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/ 
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILES_${PN} = "/${installdir}/codec-combo/*"
-
diff --git a/recipes/dvsdk/ti-codec-combo-omap3530-sdk_3.16.1.bb b/recipes/dvsdk/ti-codec-combo-omap3530-sdk_3.16.1.bb
deleted file mode 100644 (file)
index 966e568..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "OMAP3530 Codec Combo 3.16.01"
-require ti-codec-combo-omap3530.inc
-
-inherit sdk
-
-SRC_URI        = "http://software-dl.ti.com/sdo/sdo_apps_public_sw/omap3530_dvsdk_combos_tspa/omap3530_dvsdk_combos_tspa-3_16_01-Linux-x86.bin"
-
-# Specify names of the InstallJammer binary file and the tarball it extracts
-BINFILE = "omap3530_dvsdk_combos_tspa-3_16_01-Linux-x86.bin"
-TARFILE = "omap3530_dvsdk_combos_tspa/omap3530_dvsdk_combos_tspa_3_16_01.tar.gz"
-
-S = "${WORKDIR}/omap3530_dvsdk_combos_tspa_3_16_01"
-
-# Yes, the xdc stuff still breaks with a '.' in PWD
-PV = "316"
-PR = "r10"
-
-do_compile () {
-       echo "No nothing"
-}
-
-do_install() {
-    install -d ${D}/${prefix}/dvsdk/omap3530_dvsdk_combos_3_16_01
-    cp -pPrf ${S}/* ${D}/${prefix}/dvsdk/omap3530_dvsdk_combos_3_16_01
-
-    # Creates rules.make file
-         mkdir -p ${STAGING_DIR_HOST}/ti-sdk-rules
-         echo "# Where the codec servers are installed." > ${STAGING_DIR_HOST}/ti-sdk-rules/codec.Rules.make
-    echo "CODEC_INSTALL_DIR=${prefix}/dvsdk/omap3530_dvsdk_combos_3_16_01" >> ${STAGING_DIR_HOST}/ti-sdk-rules/codec.Rules.make
-}
-
-INHIBIT_PACKAGE_STRIP = "1"
-FILES_${PN} = "${prefix}/dvsdk/omap3530_dvsdk_combos_3_16_01/*"
-INSANE_SKIP_${PN} = True
-
index 76ebb46..3a9efdd 100644 (file)
@@ -1,5 +1,4 @@
-DESCRIPTION = "OMAP3530 TSPA codec combo 3.16.01"
-
+require ti-codec.inc
 require ti-codec-combo-omap3530.inc
 
 SRC_URI        = "http://software-dl.ti.com/sdo/sdo_apps_public_sw/omap3530_dvsdk_combos_tspa/omap3530_dvsdk_combos_tspa-3_16_01-Linux-x86.bin"
@@ -10,24 +9,15 @@ TARFILE = "omap3530_dvsdk_combos_tspa/omap3530_dvsdk_combos_tspa_3_16_01.tar.gz"
 
 S = "${WORKDIR}/omap3530_dvsdk_combos_tspa_3_16_01"
 
-DEPENDS="ti-codec-engine"
+DEPENDS="ti-codec-engine ti-dsplink-module"
 
-CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine"
-FC_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools"
-LINK_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools"
-CMEM_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools"
-LPM_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools"
-BIOS_INSTALL_DIR="${STAGING_DIR_NATIVE}/ti-dspbios-native"
-CODEGEN_INSTALL_DIR="${STAGING_DIR_NATIVE}/ti-cgt6x-native"
-XDC_INSTALL_DIR="${STAGING_DIR_NATIVE}/ti-xdctools-native"
+CODEC_INSTALL_DIR = "${S}"
 
-export ${CODEGEN_INSTALL_DIR}
+export CODEGEN_INSTALL_DIR
 
 # Yes, the xdc stuff still breaks with a '.' in PWD
 PV = "3161"
-PR = "r12"
-installdir = "${datadir}/ti"
-
+PR = "r17"
 do_compile() {
        make CE_INSTALL_DIR=${CE_INSTALL_DIR} \
                 FC_INSTALL_DIR=${FC_INSTALL_DIR} \
@@ -36,7 +26,18 @@ do_compile() {
                 LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
             BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
                 CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
-                XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
+            CODEC_INSTALL_DIR=${CODEC_INSTALL_DIR} \
+                XDC_INSTALL_DIR=${XDC_INSTALL_DIR} clean
+
+       make CE_INSTALL_DIR=${CE_INSTALL_DIR} \
+                FC_INSTALL_DIR=${FC_INSTALL_DIR} \
+                LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
+                CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
+                LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
+            BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
+                CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
+            CODEC_INSTALL_DIR=${CODEC_INSTALL_DIR} \
+                XDC_INSTALL_DIR=${XDC_INSTALL_DIR} 
 }
 
 do_install () {
@@ -47,11 +48,4 @@ do_install () {
        done
 }
 
-do_stage() {
-    install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}
-    cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/ 
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILES_${PN} = "${installdir}/codec-combo/*"
 
diff --git a/recipes/dvsdk/ti-codec-combo-omapl137_1.0.bb b/recipes/dvsdk/ti-codec-combo-omapl137_1.0.bb
new file mode 100644 (file)
index 0000000..6ffefc7
--- /dev/null
@@ -0,0 +1,23 @@
+require ti-codec.inc
+
+# Should be replaced with real http URL, but for now create codec combo tar from DVSDK installation.
+SRC_URI        = "http://install.source.dir.com/omapl137_dvsdk_combos_1_0.tar.gz"
+
+S = "${WORKDIR}/omapl137_dvsdk_combos_1_0"
+
+# Yes, the xdc stuff still breaks with a '.' in PWD
+PV = "100"
+PR = "r1"
+
+do_compile() {
+       echo "do nothing"
+}
+
+do_install () {
+    install -d ${D}/${installdir}/codec-combo
+       cd ${S}
+       for file in `find . -name *.x64P`; do
+               cp ${file} ${D}/${installdir}/codec-combo
+       done
+}
+
index 6bab35a..5d8faca 100644 (file)
@@ -4,7 +4,6 @@ LICENCE = "unknown"
 
 require ti-paths.inc
 
-
 # Tar-Up Codec Combos from the OMAP DVSDK (http://www.ti.com/dvevmupdates) and drop in files/
 SRC_URI = "file://omap3530_dvsdk_combos_3_16.tar.gz \
     "
diff --git a/recipes/dvsdk/ti-codec-engine-sdk_2.23.1.bb b/recipes/dvsdk/ti-codec-engine-sdk_2.23.1.bb
deleted file mode 100644 (file)
index 4f9f6b9..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-DESCRIPTION = "Codec Engine 2.23.01 for TI ARM/DSP processors"
-inherit sdk
-
-# tconf from xdctools dislikes '.' in pwd :/
-PR = "r17"
-PV = "2231"
-
-SRC_URI = "http://install.source.dir.com/codec_engine_2_23_01.tar.gz "
-
-# Set the source directory
-S = "${WORKDIR}/codec_engine_2_23_01"
-
-do_compile () {
-    echo "nothing to build"
-}
-
-do_install() {
-    # Update cmem and sdma Rules.make to point correct location of main 
-    # Rules.make.
-    sed -i -e s:Rules.make:../Rules.make:g \
-       ${S}/cetools/packages/ti/sdo/linuxutils/cmem/Rules.make
-    sed -i -e s:Rules.make:../Rules.make:g \
-       ${S}/cetools/packages/ti/sdo/linuxutils/sdma/Rules.make
-
-    install -d ${D}/${prefix}/dvsdk/codec_engine_2_23_01
-    cp -pPrf ${S}/* ${D}/${prefix}/dvsdk/codec_engine_2_23_01
-
-    # Creates rules.make file
-    
-         mkdir -p ${STAGING_DIR_HOST}/ti-sdk-rules
-         echo "# Where the Codec Engine package is installed." > ${STAGING_DIR_HOST}/ti-sdk-rules/ce.Rules.make
-    echo "CE_INSTALL_DIR=${prefix}/dvsdk/codec_engine_2_23_01" >> ${STAGING_DIR_HOST}/ti-sdk-rules/ce.Rules.make
-    echo "" >> ${STAGING_DIR_HOST}/ti-sdk-rules/ce.Rules.make
-    echo "# Where the XDAIS package is installed." >> ${STAGING_DIR_HOST}/ti-sdk-rules/ce.Rules.make
-    echo "XDAIS_INSTALL_DIR=\$(CE_INSTALL_DIR)/cetools" >> ${STAGING_DIR_HOST}/ti-sdk-rules/ce.Rules.make
-    echo "" >> ${STAGING_DIR_HOST}/ti-sdk-rules/ce.Rules.make
-    echo "# Where the DSP Link package is installed." >> ${STAGING_DIR_HOST}/ti-sdk-rules/ce.Rules.make    
-    echo "LINK_INSTALL_DIR=\$(CE_INSTALL_DIR)/cetools" >> ${STAGING_DIR_HOST}/ti-sdk-rules/ce.Rules.make
-    echo "" >> ${STAGING_DIR_HOST}/ti-sdk-rules/ce.Rules.make
-    echo "# Where the CMEM (contiguous memory allocator) package is installed." >> ${STAGING_DIR_HOST}/ti-sdk-rules/ce.Rules.make
-    echo "CMEM_INSTALL_DIR=\$(CE_INSTALL_DIR)/cetools" >> ${STAGING_DIR_HOST}/ti-sdk-rules/ce.Rules.make
-    echo "" >> ${STAGING_DIR_HOST}/ti-sdk-rules/ce.Rules.make
-    echo "# Where Framework Components product is installed."  >> ${STAGING_DIR_HOST}/ti-sdk-rules/ce.Rules.make
-    echo "FC_INSTALL_DIR=\$(CE_INSTALL_DIR)/cetools"  >> ${STAGING_DIR_HOST}/ti-sdk-rules/ce.Rules.make
-}
-
-FILES_${PN} = "${prefix}/dvsdk/codec_engine_2_23_01"
-INHIBIT_PACKAGE_STRIP = "1"
-INSANE_SKIP_${PN} = True
-
index a553476..a0e6a2c 100644 (file)
@@ -10,6 +10,8 @@ DEPENDS_dm355-evm     += "ti-xdctools-native"
 PR = "r16"
 PV = "2231"
 
+# Download codec_engine_2_23_01.tar.gz from https://www-a.ti.com/downloads/sds_support/targetcontent/CE/ce_2_23/index.html and copy in Arago (or OE) download directory.
+
 SRC_URI = "http://install.source.dir.com/codec_engine_2_23_01.tar.gz "
 
 # Set the source directory
diff --git a/recipes/dvsdk/ti-codec-engine_2.24.01.bb b/recipes/dvsdk/ti-codec-engine_2.24.01.bb
new file mode 100644 (file)
index 0000000..6451823
--- /dev/null
@@ -0,0 +1,94 @@
+DESCRIPTION = "Codec Engine 2.24.01 for TI ARM/DSP processors"
+
+require ti-paths.inc
+
+# compile time dependencies
+DEPENDS_dm6446-evm     += "ti-xdctools-native ti-cgt6x-native ti-dspbios-native ti-dsplink-module"
+DEPENDS_armv7a         += "ti-cgt6x-native ti-dspbios-native ti-xdctools-native ti-dsplink-module"
+DEPENDS_dm355-evm      += "ti-xdctools-native"
+
+# disable this package for now, while we're in test mode
+DEFAULT_PREFERENCE = "-1"
+
+
+# tconf from xdctools dislikes '.' in pwd :/
+PR = "r7"
+PV = "224"
+
+SRC_URI = "http://install.source.dir.com/codec_engine_2_24_01.tar.gz "
+
+# Set the source directory
+S = "${WORKDIR}/codec_engine_2_24_01"
+
+# Define Device variable
+DEVICES_dm355-evm      ?= "DM355"
+DEVICES_dm6446-evm     ?= "DM6446"
+
+# define gppos variable
+GPPOS_dm355-evm        ?= "LINUX_GCC"
+GPPOS_dm6446-evm       ?= "LINUX_GCC"
+
+#define PROGRAM variables
+PROGRAMS                  = "APP_CLIENT DSP_SERVER"
+PROGRAMS_dm355-evm ?= "APP_LOCAL"
+
+LINK_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dsplink-module/packages"
+DSPBIOS_DIR="${STAGING_DIR_NATIVE}/ti-dspbios-native"
+CGT6x_DIR="${STAGING_DIR_NATIVE}/ti-cgt6x-native"
+XDCTOOLS_DIR="${STAGING_DIR_NATIVE}/ti-xdctools-native"
+CE_INSTALL_DIR="${S}"
+
+do_compile () {
+
+       for i in codecs extensions servers apps ; do
+               cd ${S}/examples/ti/sdo/ce/examples/$i
+               make DEVICES="${DEVICES}" \
+                       GPPOS="${GPPOS}" \
+                       PROGRAMS="${PROGRAMS}" \
+                       CE_INSTALL_DIR="${CE_INSTALL_DIR}" \
+               XDC_INSTALL_DIR="${XDCTOOLS_DIR}" \
+               BIOS_INSTALL_DIR="${DSPBIOS_DIR}"\
+               DSPLINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \
+               XDAIS_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \
+               FC_INSTALL_DIR="${FC_INSTALL_DIR}" \
+               CMEM_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \
+               LPM_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \
+               EDMA3_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \
+                       FC_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \
+               CGTOOLS_V5T="${CROSS_DIR}"\
+                       CGTOOLS_C64P="${CGT6x_DIR}" \
+                       clean all
+       done
+}
+
+do_install() {
+       install -d ${D}/${installdir}/codec-engine-apps
+    cp ${S}/examples/apps/system_files/${DEVICES}/loadmodules.sh ${D}/${installdir}/codec-engine-apps
+       sed -i 's/insmod/modprobe/g' ${D}/${installdir}/codec-engine-apps/loadmodules.sh
+
+       cd ${S}/examples/ti/sdo/ce/examples
+
+    for i in $(find . -name "*.xv5T"); do
+               install -d ${D}/${installdir}/codec-engine-apps/`dirname ${i} | cut -f3 -d /`
+               install ${i} ${D}/${installdir}/codec-engine-apps/`dirname ${i} | cut -f3 -d /`
+
+       for j in $(find . -name "*.x64P"); do
+               install ${j} ${D}/${installdir}/codec-engine-apps/`dirname ${i} | cut -f3 -d /`
+       done
+
+    done
+}
+
+
+# stage tree - other packages may need this
+do_stage() {
+    install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}
+    cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/ 
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+INHIBIT_PACKAGE_STRIP = "1"
+PACKAGES += "ti-codec-engine-apps"
+FILES_ti-codec-engine-apps = "${installdir}/codec-engine-apps/*"
+INSANE_SKIP_ti-codec-engine-apps = True
+
diff --git a/recipes/dvsdk/ti-cs1-omap3530.inc b/recipes/dvsdk/ti-cs1-omap3530.inc
new file mode 100644 (file)
index 0000000..cb9696d
--- /dev/null
@@ -0,0 +1,41 @@
+
+# This file defines function used for extracting .bin file
+
+python do_unpack () {
+    bb.build.exec_func('base_do_unpack', d)
+    bb.build.exec_func('ti_bin_do_unpack', d)
+}
+
+python ti_bin_do_unpack() {
+
+    import os
+
+    localdata = bb.data.createCopy(d)
+    bb.data.update_data(localdata)
+
+    binfile  = bb.data.getVar('BINFILE', localdata)
+
+    # Change to the working directory
+    save_cwd = os.getcwd()
+    workdir  = bb.data.getVar('WORKDIR', localdata)
+    workdir  = bb.data.expand(workdir, localdata)
+    os.chdir(workdir)
+
+    # Make the InstallJammer binary executable so we can run it
+    os.chmod(binfile, 0755)
+
+    # Run the InstallJammer binary and accept the EULA
+    filename = "HOME=%s ./%s" % (workdir, binfile)
+    f = os.popen(filename,'w')
+    print >>f, "Y\n"
+    print >>f, "Y\n"
+    print >>f, " \n"
+    print >>f, "qY\n"
+    print >>f, "%s\n" % workdir
+
+    f.close()
+
+    # Return to the previous directory
+    os.chdir(save_cwd)
+}
+
diff --git a/recipes/dvsdk/ti-cs1-omap3530_1.0.1.bb b/recipes/dvsdk/ti-cs1-omap3530_1.0.1.bb
new file mode 100644 (file)
index 0000000..61d5406
--- /dev/null
@@ -0,0 +1,53 @@
+require ti-codec.inc
+require ti-cs1-omap3530.inc
+
+SRC_URI        = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/DVSDK_3_00/latest//exports/cs1omap3530_setuplinux_1_00_01.bin"
+
+# Specify names of the InstallJammer binary file and the tarball it extracts
+BINFILE = "cs1omap3530_setuplinux_1_00_01.bin"
+
+S = "${WORKDIR}/dvsdk_3_00_00_40/cs1omap3530_1_00_01"
+
+DEPENDS="ti-codec-engine ti-dsplink-module"
+
+export CODEGEN_INSTALL_DIR
+
+# Yes, the xdc stuff still breaks with a '.' in PWD
+PV = "101"
+PR = "r4"
+
+do_compile() {
+
+       make CE_INSTALL_DIR=${CE_INSTALL_DIR} \
+                FC_INSTALL_DIR=${FC_INSTALL_DIR} \
+                LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
+                CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
+                LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
+            BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
+                CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
+                XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
+                CODEC_INSTALL_DIR="${S}" \
+                XDCARGS="prod" \
+                clean
+
+       make CE_INSTALL_DIR=${CE_INSTALL_DIR} \
+                FC_INSTALL_DIR=${FC_INSTALL_DIR} \
+                LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
+                CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
+                LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
+            BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
+                CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
+                XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
+                CODEC_INSTALL_DIR="${S}" \
+                XDCARGS="prod" \
+}
+
+do_install () {
+    install -d ${D}/${installdir}/codec-combo
+       cd ${S}
+       for file in `find . -name *.x64P`; do
+               cp ${file} ${D}/${installdir}/codec-combo
+       done
+}
+
+
index 0a2c6af..59cbd69 100644 (file)
@@ -2,6 +2,7 @@ DESCRIPTION = "User space DMA module for DM355"
 
 require ti-codec-combo-dm355.inc
 inherit module
+
 # compile and run time dependencies
 DEPENDS        = "virtual/kernel perl-native"
 RDEPENDS       = "update-modules"
@@ -9,14 +10,16 @@ RDEPENDS     = "update-modules"
 SRC_URI        = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/codecs/dm355_codecs_setuplinux_1_13_000.bin \
                   file://dm355mm_1_30.patch;patch=1 \
              "
+
 S = "${WORKDIR}/dm355_codecs_1_13_000"
-BINFILE="dm355_codecs_setuplinux_1_13_000.bin"
+BINFILE = "dm355_codecs_setuplinux_1_13_000.bin"
 
 # Yes, the xdc stuff still breaks with a '.' in PWD
 PV = "113"
 #This is a kernel module, don't set PR directly
 MACHINE_KERNEL_PR_append = "a"
 
+
 do_configure() {
        find ${S} -name "*.ko" -exec rm {} \; || true
        sed -i -e s:include:#include:g ${S}/dm355mm/Rules.make
diff --git a/recipes/dvsdk/ti-dmai-sdk_svn.bb b/recipes/dvsdk/ti-dmai-sdk_svn.bb
deleted file mode 100644 (file)
index e4c9ad0..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-inherit sdk
-require ti-dmai.inc
-
-do_compile () {
-       echo "do nothing"
-}
-
-do_install() {
-    install -d ${D}/${prefix}/dvsdk/dmai_${PV}
-    cp -pPrf ${S}/dmai/* ${D}/${prefix}/dvsdk/dmai_${PV}
-
-    # Creates rules.make file
-         mkdir -p ${STAGING_DIR_HOST}/ti-sdk-rules
-         echo "# Where DMAI package is installed." > ${STAGING_DIR_HOST}/ti-sdk-rules/dmai.Rules.make
-    echo "DMAI_INSTALL_DIR=${prefix}/dvsdk/dmai_${PV}" >> ${STAGING_DIR_HOST}/ti-sdk-rules/dmai.Rules.make
-}
-
-INHIBIT_PACKAGE_STRIP = "1"
-FILES_${PN} = "${prefix}/dvsdk/dmai_${PV}/*"
-INSANE_SKIP_${PN} = True
-
index d90a906..8e95cf1 100644 (file)
@@ -2,15 +2,15 @@ DESCRIPTION = "DMAI for TI ARM/DSP processors"
 
 # NOTE: Use Brijesh' DMAI development branch. The URL *must* be updated once
 # we have stable DMAI 2.x on gforge.
-SRCREV = "195"
-SRC_URI = "svn://gforge.ti.com/svn/dmai/branches;module=BRIJESH_GIT_031809;proto=https;user=anonymous;pswd='' \
+SRCREV = "265"
+SRC_URI = "svn://gforge.ti.com/svn/dmai/branches;module=BRANCH_BRIJESH_DMAI_DEV_2_xx;proto=https;user=anonymous;pswd='' \
                file://loadmodules-ti-dmai-dm355_al.sh \
                file://loadmodules-ti-dmai-dm6446_al.sh \
                file://loadmodules-ti-dmai-o3530_al.sh \
        "
 
-S = "${WORKDIR}/BRIJESH_GIT_031809/davinci_multimedia_application_interface"
+S = "${WORKDIR}/BRANCH_BRIJESH_DMAI_DEV_2_xx/davinci_multimedia_application_interface"
 # Yes, the xdc stuff still breaks with a '.' in PWD
 PV = "svnr${SRCREV}"
-PR = "r27"
+PR = "r33"
 
index e089595..d94dd61 100644 (file)
@@ -1,47 +1,47 @@
 require ti-dmai.inc
+require ti-paths.inc
 
 inherit module-base
 
+#This is a kernel module, don't set PR directly
+MACHINE_KERNEL_PR_append = "a"
+
 # compile time dependencies
-DEPENDS_omap3evm  += "alsa-lib ti-codec-engine ti-xdctools-native ti-dspbios-native ti-cgt6x-native ti-codec-combo-omap3530 virtual/kernel"
-DEPENDS_beagleboard    += "alsa-lib  ti-codec-engine ti-xdctools-native ti-dspbios-native ti-cgt6x-native ti-codec-combo-omap3530 virtual/kernel "
-DEPENDS_dm6446-evm     += "alsa-lib  ti-codec-engine ti-xdctools-native ti-dspbios-native ti-cgt6x-native ti-codec-combo-dm6446 virtual/kernel "
+DEPENDS_omap3evm  += "alsa-lib ti-codec-engine ti-xdctools-native ti-dspbios-native ti-cgt6x-native ti-cs1-omap3530 virtual/kernel ti-dsplink-module"
+DEPENDS_beagleboard    += "alsa-lib  ti-codec-engine ti-xdctools-native ti-dspbios-native ti-cgt6x-native ti-cs1-omap3530 virtual/kernel ti-dsplink-module "
+DEPENDS_dm6446-evm     += "alsa-lib  ti-codec-engine ti-xdctools-native ti-dspbios-native ti-cgt6x-native ti-codec-combo-dm6446 virtual/kernel ti-dsplink-module "
 DEPENDS_dm355-evm      += "alsa-lib ti-codec-engine ti-xdctools-native ti-codec-combo-dm355 virtual/kernel"
-
-installdir = "${datadir}/ti"
+DEPENDS_da830-omapl137-evm     += "alsa-lib  ti-codec-engine ti-xdctools-native ti-dspbios-native ti-cgt6x-native ti-codec-combo-omapl137 virtual/kernel ti-dsplink-module "
 
 # Define DMAI build time variables
 TARGET                         ?= "all"
-TARGET_omap3evm        ?= "o3530_al"
-TARGET_beagleboard     ?= "o3530_al"
+TARGET_armv7a  ?= "o3530_al"
 TARGET_dm355-evm       ?= "dm355_al"
 TARGET_dm6446-evm      ?= "dm6446_al"
+TARGET_da830-omapl137-evm      ?= "ol137_al"
 
-CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine"
-CODEC_dm355-evm ="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-dm355"
-CODEC_omap3evm ="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-omap3530"
-CODEC_beagleboard ="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-omap3530"
-CODEC_dm6446-evm ="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-dm6446"
-FC_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools"
-DSPBIOS_DIR="${STAGING_DIR_NATIVE}/ti-dspbios-native"
-CGT6x_DIR="${STAGING_DIR_NATIVE}/ti-cgt6x-native"
-XDCTOOLS_DIR="${STAGING_DIR_NATIVE}/ti-xdctools-native"
-USER_XDC_PATH="${CE_INSTALL_DIR}/examples"
+DSPBIOS_DIR = "${STAGING_DIR_NATIVE}/ti-dspbios-native"
+CGT6x_DIR = "${STAGING_DIR_NATIVE}/ti-cgt6x-native"
+XDCTOOLS_DIR = "${STAGING_DIR_NATIVE}/ti-xdctools-native"
+USER_XDC_PATH = "${CE_INSTALL_DIR}/examples"
 
 PARALLEL_MAKE = ""
 
 do_configure () {
-    # If kernel version is greater than 2.6.28 replace mach/omapfb.h with
-    # linux/omapfb.h
 
-    if [ $(echo ${KERNEL_VERSION} | cut -c5,6) -gt 28 ] ; then
-        sed -i -e s:mach/omapfb:linux/omapfb:g ${S}/dmai/packages/ti/sdo/dmai/linux/Display_fbdev.c
+       # PSP kernel is based on older DSS. we need to replace linux/omapfb.h with
+       # mach/omapfb.h 
+
+    if [ ${MACHINE} == "omap3evm" ] ; then
+        sed -i -e s:linux/omapfb:mach/omapfb:g ${S}/dmai/packages/ti/sdo/dmai/linux/Display_fbdev.c
+        sed -i -e s:linux/omapfb:mach/omapfb:g ${S}/dmai/packages/ti/sdo/dmai/linux/priv/_Display.h
     fi
 }
 
 
 do_compile () {
 
+       unset DMAI_INSTALL_DIR
        cd ${S}
        make XDC_INSTALL_DIR="${XDCTOOLS_DIR}" clean
 
@@ -59,21 +59,20 @@ do_compile () {
                CROSS_COMPILE="${CROSS_DIR}/bin/${TARGET_PREFIX}" \
                VERBOSE="true" \
                XDAIS_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \
-               LINK_INSTALL_DIR="${CE_INSTALL_DIR}/cetools/packages/dsplink" \
+               LINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \
                CMEM_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \
                LPM_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \   
                PLATFORM="${TARGET}"
 }
 
 do_install () {
+       unset DMAI_INSTALL_DIR
        # install dmai apps on target
-    install -d ${D}/dmai-apps
     cd ${S}/dmai
     make PLATFORM="${TARGET}" EXEC_DIR=${D}/${installdir}/dmai-apps install 
        install -m 0755 ${WORKDIR}/loadmodules-ti-dmai-${TARGET}.sh ${D}/${installdir}/dmai-apps/loadmodule.sh 
 
     cd ${S}/tests
-    install -d ${D}/dmai-tests
     make PLATFORM="${TARGET}" EXEC_DIR=${D}/${installdir}/dmai-tests install 
        install -m 0755 ${WORKDIR}/loadmodules-ti-dmai-${TARGET}.sh ${D}/${installdir}/dmai-tests/loadmodule.sh 
 }
@@ -83,8 +82,8 @@ pkg_postinst_ti-dmai-apps () {
 }
 
 do_stage () {
-       install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dmai
-       cp -pPrf ${S}/dmai/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dmai
+       install -d ${DMAI_INSTALL_DIR}
+       cp -pPrf ${S}/dmai/* ${DMAI_INSTALL_DIR}
 }
 
 # Disable QA check untils we figure out how to pass LDFLAGS in build
@@ -101,5 +100,7 @@ FILES_ti-dmai-tests = "${installdir}/dmai-tests/*"
 # run time dependencies 
 RDEPENDS_ti-dmai-apps_dm355-evm += "ti-dm355mm-module ti-cmem-module ti-codec-combo-dm355"
 RDEPENDS_ti-dmai-apps_dm6446-evm += "ti-cmem-module ti-dsplink-module ti-codec-combo-dm6446"
-RDEPENDS_ti-dmai-apps_omap3evm += "ti-cmem-module ti-dsplink-module ti-codec-combo-omap3530 ti-lpm-module ti-sdma-module"
-RDEPENDS_ti-dmai-apps_beagleboard += "ti-cmem-module ti-dsplink-module ti-codec-combo-omap3530 ti-lpm-module ti-sdma-module"
+RDEPENDS_ti-dmai-apps_omap3evm += "ti-cmem-module ti-dsplink-module ti-cs1-omap3530 ti-lpm-module ti-sdma-module"
+RDEPENDS_ti-dmai-apps_beagleboard += "ti-cmem-module ti-dsplink-module ti-cs1-omap3530 ti-lpm-module ti-sdma-module"
+RDEPENDS_ti-dmai-apps_da830-omapl137-evm += "ti-cmem-module ti-dsplink-module ti-codec-combo-ol137"
+
index e017a03..9e22443 100644 (file)
@@ -1,14 +1,16 @@
 require ti-dspbios.inc
 inherit native
 
+# download bios_setuplinux_5_33_02.bin from https://www-a.ti.com/downloads/sds_support/targetcontent/bios/bios_5_33/bios_5_33_02/index_external.html and copy in Arago (or OE) installation directory
+
 SRC_URI        = "http://install.source.dir.com/bios_setuplinux_5_33_02.bin"
 BINFILE="bios_setuplinux_5_33_02.bin"
 
 S = "${WORKDIR}/bios_5_33_02"
 
 # Yes, the xdc stuff still breaks with a '.' in PWD
-PV = "533"
-PR = "r13"
+PV = "5332"
+PR = "r14"
 
 do_stage() {
     install -d ${STAGING_DIR_NATIVE}/${PN}
diff --git a/recipes/dvsdk/ti-dspbios-native_5.33.04.bb b/recipes/dvsdk/ti-dspbios-native_5.33.04.bb
new file mode 100644 (file)
index 0000000..d5667f0
--- /dev/null
@@ -0,0 +1,22 @@
+require ti-dspbios.inc
+inherit native
+
+# download bios_setuplinux_5_33_04.bin from https://www-a.ti.com/downloads/sds_support/targetcontent/bios/bios_5_33/bios_5_33_04/index_external.html and copy in Arago (or OE) installation directory
+
+SRC_URI        = "http://install.source.dir.com/bios_setuplinux_5_33_04.bin"
+BINFILE="bios_setuplinux_5_33_04.bin"
+
+S = "${WORKDIR}/bios_5_33_04"
+
+# Yes, the xdc stuff still breaks with a '.' in PWD
+PV = "5334"
+PR = "r2"
+
+do_stage() {
+    install -d ${STAGING_DIR_NATIVE}/${PN}
+    cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/${PN}/ 
+    chmod 755 -R ${STAGING_DIR_NATIVE}/${PN}/*
+}
+
+AUTOTOOLS_NATIVE_STAGE_INSTALL="1"
+
diff --git a/recipes/dvsdk/ti-dspbios-sdk_5.33.02.bb b/recipes/dvsdk/ti-dspbios-sdk_5.33.02.bb
deleted file mode 100644 (file)
index da3657e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-require ti-dspbios.inc
-inherit sdk
-
-SRC_URI        = "http://install.source.dir.com/bios_setuplinux_5_33_02.bin"
-BINFILE="bios_setuplinux_5_33_02.bin"
-
-S = "${WORKDIR}/bios_5_33_02"
-
-# Yes, the xdc stuff still breaks with a '.' in PWD
-PV = "533"
-PR = "r13"
-
-do_install() {
-    install -d ${D}/${prefix}/dvsdk/bios_5_33_02
-    cp -pPrf ${S}/* ${D}/${prefix}/dvsdk/bios_5_33_02
-
-    # Creates rules.make file
-         mkdir -p ${STAGING_DIR_HOST}/ti-sdk-rules
-         echo "# Where DSP/BIOS is installed." > ${STAGING_DIR_HOST}/ti-sdk-rules/bios.Rules.make
-    echo "BIOS_INSTALL_DIR=${prefix}/dvsdk/bios_5_33_02" >> ${STAGING_DIR_HOST}/ti-sdk-rules/bios.Rules.make
-}
-
-FILES_${PN} ="${prefix}/dvsdk/bios_5_33_02/*"
-INSANE_SKIP_${PN} = True
-INHIBIT_PACKAGE_STRIP = "1"
-
index 492305f..7febdc8 100644 (file)
@@ -1,35 +1,42 @@
 DESCRIPTION = "DSPLINK 1.61.3 module for TI ARM/DSP processors"
+
+require ti-paths.inc
 inherit module
 
 # compile and run time dependencies
-DEPENDS        += " virtual/kernel perl-native ti-dspbios-native ti-cgt6x-native update-modules"
+DEPENDS        += "virtual/kernel perl-native ti-dspbios-native ti-cgt6x-native update-modules ti-xdctools-native"
 
 # tconf from xdctools dislikes '.' in pwd :/
-PV = "1613"
 #This is a kernel module, don't set PR directly
-MACHINE_KERNEL_PR_append = "a"
+MACHINE_KERNEL_PR_append = "a"                                                  
+PV = "1613"
 
-installdir = "${datadir}/ti"
-SRC_URI = "http://install.source.dir.com/codec_engine_2_23_01.tar.gz  \
+SRC_URI = "http://install.source.dir.com/dsplink_1_61_03.tar.gz \
                   file://loadmodules-ti-dsplink-apps.sh \
                   file://unloadmodules-ti-dsplink-apps.sh"
 
 # Set the source directory
-S = "${WORKDIR}/codec_engine_2_23_01"
+S = "${WORKDIR}/dsplink_1_61_03"
        
 # DSPLINK - Config Variable for different platform
-DSPLINKPLATFORM            ?= "DAVINCI"
-DSPLINKPLATFORM_dm6446-evm ?= "DAVINCI"
+DSPLINKPLATFORM                                ?= "DAVINCI"
+DSPLINKPLATFORM_dm6446-evm                     ?= "DAVINCI"
+DSPLINKPLATFORM_da830-omapl137-evm     ?= "OMAPL1XX"
 
-DSPLINKDSPCFG            ?= "DM6446GEMSHMEM"
-DSPLINKDSPCFG_dm6446-evm ?= "DM6446GEMSHMEM"
+DSPLINKDSPCFG                                  ?= "DM6446GEMSHMEM"
+DSPLINKDSPCFG_dm6446-evm                       ?= "DM6446GEMSHMEM"
+DSPLINKDSPCFG_da830-omapl137-evm       ?= "OMAPL1XXGEMSHMEM"
 
-DSPLINKGPPOS             ?= "MVL5G"
-DSPLINKGPPOS_dm6446-evm  ?= "MVL5G"
+DSPLINKGPPOS                                   ?= "MVL5G"
+DSPLINKGPPOS_dm6446-evm                        ?= "MVL5G"
+DSPLINKGPPOS_da830-omapl137-evm        ?= "MVL5G"
+
+DSPLINK = "${S}/dsplink"
+export DSPLINK
 
-export DSPLINK="${S}/cetools/packages/dsplink"
 STAGING_TI_DSPBIOS_DIR="${STAGING_DIR_NATIVE}/ti-dspbios-native"
 STAGING_TI_CGT6x_DIR="${STAGING_DIR_NATIVE}/ti-cgt6x-native"
+STAGING_TI_XDCTOOL_INSTALL_DIR="${STAGING_DIR_NATIVE}/ti-xdctools-native"
 
 do_compile() {
 
@@ -38,7 +45,7 @@ do_compile() {
     cd ${DSPLINK}
     perl config/bin/dsplinkcfg.pl --platform=${DSPLINKPLATFORM} --nodsp=1 \
        --dspcfg_0=${DSPLINKDSPCFG} --dspos_0=DSPBIOS5XX \
-        --gppos=${DSPLINKGPPOS} --comps=ponslrm
+       --gppos=${DSPLINKGPPOS} --comps=ponslrm
     )
 
          # dsplink makefile is hard-coded to use kbuild only on OMAP3530.
@@ -54,7 +61,7 @@ do_compile() {
     
     # Build the gpp user space library
     cd ${DSPLINK}/gpp/src/api
-    make \
+    ${STAGING_TI_XDCTOOL_INSTALL_DIR}/gmake \
       CROSS_COMPILE="${TARGET_PREFIX}" \
       CC="${KERNEL_CC}" \
       AR="${KERNEL_AR}" \
@@ -66,7 +73,7 @@ do_compile() {
 
     # Build the gpp kernel space (debug and release)
     cd ${DSPLINK}/gpp/src
-    make \
+    ${STAGING_TI_XDCTOOL_INSTALL_DIR}/gmake \
       OBJDUMP="${TARGET_PREFIX}objdump" \
       CROSS_COMPILE="${TARGET_PREFIX}" \
       CC="${KERNEL_CC}" \
@@ -79,7 +86,7 @@ do_compile() {
 
     # Build the gpp samples
     cd ${DSPLINK}/gpp/src/samples
-    make \
+    ${STAGING_TI_XDCTOOL_INSTALL_DIR}/gmake \
       BASE_TOOLCHAIN="${CROSS_DIR}" \
       BASE_CGTOOLS="${BASE_TOOLCHAIN}/bin" \
       OSINC_PLATFORM="${CROSS_DIR}/lib/gcc/${TARGET_SYS}/$(${TARGET_PREFIX}gcc -dumpversion)/include" \
@@ -96,14 +103,14 @@ do_compile() {
 
     # Build the dsp library (debug and release)
     cd ${DSPLINK}/dsp/src
-    make \
+    ${STAGING_TI_XDCTOOL_INSTALL_DIR}/gmake \
       BASE_CGTOOLS="${STAGING_TI_CGT6x_DIR}" \
       BASE_SABIOS="${STAGING_TI_DSPBIOS_DIR}" \
       clean all
 
     # Build the dsp samples (debug and release)
     cd ${DSPLINK}/dsp/src/samples
-    make \
+    ${STAGING_TI_XDCTOOL_INSTALL_DIR}/gmake \
       BASE_CGTOOLS="${STAGING_TI_CGT6x_DIR}" \
       BASE_SABIOS="${STAGING_TI_DSPBIOS_DIR}" \
       clean all
@@ -132,6 +139,11 @@ do_install () {
     install ${WORKDIR}/unloadmodules-ti-dsplink-apps.sh ${D}/${installdir}/dsplink/apps
 }
 
+do_stage () {
+    install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/packages
+    cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/packages
+}
+
 pkg_postrm () {
     update-modules || true
 }
index 8684fa1..7e0356d 100644 (file)
@@ -4,10 +4,12 @@ inherit module
 # compile and run time dependencies
 DEPENDS        = " virtual/kernel perl-native ti-dsplink-module"
 
-PV = "2231"
 #This is a kernel module, don't set PR directly
 MACHINE_KERNEL_PR_append = "a"
 
+PV = "2231"
+
+# Download codec_engine_2_23_01.tar.gz from https://www-a.ti.com/downloads/sds_support/targetcontent/CE/ce_2_23/index.html and copy in Arago (or OE) download directory.
 
 SRC_URI = "http://install.source.dir.com/codec_engine_2_23_01.tar.gz "
 
index 20a453f..abf75ec 100644 (file)
@@ -5,23 +5,8 @@
 # Back link for above:
 # https://www-a.ti.com/downloads/sds_support/targetcontent/index.html
 
-# Path to the dir where the TI tools are unpacked
-TITOOLSDIR ?= "/OE/TI"
-# Path under TITOOLSDIR where dspbios is unpacked
-TIBIOSDIR ?= "bios_5_33_02"
-TIXDCTOOLSDIR ?= "xdctools_3_10_03"
-# Path under TITOOLSDIR where the dsp toolchain is unpacked
-TICGTOOLSDIR ?= "cg6x_6_0_16"
-
-# Path to codecs/servers package - this is taken from DVSDK 3.00.00.29
-# - This needs fixing to be x-platform (not just omap3)
-#TICODECSDIR ?= "omap3530_dvsdk_combos_3_16"
-
 # export some more variable to point to external TI tools
 # information is duplicated between the js and make based tools
-export CE_INSTALL_DIR=${S}
-export XDC_INSTALL_DIR=${TITOOLSDIR}/${TIXDCTOOLSDIR}
-export BIOS_INSTALL_DIR=${TITOOLSDIR}/${TIBIOSDIR}
 # needed for configuro:
 export CGTOOLS_V5T="${CROSS_DIR}"
 export CC_V5T="bin/${TARGET_PREFIX}gcc"
@@ -31,8 +16,9 @@ export CSTOOL_PREFIX="${TARGET_PREFIX}"
 export CSTOOL_DIR="${CROSS_DIR}"
 export LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}
 
-# used by dmai (and gstreamer_ti?)
-#export CODEC_INSTALL_DIR=${TITOOLSDIR}/${TICODECSDIR}
+export PLATFORM
+
+export CROSS_COMPILE = "${CROSS_DIR}/bin/${TARGET_PREFIX}"
 
 # This tells codec engine which targets to build
 DEVICES ?= "DM6446"
@@ -41,58 +27,29 @@ DEVICES_omap5912osk = "fixme-ti-paths.inc"
 # Set a default for armv7a now, change this when omap4 and friends become available
 DEVICES_armv7a = "OMAP3530"
 
-DEVICES_omap3evm = "OMAP3530"
-DEVICES_beagleboard = "OMAP3530"
 DEVICES_davinci-sffsdr = "DM6446"
 DEVICES_davinci-dvevm = "DM6446"
 
 DSPLINKPLATFORM ?= "DAVINCI"
 DSPLINKPLATFORM_omap5912osk = "OMAP"
 
-# Set a default for armv7a now, change this when omap4 and friends become available
-DSPLINKPLATFORM_armv7a = "OMAP3530"
-
-DSPLINKPLATFORM_beagleboard = "OMAP3530"
-DSPLINKPLATFORM_omap3evm = "OMAP3530"
 DSPLINKPLATFORM_davinci-sffsdr = "DAVINCI"
 DSPLINKPLATFORM_davinci-dvevm = "DAVINCI"
 
 PLATFORM ?= "dm6446"
 PLATFORM_omap5912osk = "OMAP"
 
-# Set a default for armv7a now, change this when omap4 and friends become available
-PLATFORM_armv7a = "omap3530"
-
-PLATFORM_beagleboard = "omap3530"
-PLATFORM_omap3evm = "omap3530"
 PLATFORM_davinci-sffsdr = "dm6446"
 PLATFORM_davinci-dvevm = "dm6446"
 
 DSPLINKDSP ?= "C64XX"
 
-# Set a default for armv7a now, change this when omap4 and friends become available
-DSPLINKSOC_armv7a = "3530"
-
 DSPLINKSOC ?= "DM6446"
-DSPLINKSOC_beagleboard = "3530"
-DSPLINKSOC_omap3evm = "3530"
 
 DSPCFG ?= "DM6446GEMSHMEM"
 
-# Set a default for armv7a now, change this when omap4 and friends become available
-DSPCFG_armv7a ?= "OMAP3530SHMEM"
-
-DSPCFG_beagleboard ?= "OMAP3530SHMEM"
-DSPCFG_omap3evm ?= "OMAP3530SHMEM"
-
 GPPOS ?= "MVL5G"
 
-# Set a default for armv7a now, change this when omap4 and friends become available
-GPPOS_armv7a = "OMAPLSP"
-
-GPPOS_beagleboard = "OMAPLSP"
-GPPOS_omap3evm = "OMAPLSP"
-
 export DEVICES
 export DSPLINKPLATFORM
 export DSPLINKDSP
@@ -101,10 +58,23 @@ export DSPCFG
 export GPPOS
 export PLATFORM
 
-# Set a default for armv7a now, change this when omap4 and friends become available
-DSPPOWERSOC_armv7a = "omap3530"
-
 DSPPOWERSOC ?= "dm6446"
-DSPPOWERSOC_beagleboard = "omap3530"
-DSPPOWERSOC_omap3evm = "omap3530"
+
+export BIOS_INSTALL_DIR = "${STAGING_DIR_NATIVE}/ti-dspbios-native"
+export CE_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine"
+export CMEM_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools"
+export CODEGEN_INSTALL_DIR = "${STAGING_DIR_NATIVE}/ti-cgt6x-native"
+export CROSS_COMPILE = "${CROSS_DIR}/bin/${TARGET_PREFIX}"
+export DMAI_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dmai"
+export FC_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools"
+export LINK_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dsplink-module"
+export LINUXKERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}" 
+export LPM_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools"
+export XDC_INSTALL_DIR = "${STAGING_DIR_NATIVE}/ti-xdctools-native"
+export XDAIS_INSTALL_DIR = "${CE_INSTALL_DIR}/cetools"
+
+export CODEC_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo"
+export CODEC ?= "${CODEC_INSTALL_DIR}"
+
+installdir = "${datadir}/ti"
 
diff --git a/recipes/dvsdk/ti-rules-make-sdk.bb b/recipes/dvsdk/ti-rules-make-sdk.bb
deleted file mode 100644 (file)
index e1890bf..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-DESCRIPTION = "This package creates Rules.make file and copies top label Makefile for rebuilding dvsdk components."
-
-inherit sdk
-
-PR="r7"
-
-FILES=${@os.path.dirname(bb.data.getVar('FILE',d,1))}/files/dvsdk-rules
-
-DEPENDS_dm355-evm = "ti-xdctools-sdk ti-codec-engine-sdk ti-codec-combo-dm355-sdk ti-dmai-sdk"
-DEPENDS_dm6446-evm = "ti-xdctools-sdk ti-codec-engine-sdk ti-codec-combo-dm6446-sdk ti-dmai-sdk ti-cgt6x-sdk ti-dspbios-sdk"
-DEPENDS_omap3evm  = "ti-xdctools-sdk ti-codec-engine-sdk ti-codec-combo-omap3530-sdk ti-dmai-sdk ti-cgt6x-sdk ti-dspbios-sdk"
-DEPENDS_beagleboard = "ti-xdctools-sdk ti-codec-engine-sdk ti-codec-combo-omap3530-sdk ti-dmai-sdk ti-cgt6x-sdk ti-dspbios-sdk"
-
-
-PLATFORM_dm355-evm = "dm355"
-PLATFORM_dm6446-evm = "dm6446"
-PLATFORM_omap3evm = "omap3530"
-PLATFORM_dm6467-evm = "dm6467"
-PLATFORM_beagleboard = "omap3530"
-
-do_install () {
-       mkdir -p  ${D}/${prefix}/dvsdk/ 
-
-       # Create Rules.make file by concatinating pkg Rules.make files.
-       echo "# Define target platform." > ${D}/${prefix}/dvsdk/Rules.make
-       echo "PLATFORM=${PLATFORM}" >> ${D}/${prefix}/dvsdk/Rules.make
-       echo "" >> ${D}/${prefix}/dvsdk/Rules.make
-    echo "# The installation directory of the DVSDK." >> ${D}/${prefix}/dvsdk/Rules.make
-    echo "DVSDK_INSTALL_DIR=${prefix}/dvsdk" >> ${D}/${prefix}/dvsdk/Rules.make
-    echo "" >> ${D}/${prefix}/dvsdk/Rules.make
-    echo "# For backwards compatibility" >> ${D}/${prefix}/dvsdk/Rules.make
-    echo "DVEVM_INSTALL_DIR=\$(DVSDK_INSTALL_DIR)" >> ${D}/${prefix}/dvsdk/Rules.make
-    echo "" >> ${D}/${prefix}/dvsdk/Rules.make
-  
-       for file in `ls -1 ${STAGING_DIR_HOST}/ti-sdk-rules` ; do
-         cat ${STAGING_DIR_HOST}/ti-sdk-rules/${file} >> ${D}/${prefix}/dvsdk/Rules.make
-         echo "" >> ${D}/${prefix}/dvsdk/Rules.make
-       done
-       
-       echo "# The directory that points to your kernel source directory." >>  ${D}/${prefix}/dvsdk/Rules.make 
-       echo "LINUXKERNEL_INSTALL_DIR=${prefix}/${TARGET_SYS}/usr/src/kernel" >> ${D}/${prefix}/dvsdk/Rules.make
-       echo "" >> ${D}/${prefix}/dvsdk/Rules.make
-       echo "# Where temporary Linux headers and libs are installed." >>  ${D}/${prefix}/dvsdk/Rules.make
-       echo "LINUXLIBS_INSTALL_DIR=${prefix}/${TARGET_SYS}/usr" >> ${D}/${prefix}/dvsdk/Rules.make
-       echo "" >> ${D}/${prefix}/dvsdk/Rules.make
-       echo "# The prefix to be added before the GNU compiler tools (optionally including # path), i.e. \"arm_v5t_le-\" or \"/opt/bin/arm_v5t_le-\"." >>  ${D}/${prefix}/dvsdk/Rules.make 
-       echo "CSTOOL_DIR=${SDK_PATH}" >>  ${D}/${prefix}/dvsdk/Rules.make
-       echo "CSTOOL_PREFIX=\$(CSTOOL_DIR)/bin/arm-none-linux-gnueabi-" >> ${D}/${prefix}/dvsdk/Rules.make
-       echo "" >> ${D}/${prefix}/dvsdk/Rules.make
-       echo "MVTOOL_DIR=\$(CSTOOL_DIR)" >>  ${D}/${prefix}/dvsdk/Rules.make
-       echo "MVTOOL_PREFIX=\$(CSTOOL_PREFIX)" >> ${D}/${prefix}/dvsdk/Rules.make
-       echo "" >> ${D}/${prefix}/dvsdk/Rules.make 
-       echo "# Where to copy the resulting executables" >>  ${D}/${prefix}/dvsdk/Rules.make
-       echo "EXEC_DIR=\$(HOME)/install/\$(PLATFORM)" >>  ${D}/${prefix}/dvsdk/Rules.make
-
-       # copy Makefile and other scripts needed by Makefile
-       mkdir -p ${D}/${prefix}/dvsdk/bin
-       cp ${FILES}/Makefile ${D}/${prefix}/dvsdk/
-       cp ${FILES}/info.sh  ${D}/${prefix}/dvsdk/bin
-       cp ${FILES}/check.sh ${D}/${prefix}/dvsdk/bin
-}
-
-FILES_${PN} = "${prefix}/dvsdk/*"
index 4c104a0..5925b18 100644 (file)
@@ -4,10 +4,13 @@ inherit module
 # compile and run time dependencies
 DEPENDS        = "virtual/kernel perl-native"
 
-PV = "2231"
 #This is a kernel module, don't set PR directly
 MACHINE_KERNEL_PR_append = "a"
 
+PV = "2231"
+
+# Download codec_engine_2_23_01.tar.gz from https://www-a.ti.com/downloads/sds_support/targetcontent/CE/ce_2_23/index.html and copy in Arago (or OE) download directory.
+
 SRC_URI = "http://install.source.dir.com/codec_engine_2_23_01.tar.gz "
 
 # Set the source directory
index c37170a..1d6ee67 100644 (file)
@@ -1,6 +1,8 @@
 inherit native
 require ti-xdctools.inc
 
+# download xdctools_setuplinux_3_10_03.bin from https://www-a.ti.com/downloads/sds_support/targetcontent/rtsc/xdctools_3_10/xdctools_3_10_03/index_external.html and copy in Arago (or OE) download directory
+
 SRC_URI        = "http://install.source.dir.com/xdctools_setuplinux_3_10_03.bin"
 BINFILE="xdctools_setuplinux_3_10_03.bin"
 
diff --git a/recipes/dvsdk/ti-xdctools-native_3.15.01.59.bb b/recipes/dvsdk/ti-xdctools-native_3.15.01.59.bb
new file mode 100644 (file)
index 0000000..d06cb8f
--- /dev/null
@@ -0,0 +1,22 @@
+inherit native
+require ti-xdctools.inc
+
+SRC_URI        = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/xdctools_3_15//exports/xdctools_setuplinux_3_15_01_59.bin"
+BINFILE = "xdctools_setuplinux_3_15_01_59.bin"
+
+S = "${WORKDIR}/xdctools_3_15_01_59"
+
+# Yes, the xdc stuff still breaks with a '.' in PWD
+PV = "315"
+PR = "r4"
+
+do_stage() {
+    install -d -m 0755 ${STAGING_DIR_NATIVE}/${PN}
+    cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/${PN}
+       chmod 755 -R  ${STAGING_DIR_NATIVE}/${PN}
+       # rm_work fails if you don't chmod S:
+       chmod 755 -R  ${S}
+}
+
+AUTOTOOLS_NATIVE_STAGE_INSTALL = "1"
+
diff --git a/recipes/dvsdk/ti-xdctools-sdk_3.10.03.bb b/recipes/dvsdk/ti-xdctools-sdk_3.10.03.bb
deleted file mode 100644 (file)
index 43ce1d0..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-inherit sdk
-require ti-xdctools.inc
-
-SRC_URI        = "http://install.source.dir.com/xdctools_setuplinux_3_10_03.bin"
-BINFILE="xdctools_setuplinux_3_10_03.bin"
-
-S = "${WORKDIR}/xdctools_3_10_03"
-
-# Yes, the xdc stuff still breaks with a '.' in PWD
-PV = "310"
-PR = "r16"
-
-do_install() {
-    install -d ${D}/${prefix}/dvsdk/xdctools_3_10_03
-    cp -pPrf ${S}/* ${D}/${prefix}/dvsdk/xdctools_3_10_03
-
-    # Creates rules.make file
-         mkdir -p ${STAGING_DIR_HOST}/ti-sdk-rules
-         echo "# Where the RTSC tools package is installed." > ${STAGING_DIR_HOST}/ti-sdk-rules/xdc.Rules.make
-    echo "XDC_INSTALL_DIR=${prefix}/dvsdk/xdctools_3_10_03" >> ${STAGING_DIR_HOST}/ti-sdk-rules/xdc.Rules.make
-}
-
-FILES_${PN} = "${prefix}/dvsdk/xdctools_3_10_03"
-INSANE_SKIP_${PN} = True
-INHIBIT_PACKAGE_STRIP = "1"