From 73efa8afa568d88ebf94563e9200fbcdfb669fbe Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Thu, 25 Feb 2010 12:44:16 +0000 Subject: ti recipes: Start moving /files into package specific directories ti-codec-engine: Cleanup Codec Engine Recipe * Fix Installer Issues * Cleanup Variable Names + Add for all targets * Remove non-tspa older 2.24.01 recipe * Add omapl137 depends ti-xdais: Recipe Cleanup ti-dsplink: Add runscript to run all example applications (for easy testing) * Add run script * Rename load/unload scripts for consistency * Use _append instead of += for RDEPENDS * ti-dsplink: fix GPPOS for omapl137 * SED out CROSS_COMPILE from dsplink Makefile gstreamer-ti: Recipe Cleanup align with other recipes * Recipe cleanup, cosmetics * Move required variables inside recipe * Ensure all targets have variables assigned * Add -rc scripts for all targets * Add runtime recommends for all targets * Needs LINUXKERNEL_INSTALL_DIR setting * export LINUXKERNEL_INSTALL_DIR for gstreamer_ti * add logic for patching to newer kernel (mach/omapfb) * don't error out if the sed on omapfb fails since the header won't be there for non-omap3 ti-codecs: Recipe cleanup for omapl, omap3 and dm6446 * Cleanup of omap3, omapl138, omapl137, dm6446 * Start building omapl138 recipe * Add prepsources step * Package codecs into -server package * Add qualiTI reports and codec data sheet * Variable cleanup * Set stage for common codec build recipe * Temp comment out variables, for removal in subsequent commit after validation ti-dmai: Recipe cleanup * Recipe cleanup, cosmetics * Move required variables inside recipe, remove unused variables * Runtime deps for -apps, -tests * Add loadmodules script for omapl137 * Need to pass path to CE 'example' codecs for arm side audio codec (g711) ti-local-power-manager: Set XDC_PLATFORM * lpm needs XDC platform defined. Signed-off-by: Roger Monk Signed-off-by: Koen Kooi --- recipes/ti/files/Makefile-dsplink-dsp | 59 ---- recipes/ti/files/Makefile-dsplink-gpp | 120 -------- recipes/ti/files/dmai-built-with-angstrom.patch | 48 --- .../files/dmai-do-not-panic-on-mixer-failure.patch | 31 -- recipes/ti/files/dmai-support-32bit-align.patch | 17 -- recipes/ti/files/dmai-update-cpu-name.patch | 16 - recipes/ti/files/dmai-update-fb-display.patch | 77 ----- recipes/ti/files/dmai-update-v4l2-display.patch | 127 -------- recipes/ti/files/dsplink-128M.patch | 104 ------- .../dsplink-add-class-device-create-support.patch | 55 ---- recipes/ti/files/dsplink-semaphore-27.patch | 36 --- .../dsplink_1_64_kernel_2_6_33_autoconf.patch | 335 --------------------- recipes/ti/files/gstreamer-ti-tracker-824.patch | 147 --------- recipes/ti/files/loadmodules-ti-dmai-apps.sh | 37 --- recipes/ti/files/loadmodules-ti-dmai-dm355_al.sh | 23 -- recipes/ti/files/loadmodules-ti-dmai-dm365_al.sh | 14 - recipes/ti/files/loadmodules-ti-dmai-dm6446_al.sh | 19 -- recipes/ti/files/loadmodules-ti-dmai-dm6467_al.sh | 19 -- recipes/ti/files/loadmodules-ti-dmai-o3530_al.sh | 42 --- recipes/ti/files/loadmodules-ti-dmai-ol138_al.sh | 19 -- recipes/ti/files/loadmodules-ti-dsplink-apps.sh | 25 -- recipes/ti/files/unloadmodules-ti-dmai-apps.sh | 12 - recipes/ti/files/unloadmodules-ti-dsplink-apps.sh | 5 - 23 files changed, 1387 deletions(-) delete mode 100644 recipes/ti/files/Makefile-dsplink-dsp delete mode 100644 recipes/ti/files/Makefile-dsplink-gpp delete mode 100644 recipes/ti/files/dmai-built-with-angstrom.patch delete mode 100644 recipes/ti/files/dmai-do-not-panic-on-mixer-failure.patch delete mode 100644 recipes/ti/files/dmai-support-32bit-align.patch delete mode 100644 recipes/ti/files/dmai-update-cpu-name.patch delete mode 100644 recipes/ti/files/dmai-update-fb-display.patch delete mode 100644 recipes/ti/files/dmai-update-v4l2-display.patch delete mode 100644 recipes/ti/files/dsplink-128M.patch delete mode 100644 recipes/ti/files/dsplink-add-class-device-create-support.patch delete mode 100644 recipes/ti/files/dsplink-semaphore-27.patch delete mode 100644 recipes/ti/files/dsplink_1_64_kernel_2_6_33_autoconf.patch delete mode 100644 recipes/ti/files/gstreamer-ti-tracker-824.patch delete mode 100755 recipes/ti/files/loadmodules-ti-dmai-apps.sh delete mode 100755 recipes/ti/files/loadmodules-ti-dmai-dm355_al.sh delete mode 100644 recipes/ti/files/loadmodules-ti-dmai-dm365_al.sh delete mode 100755 recipes/ti/files/loadmodules-ti-dmai-dm6446_al.sh delete mode 100755 recipes/ti/files/loadmodules-ti-dmai-dm6467_al.sh delete mode 100755 recipes/ti/files/loadmodules-ti-dmai-o3530_al.sh delete mode 100755 recipes/ti/files/loadmodules-ti-dmai-ol138_al.sh delete mode 100644 recipes/ti/files/loadmodules-ti-dsplink-apps.sh delete mode 100644 recipes/ti/files/unloadmodules-ti-dmai-apps.sh delete mode 100644 recipes/ti/files/unloadmodules-ti-dsplink-apps.sh (limited to 'recipes/ti/files') diff --git a/recipes/ti/files/Makefile-dsplink-dsp b/recipes/ti/files/Makefile-dsplink-dsp deleted file mode 100644 index 0861f1ee21..0000000000 --- a/recipes/ti/files/Makefile-dsplink-dsp +++ /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/recipes/ti/files/Makefile-dsplink-gpp b/recipes/ti/files/Makefile-dsplink-gpp deleted file mode 100644 index d9f2f6209a..0000000000 --- a/recipes/ti/files/Makefile-dsplink-gpp +++ /dev/null @@ -1,120 +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)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) - -# EXTRA_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 -dsplinkk-objs := $(DSPLINK_OBJS) -else -KDIR := /path/to/kernel/ -PWD := $(shell pwd) -driver: - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules -endif - -clean: - @echo DSPLINK - cleaning driver, library and samples - find $(DSPLINK) -name "*.o" -exec rm {} \; - rm -fr dsplinkk.ko dsplinkk.mod.c Module.symvers *gpp *.a *.lib - -################################################################################################ -# USER SIDE -BUILD_CONFIG := ..$(DIRSEP)..$(DIRSEP)..$(DIRSEP)config$(DIRSEP)BUILD -# Generate the list of sources -SOURCES := -include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)api$(DIRSEP)SOURCES -API_SOURCES := $(addprefix $(TI_DSPLINK_GPPROOT)$(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_GPPROOT)$(DIRSEP)src$(DIRSEP)api$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP),$(SOURCES)) - -# Update the CFLAG -#CC = arm-none-linux-gnueabi-gcc -#AR = arm-none-linux-gnueabi-ar -#LD = arm-none-linux-gnueabi-ld -ARFLAGS = -rs -LDFLAGS = -r -EXTRA_CFLAGS += $(addprefix -D, $(TI_DSPLINK_GPP_DEFINES)) $(addprefix -I, $(TI_DSPLINK_GPP_INC_PATH)) - -define CONFIG_template -$(shell cp $(DSPLINK)$(DIRSEP)config$(DIRSEP)all$(DIRSEP)$(1) $(DSPLINK)$(DIRSEP)config$(DIRSEP)BUILD$(DIRSEP)) -endef - -define PROGRAM_template -$(basename $(1)).o: $(1) - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c $(1) -o $(basename $(1)).o -endef -$(foreach prog,$(API_SOURCES),$(eval $(call PROGRAM_template,$(prog)))) -$(foreach prog,$(CONFIG),$(eval $(call CONFIG_template,$(prog)))) - -DSPLINK_API_OBJS := $(foreach srcFile, $(API_SOURCES),$(basename $(srcFile)).o) - -library: $(DSPLINK_API_OBJS) - @echo DSPLINK - building user library - dsplink.lib - $(LD) $(LDFLAGS) -o dsplink.lib $(DSPLINK_API_OBJS) - $(AR) $(ARFLAGS) dsplink.a $(DSPLINK_API_OBJS) - - -######################################### SAMPLES ################################### -SOURCES := -define SAMPLES_template -ifneq ($(1),message_multi) -$(1): $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)samples$(DIRSEP)$(1)$(DIRSEP)$(1).c $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)samples$(DIRSEP)$(1)$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)$(1)_os.c - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -I$(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)samples$(DIRSEP)$(1) -I$(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)samples$(DIRSEP)$(1)$(DIRSEP)$(TI_DSPLINK_GPPOS) -o $(1)gpp $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)samples$(DIRSEP)$(1)$(DIRSEP)$(1).c $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)samples$(DIRSEP)$(1)$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)$(1)_os.c $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)samples$(DIRSEP)$(1)$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)main.c dsplink.lib -lpthread -else -$(1): $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)samples$(DIRSEP)$(1)$(DIRSEP)message.c $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)samples$(DIRSEP)$(1)$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)message_os.c - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -I$(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)samples$(DIRSEP)$(1) -I$(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)samples$(DIRSEP)$(1)$(DIRSEP)$(TI_DSPLINK_GPPOS) -o $(1)gpp $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)samples$(DIRSEP)$(1)$(DIRSEP)message.c $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)samples$(DIRSEP)$(1)$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)message_os.c $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)samples$(DIRSEP)$(1)$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)main.c dsplink.lib -lpthread -endif -endef - -include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)samples$(DIRSEP)DIRS -$(foreach prog,$(DIRS),$(eval $(call SAMPLES_template,$(prog)))) - -samples: $(foreach prog,$(DIRS),$(prog)) - -all: driver library samples diff --git a/recipes/ti/files/dmai-built-with-angstrom.patch b/recipes/ti/files/dmai-built-with-angstrom.patch deleted file mode 100644 index fc49789718..0000000000 --- a/recipes/ti/files/dmai-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/recipes/ti/files/dmai-do-not-panic-on-mixer-failure.patch b/recipes/ti/files/dmai-do-not-panic-on-mixer-failure.patch deleted file mode 100644 index 20e1aece72..0000000000 --- a/recipes/ti/files/dmai-do-not-panic-on-mixer-failure.patch +++ /dev/null @@ -1,31 +0,0 @@ -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/recipes/ti/files/dmai-support-32bit-align.patch b/recipes/ti/files/dmai-support-32bit-align.patch deleted file mode 100644 index 0ee817d9d9..0000000000 --- a/recipes/ti/files/dmai-support-32bit-align.patch +++ /dev/null @@ -1,17 +0,0 @@ -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/recipes/ti/files/dmai-update-cpu-name.patch b/recipes/ti/files/dmai-update-cpu-name.patch deleted file mode 100644 index 052a8e3236..0000000000 --- a/recipes/ti/files/dmai-update-cpu-name.patch +++ /dev/null @@ -1,16 +0,0 @@ -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/recipes/ti/files/dmai-update-fb-display.patch b/recipes/ti/files/dmai-update-fb-display.patch deleted file mode 100644 index 91c1dd15aa..0000000000 --- a/recipes/ti/files/dmai-update-fb-display.patch +++ /dev/null @@ -1,77 +0,0 @@ -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