summaryrefslogtreecommitdiffstats
path: root/recipes-ti
diff options
context:
space:
mode:
authorEnric Balletbo i Serra <eballetbo@iseebcn.com>2014-10-08 19:47:44 +0000
committerDenys Dmytriyenko <denys@ti.com>2014-10-08 13:50:07 -0400
commitf6c7946591dc9099855139be0e9e1a56474c6a7a (patch)
tree628b6af0c6ccf42a586b837f027c1011404d29a2 /recipes-ti
parent0f2fed9a0c6534b31320bad0d423e8022bc2bdc2 (diff)
downloadmeta-ti-f6c7946591dc9099855139be0e9e1a56474c6a7a.tar.gz
ti-dmai: Fix build with recent kernels and compilers.
Remove unused includes that only redefine some typedefs already defined in other includes and add the --sysroot flag to fix a linkage problem. Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-ti')
-rw-r--r--recipes-ti/dmai/ti-dmai/remove-unneeded-includes.patch26
-rw-r--r--recipes-ti/dmai/ti-dmai_svn.bb3
2 files changed, 28 insertions, 1 deletions
diff --git a/recipes-ti/dmai/ti-dmai/remove-unneeded-includes.patch b/recipes-ti/dmai/ti-dmai/remove-unneeded-includes.patch
new file mode 100644
index 00000000..cfd325a3
--- /dev/null
+++ b/recipes-ti/dmai/ti-dmai/remove-unneeded-includes.patch
@@ -0,0 +1,26 @@
1Index: a/packages/ti/sdo/dmai/Makefile
2===================================================================
3--- a/packages/ti/sdo/dmai/Makefile
4+++ b/packages/ti/sdo/dmai/Makefile
5@@ -107,7 +107,7 @@ XDCPATH += $(XDC_INSTALL_DIR)/packages;$
6
7 CPP_FLAGS += -I$(XDC_INSTALL_DIR)/packages -I$(DMAI_INSTALL_DIR)/packages -I$(CE_INSTALL_DIR)/packages -I$(FC_INSTALL_DIR)/packages -I$(XDAIS_INSTALL_DIR)/packages -I$(CODEC_INSTALL_DIR)/packages -DDmai_Device_$(PLATFORM_DEVICE)
8
9-GCC_CPP_FLAGS += $(CPP_FLAGS) -I$(LINUXKERNEL_INSTALL_DIR)/include -I$(LINUXKERNEL_INSTALL_DIR)/arch/arm/include -I$(LINUXKERNEL_INSTALL_DIR)/arch/arm/$(PLATFORM_ARCH)/include $(HAVE_AUTOCONFIG) -I$(CMEM_INSTALL_DIR)/packages -I$(LINK_INSTALL_DIR) -DDmai_BuildOs_linux -Dxdc_target_types__=gnu/targets/std.h -I$(LINUXLIBS_INSTALL_DIR)/include -Dxdc_target_name__=arm/GCArmv5T
10+GCC_CPP_FLAGS += $(CPP_FLAGS) $(HAVE_AUTOCONFIG) -I$(CMEM_INSTALL_DIR)/packages -I$(LINK_INSTALL_DIR) -DDmai_BuildOs_linux -Dxdc_target_types__=gnu/targets/std.h -I$(LINUXLIBS_INSTALL_DIR)/include -Dxdc_target_name__=arm/GCArmv5T
11 C64P_CPP_FLAGS += $(CPP_FLAGS) -I$(BIOS_INSTALL_DIR)/packages/ti/bios/include -I$(BIOS_INSTALL_DIR)/packages -DDmai_BuildOs_bios -Dxdc_target__='<ti/targets/std.h>' -I$(CODEGEN_INSTALL_DIR)/include -mv6400+ -pdse225 -eo$(PLATFORM_DEVICE).o$(EXT)
12
13 GCC_C_FLAGS += $(C_FLAGS) -Wall
14Index: a/packages/ti/sdo/dmai/apps/Makefile.app
15===================================================================
16--- a/packages/ti/sdo/dmai/apps/Makefile.app
17+++ b/packages/ti/sdo/dmai/apps/Makefile.app
18@@ -121,7 +121,7 @@ C64P_C_FLAGS = $(C_FLAGS)
19 GCC_CPP_FLAGS = $(CPP_FLAGS) -I$(LINUXKERNEL_INSTALL_DIR)/include
20 C64P_CPP_FLAGS = $(CPP_FLAGS) -pdse225 -I$(CODEGEN_INSTALL_DIR)/include -mv6400+ -I$(BIOS_INSTALL_DIR)/packages/ti/bios/include -eo$(PLATFORM_DEVICE).o$(EXT)
21
22-GCC_LD_FLAGS = $(LD_FLAGS) -lpthread -lm -L$(LINUXLIBS_INSTALL_DIR)/lib -lasound
23+GCC_LD_FLAGS = $(LD_FLAGS) -lpthread -lm --sysroot=$(PKG_CONFIG_SYSROOT_DIR) -L$(LINUXLIBS_INSTALL_DIR)/lib -lasound
24 C64P_LD_FLAGS = $(LD_FLAGS) -z -w -x -c -i$(RTDX_INSTALL_DIR)/packages/ti/rtdx/iom/lib/debug -i$(RTDX_INSTALL_DIR)/packages/ti/rtdx/cio/lib/release -i$(RTDX_INSTALL_DIR)/packages/ti/rtdx/lib/c6000
25
26 SOURCES = $(wildcard *.c)
diff --git a/recipes-ti/dmai/ti-dmai_svn.bb b/recipes-ti/dmai/ti-dmai_svn.bb
index 536bb78b..4a91b9b9 100644
--- a/recipes-ti/dmai/ti-dmai_svn.bb
+++ b/recipes-ti/dmai/ti-dmai_svn.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://dmai_${PV}_License.html;md5=3302f728a5a42f97cabc26a54
12 12
13# This package has high dependence on kernel, use kernel PR as base and append a local version 13# This package has high dependence on kernel, use kernel PR as base and append a local version
14PR = "${MACHINE_KERNEL_PR}" 14PR = "${MACHINE_KERNEL_PR}"
15PR_append = "o" 15PR_append = "p"
16 16
17DMAIBRANCH_dm6446 = "trunk" 17DMAIBRANCH_dm6446 = "trunk"
18DMAIBRANCH_dm6467 = "branches/GITPSP_INT_101009" 18DMAIBRANCH_dm6467 = "branches/GITPSP_INT_101009"
@@ -34,6 +34,7 @@ SRCREV ?= "UNDEFINED_SRCREV"
34 34
35SRC_URI_append = " file://omap3530-r642-remove-include-videodev.diff;striplevel=3 \ 35SRC_URI_append = " file://omap3530-r642-remove-include-videodev.diff;striplevel=3 \
36 file://r642-fix-config-bld.diff;striplevel=3 \ 36 file://r642-fix-config-bld.diff;striplevel=3 \
37 file://remove-unneeded-includes.patch \
37 " 38 "
38 39
39INSANE_SKIP_${PN} = "installed-vs-shipped" 40INSANE_SKIP_${PN} = "installed-vs-shipped"