From cdc5462dabd6f055c4e1afece9c321c4cb917350 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 22 Jun 2008 14:16:14 +0000 Subject: dsplink: enhance patches to build against more kernels --- packages/dsplink/dsplink_1.50.bb | 2 +- packages/dsplink/files/prcs-fix-include.patch | 40 +++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/packages/dsplink/dsplink_1.50.bb b/packages/dsplink/dsplink_1.50.bb index ee5fa75d34..99133efdca 100644 --- a/packages/dsplink/dsplink_1.50.bb +++ b/packages/dsplink/dsplink_1.50.bb @@ -5,7 +5,7 @@ RDEPENDS = "update-modules" inherit module -PR = "r1" +PR = "r2" PE = "1" PV = "1.50" diff --git a/packages/dsplink/files/prcs-fix-include.patch b/packages/dsplink/files/prcs-fix-include.patch index 12fcd5ec5d..421bd706f7 100644 --- a/packages/dsplink/files/prcs-fix-include.patch +++ b/packages/dsplink/files/prcs-fix-include.patch @@ -8,3 +8,43 @@ #include #include #include + +--- dvevm_1_00_00_32.orig/dsplink_1_30_07ce/packages/dsplink_dm420/gpp/src/osal/Linux/2.6/isr.c ++++ dsplink_1_50/dsplink/gpp/src/osal/Linux/2.6.18/isr.c +@@ -130,7 +130,7 @@ struct IsrObject_tag { + */ + STATIC + irqreturn_t +-ISR_Callback (int irq, void * arg, struct pt_regs * flags) ; ++ISR_Callback (int irq, void * arg) ; + + + /* ============================================================================ +@@ -664,7 +664,7 @@ ISR_Debug () + */ + STATIC + irqreturn_t +-ISR_Callback (int irq, void * arg, struct pt_regs * flags) ++ISR_Callback (int irq, void * arg) + { + DSP_STATUS status = DSP_SOK ; + IsrObject * isrObj = (IsrObject *) (arg) ; + +--- /tmp/mem.c 2008-06-22 16:05:16.000000000 +0200 ++++ dsplink_1_50/dsplink/gpp/src/osal/Linux/2.6.18/mem.c 2008-06-22 16:05:43.000000000 +0200 +@@ -16,6 +16,7 @@ + + + /* ----------------------------------- OS Specific Headers */ ++ + #include + #include + #if (defined(DM642_PCI) || defined (DM64LC_PCI)) +@@ -31,6 +32,7 @@ + #endif /* if (defined(DM642_PCI) || defined (DM64LC_PCI)) */ + #include + #include ++#include + + /* ----------------------------------- DSP/BIOS Link */ + #include -- cgit v1.2.3 From 420cb94e6cd8153253cb944edd1695bf7f5003ee Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 22 Jun 2008 14:26:51 +0000 Subject: dsplink: more tweaks for Omap --- packages/dsplink/dsplink_1.50.bb | 6 +++++- packages/dsplink/files/CURRENTCFG.MK | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/dsplink/dsplink_1.50.bb b/packages/dsplink/dsplink_1.50.bb index 99133efdca..617309ac1d 100644 --- a/packages/dsplink/dsplink_1.50.bb +++ b/packages/dsplink/dsplink_1.50.bb @@ -5,7 +5,7 @@ RDEPENDS = "update-modules" inherit module -PR = "r2" +PR = "r3" PE = "1" PV = "1.50" @@ -32,7 +32,10 @@ DSPLINKPLATFORM_beagleboard = "Omap" DSPLINKPLATFORM_davinci-sffsdr = "Davinci" DSPLINKPLATFORM_davinci-dvevm = "Davinci" +DSPLINKDSP ?= "C64XX" + export DSPLINKPLATFORM +export DSPLINKDSP do_configure () { cp ${WORKDIR}/CURRENTCFG.MK ${S}/config @@ -44,6 +47,7 @@ do_configure () { -e s:SED_ME_KERNELVERSION:${KERNEL_VERSION}:g \ -e s:SED_ME_DSPDISTRO:davinci_mvlpro5\.0:g \ -e s:SED_ME_PLATFORM:${DSPLINKPLATFORM}:g \ + -e s:SED_ME_DSP:${DSPLINKDSP}:g \ ${S}/config/CURRENTCFG.MK sed -i -e s:SED_ME_CROSS:${STAGING_INCDIR}:g \ diff --git a/packages/dsplink/files/CURRENTCFG.MK b/packages/dsplink/files/CURRENTCFG.MK index ff109de482..c9b000b0ef 100644 --- a/packages/dsplink/files/CURRENTCFG.MK +++ b/packages/dsplink/files/CURRENTCFG.MK @@ -47,8 +47,8 @@ export DSPPLATFORM := SED_ME_PLATFORM # ========================================================= # Target GPP and DSP devices # ========================================================= -export GPPDEVICE := Davinci -export DSPDEVICE := C64XX +export GPPDEVICE := SED_ME_PLATFORM +export DSPDEVICE := SED_ME_DSP # ========================================================= -- cgit v1.2.3 From 3b9a9271fa99db90c7b4b2b4af60dc8c3d4d6bab Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 22 Jun 2008 15:17:20 +0000 Subject: codec-engine: sed make rules to use OE toolchain(s) --- packages/dsplink/codec-engine_2.10.bb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/dsplink/codec-engine_2.10.bb b/packages/dsplink/codec-engine_2.10.bb index a17d9af9f5..d5aaa1b4c1 100644 --- a/packages/dsplink/codec-engine_2.10.bb +++ b/packages/dsplink/codec-engine_2.10.bb @@ -12,10 +12,22 @@ PV = "2.10" # md5sum # Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/CE/index.html -SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_10.tar.gz \ +SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_10_01.tar.gz \ " -S = "${WORKDIR}/codec_engine_2_10/codec-engine" +S = "${WORKDIR}/codec_engine_2_10_01" + +do_compile() { + cd ${S}/cetools/packages/ti/sdo/linuxutils/cmem + sed -i \ + -e s:/db/toolsrc/library/vendors2005/mvl/arm/mvl4.0.1-root-new/montavista/pro/devkit/arm/v5t_le/bin/arm_v5t_le-:${TARGET_PREFIX}:g \ + -e s:/db/toolsrc/library/vendors2005/opensource/buildroot/10122007/build_arm/staging_dir/usr/bin/arm-linux-:${TARGET_PREFIX}:g \ + -e s:/db/toolsrc/library/vendors2005/mvl/arm/DaVinci-Linux-Rel_mvl401c/Linux:${STAGING_KERNEL_DIR}:g \ + Rules.make + + oe_runmake clean + oe_runmake +} pkg_postinst_${PN}-module () { if [ -n "$D" ]; then -- cgit v1.2.3 From 618a56b09edae3d5e956f23c6b84c4b70d8e5202 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 22 Jun 2008 16:55:15 +0000 Subject: codec-engine: build & package cmemk module --- packages/dsplink/codec-engine_2.10.bb | 39 ++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/packages/dsplink/codec-engine_2.10.bb b/packages/dsplink/codec-engine_2.10.bb index d5aaa1b4c1..8968a0ce02 100644 --- a/packages/dsplink/codec-engine_2.10.bb +++ b/packages/dsplink/codec-engine_2.10.bb @@ -18,19 +18,47 @@ SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_10_01.tar.gz \ S = "${WORKDIR}/codec_engine_2_10_01" do_compile() { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS cd ${S}/cetools/packages/ti/sdo/linuxutils/cmem sed -i \ -e s:/db/toolsrc/library/vendors2005/mvl/arm/mvl4.0.1-root-new/montavista/pro/devkit/arm/v5t_le/bin/arm_v5t_le-:${TARGET_PREFIX}:g \ -e s:/db/toolsrc/library/vendors2005/opensource/buildroot/10122007/build_arm/staging_dir/usr/bin/arm-linux-:${TARGET_PREFIX}:g \ -e s:/db/toolsrc/library/vendors2005/mvl/arm/DaVinci-Linux-Rel_mvl401c/Linux:${STAGING_KERNEL_DIR}:g \ + -e s:/opt/mv_pro_4.0/montavista/pro/devkit/arm/v5t_le/target/opt/dvevm:${D}:g \ Rules.make oe_runmake clean - oe_runmake + oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ + KERNEL_SRC=${STAGING_KERNEL_DIR} \ + KERNEL_VERSION=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" \ + release + oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ + KERNEL_SRC=${STAGING_KERNEL_DIR} \ + KERNEL_VERSION=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" \ + debug + oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ + KERNEL_SRC=${STAGING_KERNEL_DIR} \ + KERNEL_VERSION=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" +} + +do_install() { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + cd ${S}/cetools/packages/ti/sdo/linuxutils/cmem + oe_runmake install + install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp + mv ${D}/cmemk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp + install -d ${D}/${base_sbindir} + cd ${D} ; mv apitest apitestd multi_process multi_processd translate translated ${D}/${base_sbindir} } pkg_postinst_${PN}-module () { - if [ -n "$D" ]; then + if [ -n "$D" ]; then exit 1 fi depmod -a @@ -41,8 +69,9 @@ pkg_postrm_${PN}-module () { update-modules || true } -PACKAGES =+ "${PN}-module" -FILES_${PN}-module = "${sysconfdir} /lib/modules" +PACKAGES =+ "dsplink-cmemk-module" +FILES_dsplink-cmemk-module = "${sysconfdir} /lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/*ko" -PACKAGE_ARCH = "${MACHINE_ARCH}" +FILES_${PN} = "${base_sbindir}" +PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3 From 5778b1ceca452a9230386c0497c9522997d2ffcf Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 22 Jun 2008 17:06:15 +0000 Subject: bluez-utils: fix do_install. passkey-agent moved to test/ --- packages/bluez/bluez-utils3.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/bluez/bluez-utils3.inc b/packages/bluez/bluez-utils3.inc index 80579cef44..0bbba2cd14 100644 --- a/packages/bluez/bluez-utils3.inc +++ b/packages/bluez/bluez-utils3.inc @@ -82,7 +82,8 @@ do_install_append() { chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ install -m 0644 ${S}/rfcomm/rfcomm.conf ${D}${sysconfdir}/bluetooth/ - install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/ + install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/ ||true + install -m 0755 ${S}/test/.libs/passkey-agent ${D}${base_bindir}/ ||true } -- cgit v1.2.3