From b13f1cef96ed0d0298b54b192cbe70af7ff84d90 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 18 Feb 2009 10:35:53 +0100 Subject: dmai: comment out install, add staging --- packages/dsplink/dmai_1.20.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/dsplink/dmai_1.20.bb b/packages/dsplink/dmai_1.20.bb index b7a03f59de..134f8230c8 100644 --- a/packages/dsplink/dmai_1.20.bb +++ b/packages/dsplink/dmai_1.20.bb @@ -39,9 +39,10 @@ do_compile() { } do_install () { - oe_runmake install + echo oe_runmake install } do_stage () { - : + install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dmai + cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dmai } -- cgit v1.2.3 From 87360d6fd8ce0db2a47db70a468b470bb7fa372f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 18 Feb 2009 10:36:39 +0100 Subject: gstreamer-ti: add more vars to make xdc a bit happier --- packages/dsplink/gstreamer-ti_svn.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'packages') diff --git a/packages/dsplink/gstreamer-ti_svn.bb b/packages/dsplink/gstreamer-ti_svn.bb index c4be68c6b4..dff8f15c9f 100644 --- a/packages/dsplink/gstreamer-ti_svn.bb +++ b/packages/dsplink/gstreamer-ti_svn.bb @@ -12,6 +12,28 @@ inherit autotools require ti-paths.inc +export DMAI_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dmai" +export CE_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine/cetools" +export CODEC_INSTALL_DIR = "" + +export XDC_TARGET = "gnu.targets.arm.GCArmv5T" + +XDC_PLATFORM = "foo" +# Assume every TI armv7a cpu is a 3530 +XDC_PLATFORM_armv7a = "ti.platforms.evm3530" +export XDC_PLATFORM + +# We need to add this to config.bld: +#GCArmv5T.cc.$unseal("opts"); +#GCArmv5T.cc.opts = "SEDME_CCARCH"; +#GCArmv5T.cc.$seal("opts"); + +do_compile_prepend() { + for i in $(find ${S} -name "config.bld") ; do + sed -i -e s:SEDME_CCARCH:'${TARGET_CCARCH}': $i + done +} + CPPFLAGS_append = " -DPlatform_${PLATFORM}" PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3 From ef3439f88221ab81fabb155e3282aac104da556c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 18 Feb 2009 13:59:23 +0100 Subject: linux-omap-pm: add patch to register all OPPs, tweak defconfig --- packages/linux/linux-omap-pm/beagleboard/defconfig | 16 ++++++++++------ packages/linux/linux-omap-pm/register-all-OPPs.diff | 12 ++++++++++++ packages/linux/linux-omap-pm_git.bb | 3 ++- 3 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 packages/linux/linux-omap-pm/register-all-OPPs.diff (limited to 'packages') diff --git a/packages/linux/linux-omap-pm/beagleboard/defconfig b/packages/linux/linux-omap-pm/beagleboard/defconfig index 518986359b..36881866d1 100644 --- a/packages/linux/linux-omap-pm/beagleboard/defconfig +++ b/packages/linux/linux-omap-pm/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28-omap1 -# Tue Feb 17 22:52:35 2009 +# Wed Feb 18 13:57:41 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1489,7 +1489,7 @@ CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_DYNAMIC_MINORS is not set CONFIG_USB_SUSPEND=y -# CONFIG_USB_OTG is not set +CONFIG_USB_OTG=y # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set CONFIG_USB_MON=y @@ -1500,9 +1500,11 @@ CONFIG_USB_MON=y # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD is not set -# CONFIG_USB_EHCI_HCD is not set -# CONFIG_OMAP_EHCI_PHY_MODE is not set +CONFIG_USB_EHCI_HCD=y +CONFIG_OMAP_EHCI_PHY_MODE=y # CONFIG_OMAP_EHCI_TLL_MODE is not set +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +# CONFIG_USB_EHCI_TT_NEWSCHED is not set # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_OHCI_HCD is not set # CONFIG_USB_SL811_HCD is not set @@ -1515,9 +1517,10 @@ CONFIG_USB_MUSB_SOC=y # OMAP 343x high speed USB support # # CONFIG_USB_MUSB_HOST is not set -CONFIG_USB_MUSB_PERIPHERAL=y -# CONFIG_USB_MUSB_OTG is not set +# CONFIG_USB_MUSB_PERIPHERAL is not set +CONFIG_USB_MUSB_OTG=y CONFIG_USB_GADGET_MUSB_HDRC=y +CONFIG_USB_MUSB_HDRC_HCD=y # CONFIG_MUSB_PIO_ONLY is not set CONFIG_USB_INVENTRA_DMA=y # CONFIG_USB_TI_CPPI_DMA is not set @@ -1638,6 +1641,7 @@ CONFIG_USB_LED=m # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_FTDI_ELAN is not set # CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA is not set # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set diff --git a/packages/linux/linux-omap-pm/register-all-OPPs.diff b/packages/linux/linux-omap-pm/register-all-OPPs.diff new file mode 100644 index 0000000000..95e6b9bfab --- /dev/null +++ b/packages/linux/linux-omap-pm/register-all-OPPs.diff @@ -0,0 +1,12 @@ +--- /tmp/clock34xx.c 2009-02-18 13:51:18.000000000 +0100 ++++ git/arch/arm/mach-omap2/clock34xx.c 2009-02-18 13:51:51.000000000 +0100 +@@ -698,8 +698,7 @@ + if (!mpu_opps) + return; + +- /* Avoid registering the 120% Overdrive with CPUFreq */ +- prcm = mpu_opps + MAX_VDD1_OPP - 1; ++ prcm = mpu_opps + MAX_VDD1_OPP; + for (; prcm->rate; prcm--) { + freq_table[i].index = i; + freq_table[i].frequency = prcm->rate / 1000; diff --git a/packages/linux/linux-omap-pm_git.bb b/packages/linux/linux-omap-pm_git.bb index 6481b0caf5..ddaff331a4 100644 --- a/packages/linux/linux-omap-pm_git.bb +++ b/packages/linux/linux-omap-pm_git.bb @@ -10,7 +10,7 @@ DEFAULT_PREFERENCE = "-1" SRCREV = "65d02c2c7fe676369b7162459feec60268c7f4ba" PV = "2.6.28-pm1+gitr${SRCREV}" -PR = "r1" +PR = "r2" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git;protocol=git;branch=pm \ file://defconfig" @@ -45,6 +45,7 @@ SRC_URI_append = " \ file://0001-ASoC-Add-support-for-OMAP3-EVM.patch;patch=1 \ file://0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch;patch=1 \ file://dss2.diff;patch=1 \ + file://register-all-OPPs.diff;patch=1 \ " -- cgit v1.2.3 From 09b88241b5e95c441544a02c50db885cbf6d8ee8 Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Wed, 18 Feb 2009 14:04:06 +0100 Subject: dmai: update 1.20, remove obsolete 1.16 --- packages/dsplink/dmai_1.16.bb | 37 ------------------------------------- packages/dsplink/dmai_1.20.bb | 14 +++++++------- 2 files changed, 7 insertions(+), 44 deletions(-) delete mode 100644 packages/dsplink/dmai_1.16.bb (limited to 'packages') diff --git a/packages/dsplink/dmai_1.16.bb b/packages/dsplink/dmai_1.16.bb deleted file mode 100644 index 456800c37c..0000000000 --- a/packages/dsplink/dmai_1.16.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Davinci (and OMAP) Multimedia Application Interface" -DEPENDS = "virtual/kernel codec-engine" -LICENCE = "unknown" - -require ti-paths.inc - -# https://www-a.ti.com/downloads/sds_support/applications_packages/dmai/dmai_1_16_00_03/dmai_setuplinux_1_16_00_03.bin -# Install the above link and put the dmai_1_16_00_03.tar.gz file in the same directory as this recipe -SRC_URI = "file://dmai_1_16_00_03.tar.gz \ - " - -S = "${WORKDIR}/dmai_1_16_00_03" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -TARGET = "all" -TARGET_neuros-osd2 = " dm6446_al dm6446_db" - -export CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine/cetools" - -do_compile() { - cd packages/ti/sdo/dmai - oe_runmake clean - oe_runmake ${TARGET} - cd packages/ti/sdo/dmai/apps - oe_runmake clean - oe_runmake ${TARGET} -} - -do_install () { - oe_runmake install -} - -do_stage () { - : -} - diff --git a/packages/dsplink/dmai_1.20.bb b/packages/dsplink/dmai_1.20.bb index 134f8230c8..9a549c3efb 100644 --- a/packages/dsplink/dmai_1.20.bb +++ b/packages/dsplink/dmai_1.20.bb @@ -7,13 +7,13 @@ require ti-paths.inc # https://www-a.ti.com/downloads/sds_support/applications_packages/dmai/dmai_1_20_00_06/dmai_setuplinux_1_20_00_06.bin # Install the above link and put the dmai_1_20_00_06.tar.gz file in the same directory as this recipe SRC_URI = "file://dmai_1_20_00_06.tar.gz \ - file://update-cpu-name.patch;patch=1 \ - file://update-fb-display.patch;patch=1 \ - file://update-v4l2-display.patch;patch=1 \ - file://do-not-panic-on-mixer-failure.patch;patch=1 \ - file://support-32bit-align.patch;patch=1 \ - file://built-with-angstrom.patch;patch=1 \ - file://unbreak-xdc-args.patch;patch=1 \ + file://dmai-update-cpu-name.patch;patch=1 \ + file://dmai-update-fb-display.patch;patch=1 \ + file://dmai-update-v4l2-display.patch;patch=1 \ + file://dmai-do-not-panic-on-mixer-failure.patch;patch=1 \ + file://dmai-support-32bit-align.patch;patch=1 \ + file://dmai-built-with-angstrom.patch;patch=1 \ + file://dmai-unbreak-xdc-args.patch;patch=1 \ " S = "${WORKDIR}/dmai_1_20_00_06" -- cgit v1.2.3 From 9485db7d15f237dea8cc841e6a1b5bc4930f15da Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Wed, 18 Feb 2009 14:05:11 +0100 Subject: codec-engine: fix lpm build and clean up old files --- packages/dsplink/codec-engine_2.21.bb | 7 +- packages/dsplink/dsplink.inc | 34 +-- packages/dsplink/dsplink_1.60.bb | 2 +- packages/dsplink/files/Makefile-dsplink-kbuild | 74 ------- packages/dsplink/files/Makefile.dsplink | 59 ------ packages/dsplink/files/built-with-angstrom.patch | 48 ----- packages/dsplink/files/cmemk-class-device-27.diff | 11 - .../dsplink/files/dmai-built-with-angstrom.patch | 48 +++++ .../files/dmai-do-not-panic-on-mixer-failure.patch | 31 +++ .../dsplink/files/dmai-support-32bit-align.patch | 17 ++ packages/dsplink/files/dmai-unbreak-xdc-args.patch | 13 ++ packages/dsplink/files/dmai-update-cpu-name.patch | 16 ++ .../dsplink/files/dmai-update-fb-display.patch | 77 +++++++ .../dsplink/files/dmai-update-v4l2-display.patch | 127 +++++++++++ .../files/do-not-panic-on-mixer-failure.patch | 31 --- .../files/lpm-make-symbol-warnings-fix.patch | 117 +++++++++++ packages/dsplink/files/support-32bit-align.patch | 17 -- packages/dsplink/files/unbreak-xdc-args.patch | 13 -- packages/dsplink/files/update-cpu-name.patch | 16 -- packages/dsplink/files/update-fb-display.patch | 77 ------- packages/dsplink/files/update-v4l2-display.patch | 127 ----------- packages/dsplink/files/xdcpaths.mak | 232 --------------------- packages/dsplink/readme.txt | 2 +- 23 files changed, 471 insertions(+), 725 deletions(-) delete mode 100644 packages/dsplink/files/Makefile-dsplink-kbuild delete mode 100755 packages/dsplink/files/Makefile.dsplink delete mode 100644 packages/dsplink/files/built-with-angstrom.patch delete mode 100644 packages/dsplink/files/cmemk-class-device-27.diff create mode 100644 packages/dsplink/files/dmai-built-with-angstrom.patch create mode 100644 packages/dsplink/files/dmai-do-not-panic-on-mixer-failure.patch create mode 100644 packages/dsplink/files/dmai-support-32bit-align.patch create mode 100644 packages/dsplink/files/dmai-unbreak-xdc-args.patch create mode 100644 packages/dsplink/files/dmai-update-cpu-name.patch create mode 100644 packages/dsplink/files/dmai-update-fb-display.patch create mode 100644 packages/dsplink/files/dmai-update-v4l2-display.patch delete mode 100644 packages/dsplink/files/do-not-panic-on-mixer-failure.patch create mode 100644 packages/dsplink/files/lpm-make-symbol-warnings-fix.patch delete mode 100644 packages/dsplink/files/support-32bit-align.patch delete mode 100644 packages/dsplink/files/unbreak-xdc-args.patch delete mode 100644 packages/dsplink/files/update-cpu-name.patch delete mode 100644 packages/dsplink/files/update-fb-display.patch delete mode 100644 packages/dsplink/files/update-v4l2-display.patch delete mode 100644 packages/dsplink/files/xdcpaths.mak (limited to 'packages') diff --git a/packages/dsplink/codec-engine_2.21.bb b/packages/dsplink/codec-engine_2.21.bb index 5040867178..3ecef31235 100644 --- a/packages/dsplink/codec-engine_2.21.bb +++ b/packages/dsplink/codec-engine_2.21.bb @@ -8,7 +8,7 @@ RDEPENDS = "update-modules" inherit module # tconf from xdctools dislikes '.' in pwd :/ -PR = "r8" +PR = "r9" PV = "221" # Get CE tarball from TI website, place in sources and calculate @@ -19,8 +19,7 @@ SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz \ file://cmem-class-device-27-and-sched-include-fix.patch;patch=1 \ file://dsplink-semaphore-27.patch;patch=1 \ file://lpm-device-create-and-semaphore-include-fix.patch;patch=1 \ - file://Makefile.dsplink \ - file://Makefile-dsplink-kbuild \ + file://lpm-make-symbol-warnings-fix.patch;patch=1 \ file://Makefile-dsplink-gpp \ file://Makefile-dsplink-dsp \ " @@ -76,7 +75,7 @@ do_compile_append() { do_stage_append() { install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine - cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine/ + cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine/ ln -sf ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine/packages/ti/sdo/ce ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine/cetools/packages/ti/sdo/ } diff --git a/packages/dsplink/dsplink.inc b/packages/dsplink/dsplink.inc index 002d08d2a7..f617a7e3d8 100644 --- a/packages/dsplink/dsplink.inc +++ b/packages/dsplink/dsplink.inc @@ -58,36 +58,42 @@ do_compile () { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS export KDIR=${STAGING_KERNEL_DIR} - make -e all + + make -e driver + make -e library + make -e samples + make -e -f ${WORKDIR}/Makefile-dsplink-dsp + cp -a * ${DSPLINK}/gpp/export/BIN/Linux/${DSPLINKPLATFORM}/RELEASE #lpm bits if [ -e ${S}/cetools/packages/ti/bios/power/ ] ; then - echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make - echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make - echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}" >> ${S}/Rules.make - #export DSPLINK=${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dsplink - + # Build the DSP power manager kernel module cd ${S}/cetools/packages/ti/bios/power/modules/${DSPPOWERSOC}/lpm + # Still need to move this into the patch file if [ $(echo ${KERNEL_VERSION} | cut -c5,6) -gt 26 ] ; then sed -i -e s:asm/semaphore:linux/semaphore: lpm_driver.c fi + #what is this for? rm -f *o - make KERNEL_PATH=${STAGING_KERNEL_DIR} \ - KERNEL_SRC=${STAGING_KERNEL_DIR} \ - KERNEL_DIR=${STAGING_KERNEL_DIR} \ - KERNEL_VERSION=${KERNEL_VERSION} \ - TOOL_PREFIX=${TARGET_PREFIX} \ - DSPLINK_REPO=${DSPLINK}/../ \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - AR="${KERNEL_AR}" + + # lpm also needs KERNEL_INSTALL_DIR and MVTOOL_PREFIX which come from ti-paths.inc + export DSPLINK_REPO=${DSPLINK}/.. + # should move the clean step into the clean stage.. + #oe_runmake clean + oe_runmake fi #cmemk bits if [ -e ${S}/cetools/packages/ti/sdo/linuxutils/cmem ] ; then + echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make + echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make + echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}" >> ${S}/Rules.make + #export DSPLINK=${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dsplink + # Build the cmem kernel module # We unset CFLAGS because kernel modules need different ones, this is basically a verbatim copy of kernel.bbclass and module-base.bbclass unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS diff --git a/packages/dsplink/dsplink_1.60.bb b/packages/dsplink/dsplink_1.60.bb index 3814f6353e..127e559319 100644 --- a/packages/dsplink/dsplink_1.60.bb +++ b/packages/dsplink/dsplink_1.60.bb @@ -1,7 +1,7 @@ require dsplink.inc # The tconf tool breaks if there is a '.' in your pwd -PR = "r8" +PR = "r9" PE = "1" PV = "160" diff --git a/packages/dsplink/files/Makefile-dsplink-kbuild b/packages/dsplink/files/Makefile-dsplink-kbuild deleted file mode 100644 index 0fdf896c86..0000000000 --- a/packages/dsplink/files/Makefile-dsplink-kbuild +++ /dev/null @@ -1,74 +0,0 @@ -# Composite Makefile -DIRSEP=/ - -TI_DSPLINK_RELATIVE_PATH := ../ - -# include the CURRENTCFG.mk -include $(DSPLINK)$(DIRSEP)config$(DIRSEP)BUILD$(DIRSEP)CURRENTCFG.MK - -# Generate the list of sources -SOURCES := -include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)arch$(DIRSEP)SOURCES -ARCH_SOURCES := $(addprefix $(TI_DSPLINK_RELATIVE_PATH)gpp$(DIRSEP)src$(DIRSEP)arch$(DIRSEP),$(SOURCES)) -SOURCES := -include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)ldrv$(DIRSEP)SOURCES -LDRV_SOURCES := $(addprefix $(TI_DSPLINK_RELATIVE_PATH)gpp$(DIRSEP)src$(DIRSEP)ldrv$(DIRSEP),$(SOURCES)) -SOURCES := -include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)ldrv$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)SOURCES -LDRV_SOURCES += $(addprefix $(TI_DSPLINK_RELATIVE_PATH)gpp$(DIRSEP)src$(DIRSEP)ldrv$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP),$(SOURCES)) -SOURCES := -include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)gen$(DIRSEP)SOURCES -GEN_SOURCES := $(addprefix $(TI_DSPLINK_RELATIVE_PATH)gpp$(DIRSEP)src$(DIRSEP)gen$(DIRSEP),$(SOURCES)) -SOURCES := -include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)pmgr$(DIRSEP)SOURCES -PMGR_SOURCES := $(addprefix $(TI_DSPLINK_RELATIVE_PATH)gpp$(DIRSEP)src$(DIRSEP)pmgr$(DIRSEP),$(SOURCES)) -SOURCES := -include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)pmgr$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)SOURCES -PMGR_SOURCES += $(addpreifx $(TI_DSPLINK_RELATIVE_PATH)gpp$(DIRSEP)src$(DIRSEP)pmgr$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP),$(SOURCES)) -SOURCES := -include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)pmgr$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)$(TI_DSPLINK_GPPOSVERSION)$(DIRSEP)SOURCES -PMGR_SOURCES += $(addprefix $(TI_DSPLINK_RELATIVE_PATH)gpp$(DIRSEP)src$(DIRSEP)pmgr$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)$(TI_DSPLINK_GPPOSVERSION)$(DIRSEP),$(SOURCES)) -SOURCES := -include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)osal$(DIRSEP)$(DIRSEP)SOURCES -OSAL_SOURCES := $(addprefix $(TI_DSPLINK_RELATIVE_PATH)gpp$(DIRSEP)src$(DIRSEP)osal$(DIRSEP)$(DIRSEP),$(SOURCES)) -SOURCES := -include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)osal$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)SOURCES -OSAL_SOURCES += $(addprefix $(TI_DSPLINK_RELATIVE_PATH)gpp$(DIRSEP)src$(DIRSEP)osal$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP),$(SOURCES)) -SOURCES := -include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)osal$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)$(TI_DSPLINK_GPPOSVERSION)$(DIRSEP)SOURCES -OSAL_SOURCES += $(addprefix $(TI_DSPLINK_RELATIVE_PATH)gpp$(DIRSEP)src$(DIRSEP)osal$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)$(TI_DSPLINK_GPPOSVERSION)$(DIRSEP),$(SOURCES)) - -DSPLINK_SOURCES := $(ARCH_SOURCES) $(LDRV_SOURCES) $(GEN_SOURCES) $(OSAL_SOURCES) $(PMGR_SOURCES) -DSPLINK_OBJS := $(foreach srcFile, $(DSPLINK_SOURCES),$(basename $(srcFile)).o) - -################################################################################################ -# USER SIDE -# Generate the list of sources -SOURCES := -include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)api$(DIRSEP)SOURCES -API_SOURCES := $(addprefix $(TI_DSPLINK_RELATIVE_PATH)gpp$(DIRSEP)src$(DIRSEP)api$(DIRSEP),$(SOURCES)) -SOURCES := -include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)api$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)SOURCES -API_SOURCES += $(addprefix $(TI_DSPLINK_RELATIVE_PATH)gpp$(DIRSEP)src$(DIRSEP)api$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP),$(SOURCES)) - -# CFLAGS -EXTRA_CFLAGS = $(addprefix -D, $(TI_DSPLINK_GPP_DEFINES)) -EXTRA_CFLAGS += $(addprefix -I, $(TI_DSPLINK_GPP_INC_PATH)) -EXTRA_CFLAGS += -DEXPORT_SYMTAB -EXTRA_CFLAGS += -DTRACE_KERNEL - -ifneq ($(KERNELRELEASE),) -obj-m := dsplinkk.o -libs-m := $(shell pwd) -lib-m := $(foreach srcFile, $(API_SOURCES),$(basename $(srcFile)).o) -dsplinkk-objs := $(DSPLINK_OBJS) -else -KDIR := /opt/montavista/pro/devkit/lsp/ti-davinci/linux-2.6.18_pro500 -PWD := $(shell pwd) -all: - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules -endif - -clean: - find $(DSPLINK) -name "*.o" -exec rm {} \; - rm -fr dsplinkk.ko dsplinkk.mod.c Module.symvers diff --git a/packages/dsplink/files/Makefile.dsplink b/packages/dsplink/files/Makefile.dsplink deleted file mode 100755 index f3228dd9e7..0000000000 --- a/packages/dsplink/files/Makefile.dsplink +++ /dev/null @@ -1,59 +0,0 @@ -# -# ======== makeunix ======== -# - -# Import Tools Path from Rules.make -#include Rules.make - -PROJECT_BASE_DIR = $(shell pwd) -LINUXKERNEL_INSTALL_DIR:=some-path/kernel -LINK_INSTALL_DIR := some-path/dsplink_1_51/dsplink - -# The prefix to be added before the GNU compiler tools (optionally including -# path), i.e. "arm_v5t_le-" or "/opt/bin/arm_v5t_le-". -GPPTOOL_DIR:=some-path/cross - -# ---- DSP tools ---- -DSP_BASE_CGTOOLS := some-path/cg6x_6_0_19 -DSP_BASE_BIOS := some-path/bios_5_32_03 -DSP_BASE_RTDX := some-path/bios_5_32_03/packages/ti/rtdx -OSINC_PLATFORM1 := something -ARCHIVER_AR := something - - -# ---- construct Link build make vars ---- -GPP_MAKE_OPTS := COMPILER=$(GPPTOOL_DIR)/bin/arm-angstrom-linux-gnueabi-gcc \ - LINKER=$(GPPTOOL_DIR)/bin/arm-angstrom-linux-gnueabi-gcc \ - LD=$(GPPTOOL_DIR)/bin/arm-angstrom-linux-gnueabi-ld \ - ARCHIVER1=$(GPPTOOL_DIR)/bin/arm-angstrom-linux-gnueabi-ld \ - ARCHIVER2=$(GPPTOOL_DIR)/bin/arm-angstrom-linux-gnueabi-ld \ - CROSS_COMPILE=arm-angstrom-linux-gnueabi- \ - DSPLINK=$(LINK_INSTALL_DIR) \ - BASE_TOOLCHAIN=$(GPPTOOL_DIR) \ - BASE_BUILDOS=$(LINUXKERNEL_INSTALL_DIR) \ - ARCHIVER=$(ARCHIVER_AR) OSINC_PLATFORM=$(OSINC_PLATFORM1) \ - -DSP_MAKE_OPTS := DSPLINK=$(DSPLINK) \ - DPPROOT=$(DSPLINK)/dsp \ - BASE_SABIOS=$(DSP_BASE_BIOS) \ - BASE_CGTOOLS=$(DSP_BASE_CGTOOLS) \ - BASE_RTDX=$(DSP_BASE_RTDX) - - -# ======== all ======== -all: $(LINK_INSTALL_DIR)/packages/dsplink/gpp/export/BIN/Linux/Davinci/RELEASE/dsplinkk.ko - -$(LINK_INSTALL_DIR)/packages/dsplink/gpp/export/BIN/Linux/Davinci/RELEASE/dsplinkk.ko: - @echo Building DSPLINK GPP driver, libs - #make -s -C $(LINK_INSTALL_DIR)/gpp/src $(GPP_MAKE_OPTS) - make -s -C $(DSPLINK)/gpp/src/samples $(GPP_MAKE_OPTS) - @echo Building DSPLINK DSP libs and message sample for DaVinci... - make -C $(DSPLINK)/dsp/src $(DSP_MAKE_OPTS) - make -C $(DSPLINK)/dsp/src/samples $(DSP_MAKE_OPTS) - -# clean rules -clean: - @echo Cleaning DSPLINK GPP driver, libs - make -s -C $(LINK_INSTALL_DIR)/gpp/src $(GPP_MAKE_OPTS) clean - @rm -rf $(LINK_INSTALL_DIR)/gpp/export/BIN/* - @rm -rf $(LINK_INSTALL_DIR)/gpp/export/INCLUDE/* diff --git a/packages/dsplink/files/built-with-angstrom.patch b/packages/dsplink/files/built-with-angstrom.patch deleted file mode 100644 index fc49789718..0000000000 --- a/packages/dsplink/files/built-with-angstrom.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: dmai_1_20_00_06/packages/config.bld -=================================================================== ---- dmai_1_20_00_06.orig/packages/config.bld 2009-02-11 19:38:51.000000000 -0600 -+++ dmai_1_20_00_06/packages/config.bld 2009-02-11 19:39:23.000000000 -0600 -@@ -42,7 +42,7 @@ - - /* location of the Codec Sourcery Arm9 tools */ - var GCArmv5T = xdc.useModule('gnu.targets.arm.GCArmv5T'); --GCArmv5T.LONGNAME = 'bin/arm-none-linux-gnueabi-gcc'; -+GCArmv5T.LONGNAME = 'bin/arm-angstrom-linux-gnueabi-gcc'; - GCArmv5T.platform = "ti.platforms.evm3530"; - GCArmv5T.rootDir = java.lang.System.getenv("CSTOOL_DIR"); - -Index: dmai_1_20_00_06/packages/ti/sdo/dmai/Makefile -=================================================================== ---- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/Makefile 2009-02-11 19:39:57.000000000 -0600 -+++ dmai_1_20_00_06/packages/ti/sdo/dmai/Makefile 2009-02-11 19:58:05.000000000 -0600 -@@ -33,7 +33,7 @@ - DMAI_INSTALL_DIR = ../../../.. - TARGET = dmai - --include $(DMAI_INSTALL_DIR)/Rules.make -+#include $(DMAI_INSTALL_DIR)/Rules.make - - # Should the full command be echoed to the console during build? - VERBOSE=false -@@ -64,7 +64,7 @@ - MVL_CPP_FLAGS = $(GNU_CPP_FLAGS) -Dxdc_target_name__=MVArm9 - CS_CPP_FLAGS = $(GNU_CPP_FLAGS) -Dxdc_target_name__=codesourcery/GCArmv5T - --GNU_C_FLAGS = $(C_FLAGS) -Wall -Werror -+GNU_C_FLAGS = $(C_FLAGS) -Wall - C64P_C_FLAGS = $(C_FLAGS) - - GNU_AR_FLAGS = $(AR_FLAGS) -Index: dmai_1_20_00_06/packages/ti/sdo/dmai/apps/Makefile.app -=================================================================== ---- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/apps/Makefile.app 2009-02-11 19:58:44.000000000 -0600 -+++ dmai_1_20_00_06/packages/ti/sdo/dmai/apps/Makefile.app 2009-02-11 19:59:01.000000000 -0600 -@@ -34,7 +34,7 @@ - ifndef DMAI_INSTALL_DIR - DMAI_INSTALL_DIR = ../../../../../.. - endif --include $(DMAI_INSTALL_DIR)/Rules.make -+#include $(DMAI_INSTALL_DIR)/Rules.make - - # Should the full command be echoed to the console during build? - VERBOSE=false diff --git a/packages/dsplink/files/cmemk-class-device-27.diff b/packages/dsplink/files/cmemk-class-device-27.diff deleted file mode 100644 index 1c51323457..0000000000 --- a/packages/dsplink/files/cmemk-class-device-27.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/cmemk.c 2008-12-11 12:21:22.000000000 +0100 -+++ src/module/cmemk.c 2008-12-11 12:22:39.000000000 +0100 -@@ -1710,7 +1710,7 @@ - #ifdef USE_CLASS_DEVICE - class_device_create(cmem_class, NULL, MKDEV(cmem_major, 0), NULL, "cmem"); - #else -- device_create(cmem_class, NULL, MKDEV(cmem_major, 0), "cmem"); -+ device_create(cmem_class, NULL, MKDEV(cmem_major, 0), NULL, "cmem"); - #endif // USE_CLASS_DEVICE - #endif // USE_CLASS_SIMPLE - #endif // USE_UDEV diff --git a/packages/dsplink/files/dmai-built-with-angstrom.patch b/packages/dsplink/files/dmai-built-with-angstrom.patch new file mode 100644 index 0000000000..fc49789718 --- /dev/null +++ b/packages/dsplink/files/dmai-built-with-angstrom.patch @@ -0,0 +1,48 @@ +Index: dmai_1_20_00_06/packages/config.bld +=================================================================== +--- dmai_1_20_00_06.orig/packages/config.bld 2009-02-11 19:38:51.000000000 -0600 ++++ dmai_1_20_00_06/packages/config.bld 2009-02-11 19:39:23.000000000 -0600 +@@ -42,7 +42,7 @@ + + /* location of the Codec Sourcery Arm9 tools */ + var GCArmv5T = xdc.useModule('gnu.targets.arm.GCArmv5T'); +-GCArmv5T.LONGNAME = 'bin/arm-none-linux-gnueabi-gcc'; ++GCArmv5T.LONGNAME = 'bin/arm-angstrom-linux-gnueabi-gcc'; + GCArmv5T.platform = "ti.platforms.evm3530"; + GCArmv5T.rootDir = java.lang.System.getenv("CSTOOL_DIR"); + +Index: dmai_1_20_00_06/packages/ti/sdo/dmai/Makefile +=================================================================== +--- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/Makefile 2009-02-11 19:39:57.000000000 -0600 ++++ dmai_1_20_00_06/packages/ti/sdo/dmai/Makefile 2009-02-11 19:58:05.000000000 -0600 +@@ -33,7 +33,7 @@ + DMAI_INSTALL_DIR = ../../../.. + TARGET = dmai + +-include $(DMAI_INSTALL_DIR)/Rules.make ++#include $(DMAI_INSTALL_DIR)/Rules.make + + # Should the full command be echoed to the console during build? + VERBOSE=false +@@ -64,7 +64,7 @@ + MVL_CPP_FLAGS = $(GNU_CPP_FLAGS) -Dxdc_target_name__=MVArm9 + CS_CPP_FLAGS = $(GNU_CPP_FLAGS) -Dxdc_target_name__=codesourcery/GCArmv5T + +-GNU_C_FLAGS = $(C_FLAGS) -Wall -Werror ++GNU_C_FLAGS = $(C_FLAGS) -Wall + C64P_C_FLAGS = $(C_FLAGS) + + GNU_AR_FLAGS = $(AR_FLAGS) +Index: dmai_1_20_00_06/packages/ti/sdo/dmai/apps/Makefile.app +=================================================================== +--- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/apps/Makefile.app 2009-02-11 19:58:44.000000000 -0600 ++++ dmai_1_20_00_06/packages/ti/sdo/dmai/apps/Makefile.app 2009-02-11 19:59:01.000000000 -0600 +@@ -34,7 +34,7 @@ + ifndef DMAI_INSTALL_DIR + DMAI_INSTALL_DIR = ../../../../../.. + endif +-include $(DMAI_INSTALL_DIR)/Rules.make ++#include $(DMAI_INSTALL_DIR)/Rules.make + + # Should the full command be echoed to the console during build? + VERBOSE=false diff --git a/packages/dsplink/files/dmai-do-not-panic-on-mixer-failure.patch b/packages/dsplink/files/dmai-do-not-panic-on-mixer-failure.patch new file mode 100644 index 0000000000..20e1aece72 --- /dev/null +++ b/packages/dsplink/files/dmai-do-not-panic-on-mixer-failure.patch @@ -0,0 +1,31 @@ +Index: dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Sound_alsa.c +=================================================================== +--- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/linux/Sound_alsa.c 2009-02-11 19:19:23.000000000 -0600 ++++ dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Sound_alsa.c 2009-02-11 19:19:25.000000000 -0600 +@@ -139,7 +139,7 @@ + + snd_mixer_selem_id_free (sid); + snd_mixer_close (rcMixer); +- ++ + return Dmai_EOK; + } + +@@ -431,14 +431,13 @@ + Sound_alsa_delete(hSound); + return NULL; + } +- ++ + if (setMixerVolume (attrs) <0) { +- Sound_alsa_delete (hSound); +- return NULL; ++ Dmai_dbg2("Failed to set the mixer volume on %s (%s)\n", ++ AUDIO_DEVICE, snd_strerror(status)); + } + } + +- + return hSound; + } + diff --git a/packages/dsplink/files/dmai-support-32bit-align.patch b/packages/dsplink/files/dmai-support-32bit-align.patch new file mode 100644 index 0000000000..0ee817d9d9 --- /dev/null +++ b/packages/dsplink/files/dmai-support-32bit-align.patch @@ -0,0 +1,17 @@ +Index: dmai_1_20_00_06/packages/ti/sdo/dmai/linux/omap3530/Resize.c +=================================================================== +--- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/linux/omap3530/Resize.c 2009-02-11 19:20:45.000000000 -0600 ++++ dmai_1_20_00_06/packages/ti/sdo/dmai/linux/omap3530/Resize.c 2009-02-11 19:21:09.000000000 -0600 +@@ -557,9 +557,9 @@ + srcOffset = srcDim.y * srcDim.lineLength + srcDim.x * 2; + dstOffset = dstDim.y * dstDim.lineLength + dstDim.x * 2; + +- /* Input and output buffers must be 4096 bytes aligned */ +- assert(((Buffer_getPhysicalPtr(hDstBuf) + srcOffset) & 0xFFF) == 0); +- assert(((Buffer_getPhysicalPtr(hSrcBuf) + dstOffset) & 0xFFF) == 0); ++ /* Pointers must be a multiple of 32 bytes */ ++ assert((Buffer_getPhysicalPtr(hDstBuf) & 0x1F) == 0); ++ assert((Buffer_getPhysicalPtr(hSrcBuf) & 0x1F) == 0); + + /* Queue the resizer buffers */ + for (i=0; i < 2; i++) { diff --git a/packages/dsplink/files/dmai-unbreak-xdc-args.patch b/packages/dsplink/files/dmai-unbreak-xdc-args.patch new file mode 100644 index 0000000000..b9858d0615 --- /dev/null +++ b/packages/dsplink/files/dmai-unbreak-xdc-args.patch @@ -0,0 +1,13 @@ +--- /tmp/config.bld 2009-02-17 19:32:14.000000000 +0100 ++++ dmai_1_20_00_06/packages/config.bld 2009-02-17 19:33:03.000000000 +0100 +@@ -46,6 +46,10 @@ + GCArmv5T.platform = "ti.platforms.evm3530"; + GCArmv5T.rootDir = java.lang.System.getenv("CSTOOL_DIR"); + ++GCArmv5T.cc.$unseal("opts"); ++GCArmv5T.cc.opts = "SEDME_CCARCH"; ++GCArmv5T.cc.$seal("opts"); ++ + /* + * ======== Build.targets ======== + * list of targets (ISAs + compilers) to build for diff --git a/packages/dsplink/files/dmai-update-cpu-name.patch b/packages/dsplink/files/dmai-update-cpu-name.patch new file mode 100644 index 0000000000..052a8e3236 --- /dev/null +++ b/packages/dsplink/files/dmai-update-cpu-name.patch @@ -0,0 +1,16 @@ +Index: dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Cpu.c +=================================================================== +--- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/linux/Cpu.c 2009-02-12 09:34:22.000000000 -0600 ++++ dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Cpu.c 2009-02-12 09:34:51.000000000 -0600 +@@ -103,7 +103,10 @@ + else if (strcmp(valBuf, "DM357 EVM") == 0) { + *device = Cpu_Device_DM6446; + } +- else if (strcmp(valBuf, "OMAP3EVM Board") == 0) { ++ else if ((strcmp(valBuf, "OMAP3EVM Board") == 0) || ++ (strcmp(valBuf, "OMAP3 EVM") == 0) || ++ (strcmp(valBuf, "OMAP3 Beagle Board") == 0) ++ ){ + *device = Cpu_Device_OMAP3530; + } + else { diff --git a/packages/dsplink/files/dmai-update-fb-display.patch b/packages/dsplink/files/dmai-update-fb-display.patch new file mode 100644 index 0000000000..91c1dd15aa --- /dev/null +++ b/packages/dsplink/files/dmai-update-fb-display.patch @@ -0,0 +1,77 @@ +Index: dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Display_fbdev.c +=================================================================== +--- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/linux/Display_fbdev.c 2009-02-11 19:59:57.000000000 -0600 ++++ dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Display_fbdev.c 2009-02-11 20:02:46.000000000 -0600 +@@ -41,10 +41,7 @@ + #include + #include + +-#ifdef Dmai_Device_omap3530 +-/* OMAP specific kernel headers */ +-#include