mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-04-20 19:53:43 +00:00
Code Issues Projects Releases Wiki Activity

ti-dmai: Fix build with recent kernels and compilers.

Browse Source 
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>
This commit is contained in:
Enric Balletbo i Serra
2014-10-08 19:47:44 +00:00
committed by Denys Dmytriyenko
parent 0f2fed9a0c
commit f6c7946591
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
recipes-ti/dmai/ti-dmai/remove-unneeded-includes.patch Normal file
View File

@@ -0,0 +1,26 @@
Index: a/packages/ti/sdo/dmai/Makefile
===================================================================
--- a/packages/ti/sdo/dmai/Makefile
+++ b/packages/ti/sdo/dmai/Makefile
@@ -107,7 +107,7 @@ XDCPATH += $(XDC_INSTALL_DIR)/packages;$
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)
-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
+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
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)
GCC_C_FLAGS += $(C_FLAGS) -Wall
Index: a/packages/ti/sdo/dmai/apps/Makefile.app
===================================================================
--- a/packages/ti/sdo/dmai/apps/Makefile.app
+++ b/packages/ti/sdo/dmai/apps/Makefile.app
@@ -121,7 +121,7 @@ C64P_C_FLAGS = $(C_FLAGS)
GCC_CPP_FLAGS = $(CPP_FLAGS) -I$(LINUXKERNEL_INSTALL_DIR)/include
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)
-GCC_LD_FLAGS = $(LD_FLAGS) -lpthread -lm -L$(LINUXLIBS_INSTALL_DIR)/lib -lasound
+GCC_LD_FLAGS = $(LD_FLAGS) -lpthread -lm --sysroot=$(PKG_CONFIG_SYSROOT_DIR) -L$(LINUXLIBS_INSTALL_DIR)/lib -lasound
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
SOURCES = $(wildcard *.c)

3
recipes-ti/dmai/ti-dmai_svn.bb
View File

@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://dmai_${PV}_License.html;md5=3302f728a5a42f97cabc26a54
# This package has high dependence on kernel, use kernel PR as base and append a local version
PR = "${MACHINE_KERNEL_PR}"
PR_append = "o"
PR_append = "p"
DMAIBRANCH_dm6446 = "trunk"
DMAIBRANCH_dm6467 = "branches/GITPSP_INT_101009"
@@ -34,6 +34,7 @@ SRCREV ?= "UNDEFINED_SRCREV"
SRC_URI_append = " file://omap3530-r642-remove-include-videodev.diff;striplevel=3 \
file://r642-fix-config-bld.diff;striplevel=3 \
file://remove-unneeded-includes.patch \
"
INSANE_SKIP_${PN} = "installed-vs-shipped"