From 791c15ebf502329edb3a9a535d7ef61da0d3ffa2 Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Thu, 22 Apr 2010 01:41:35 +0100 Subject: ti-dsplink: Move dsplink_1.64 fix-ups into version specific recipe * Fix-ups for kernel headers and CROSS_COMPILE are specific to 1.64 Signed-off-by: Roger Monk Signed-off-by: Koen Kooi --- recipes/ti/ti-dsplink.inc | 7 ------- recipes/ti/ti-dsplink_1.64.bb | 14 +++++++++++++- 2 files changed, 13 insertions(+), 8 deletions(-) (limited to 'recipes/ti') diff --git a/recipes/ti/ti-dsplink.inc b/recipes/ti/ti-dsplink.inc index c0171f193a..b13b46931b 100644 --- a/recipes/ti/ti-dsplink.inc +++ b/recipes/ti/ti-dsplink.inc @@ -64,13 +64,6 @@ export DSPLINK do_configure() { - # asm/page.h is gone with linux-libc-headers 2.6.31. - # We can safely sed it out since it has been empty for the past 2 years - sed -i /page.h/d ${S}/dsplink/gpp/src/api/Linux/drv_api.c || true - - # Makefile passes hardcoded CROSS_COMPILE - rename so this doesnt get passed to kbuild - sed -i -e s:CROSS_COMPILE:BOGUS_CROSS_COMPILE:g ${S}/dsplink/gpp/src/Rules.mk - # Run perl script to create appropriate makefiles (v1.60 and up) ( cd ${DSPLINK} diff --git a/recipes/ti/ti-dsplink_1.64.bb b/recipes/ti/ti-dsplink_1.64.bb index 3f1332bd9b..bf45ea8a78 100644 --- a/recipes/ti/ti-dsplink_1.64.bb +++ b/recipes/ti/ti-dsplink_1.64.bb @@ -10,6 +10,19 @@ SRC_URI_append = "file://dsplink_1_64_kernel_2_6_33_autoconf.patch;patch=1 \ file://dsplink_1_64_add_dm6446_build_support.patch;patch=1 \ file://dsplink_1_64_add_omapl137_build_support.patch;patch=1 " + +# Fix-up headers for latest kernels and remove bogus CROSS_COMPILE configuration + +do_configure_prepend() { + + # asm/page.h is gone with linux-libc-headers 2.6.31. + # We can safely sed it out since it has been empty for the past 2 years + sed -i /page.h/d ${S}/dsplink/gpp/src/api/Linux/drv_api.c || true + + # Makefile passes hardcoded CROSS_COMPILE - rename so this doesnt get passed to kbuild + sed -i -e s:CROSS_COMPILE:BOGUS_CROSS_COMPILE:g ${S}/dsplink/gpp/src/Rules.mk +} + # Cheat a bit with includes # SZ_1k = 0x00000400 # ../gpp/src/arch/OMAP3530/shmem/Linux/omap3530_phy_shmem.c:127: error: 'SZ_2K' undeclared (first use in this function) @@ -18,4 +31,3 @@ do_compile_prepend() { sed -i s:SZ_2K:0x00000800:g ${S}/dsplink/gpp/src/arch/OMAP3530/shmem/Linux/omap3530_phy_shmem.c } - -- cgit v1.2.3