[oe-commits] Roger Monk : ti-local-power-manager: Remove OPT from LPM sources using #define

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: ac81f608727d7a72ac0f3713a5de61f463dc3752
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=ac81f608727d7a72ac0f3713a5de61f463dc3752

Author: Roger Monk <r-monk at ti.com>
Date:   Thu Apr 22 02:33:51 2010 +0100

ti-local-power-manager: Remove OPT from LPM sources using #define

* OPT Argument Decorator is no longer used/supported in latest dsplink versions
   * LPM implements some callback functions from DSPLINK which used this decorator
      * 'Void _TAL_translateCallback (IN Uint32, IN OPT Pvoid, IN OPT Pvoid);'
      * Remove by passing -DOPT="" to LPM build
   * Safe to remove for building against older DSPLINK versions as well
   * Bump PR

Signed-off-by: Roger Monk <r-monk at ti.com>
Signed-off-by: Koen Kooi <koen at openembedded.org>

---

 recipes/ti/ti-local-power-manager.inc              |    2 +-
 .../lpm-1_24_01-replace-define-OPT.patch           |   24 ++++++++++++++++++++
 recipes/ti/ti-local-power-manager_1.24.01.bb       |    2 +
 3 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/recipes/ti/ti-local-power-manager.inc b/recipes/ti/ti-local-power-manager.inc
index 4a2fb91..a0e3bfd 100644
--- a/recipes/ti/ti-local-power-manager.inc
+++ b/recipes/ti/ti-local-power-manager.inc
@@ -13,7 +13,7 @@ PROVIDES += "ti-lpm-utils"
 
 # This package builds a kernel module, use kernel PR as base and append a local version
 PR = "${MACHINE_KERNEL_PR}"
-PR_append = "c"
+PR_append = "d"
 
 S = "${WORKDIR}/local_power_manager_linux_${PV}"
 
diff --git a/recipes/ti/ti-local-power-manager/lpm-1_24_01-replace-define-OPT.patch b/recipes/ti/ti-local-power-manager/lpm-1_24_01-replace-define-OPT.patch
new file mode 100644
index 0000000..120792b
--- /dev/null
+++ b/recipes/ti/ti-local-power-manager/lpm-1_24_01-replace-define-OPT.patch
@@ -0,0 +1,24 @@
+diff -uNr local_power_manager_linux_1_24_01_orig/packages/ti/bios/power/modules/dm6446/lpm/Makefile local_power_manager_linux_1_24_01/packages/ti/bios/power/modules/dm6446/lpm/Makefile
+--- local_power_manager_linux_1_24_01_orig/packages/ti/bios/power/modules/dm6446/lpm/Makefile	2009-07-22 23:10:04.000000000 -0500
++++ local_power_manager_linux_1_24_01/packages/ti/bios/power/modules/dm6446/lpm/Makefile	2010-04-16 15:26:14.000000000 -0500
+@@ -54,7 +54,7 @@
+ endif
+ 
+ MAKE_OPTS = ARCH=arm CROSS_COMPILE=$(MVTOOL_PREFIX)
+-CFLAGS = -DUSE_UDEV -DOS_LINUX -DLINUX_KERNEL \
++CFLAGS = -DUSE_UDEV -DOS_LINUX -DLINUX_KERNEL -DOPT="" \
+          $(LINK_DEFS) $(LINK_INCS) $(LINK_INCS_INTERNAL)
+ 
+ # Invoke the kernel build system
+diff -uNr local_power_manager_linux_1_24_01_orig/packages/ti/bios/power/modules/omap3530/lpm/Makefile local_power_manager_linux_1_24_01/packages/ti/bios/power/modules/omap3530/lpm/Makefile
+--- local_power_manager_linux_1_24_01_orig/packages/ti/bios/power/modules/omap3530/lpm/Makefile	2009-07-22 23:10:05.000000000 -0500
++++ local_power_manager_linux_1_24_01/packages/ti/bios/power/modules/omap3530/lpm/Makefile	2010-04-16 15:26:38.000000000 -0500
+@@ -54,7 +54,7 @@
+ endif
+ 
+ MAKE_OPTS = ARCH=arm CROSS_COMPILE=$(MVTOOL_PREFIX)
+-CFLAGS = -DUSE_UDEV -DOS_LINUX -DLINUX_KERNEL \
++CFLAGS = -DUSE_UDEV -DOS_LINUX -DLINUX_KERNEL -DOPT="" \
+          $(LINK_DEFS) $(LINK_INCS) $(LINK_INCS_INTERNAL)
+ 
+ # Invoke the kernel build system
diff --git a/recipes/ti/ti-local-power-manager_1.24.01.bb b/recipes/ti/ti-local-power-manager_1.24.01.bb
index 7af4cb0..c2351f9 100644
--- a/recipes/ti/ti-local-power-manager_1.24.01.bb
+++ b/recipes/ti/ti-local-power-manager_1.24.01.bb
@@ -3,6 +3,8 @@ require ti-local-power-manager.inc
 PV = "1_24_01"
 PE = "1"
 
+SRC_URI_append = " file://lpm-1_24_01-replace-define-OPT.patch;patch=1"
+
 SRC_URI[lpmtarball.md5sum] = "6699861c8d0195654c539798ec428124"
 SRC_URI[lpmtarball.sha256sum] = "052b31b09e6d85bc1e980f5e3d2350019c2d8d7430d24db60854dc926df9a1f2"