From 646702aadd6ca41697a1cf3741fffe031824de4a Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 3 Jan 2013 18:41:17 +0100 Subject: [PATCH] meta-digi-arm: fix redpine build with gcc-4.7 Added patch that allows to build the driver with GCC-4.7 (used in Yocto "Danny") Signed-off-by: Javier Viguera --- ...-redpine-allow-to-build-with-gcc-4.7.patch | 35 +++++++++++++++++++ .../kernel-module-redpine_git.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta-digi-arm/recipes-kernel/kernel-module-redpine/files/0001-redpine-allow-to-build-with-gcc-4.7.patch diff --git a/meta-digi-arm/recipes-kernel/kernel-module-redpine/files/0001-redpine-allow-to-build-with-gcc-4.7.patch b/meta-digi-arm/recipes-kernel/kernel-module-redpine/files/0001-redpine-allow-to-build-with-gcc-4.7.patch new file mode 100644 index 000000000..a8f3607ed --- /dev/null +++ b/meta-digi-arm/recipes-kernel/kernel-module-redpine/files/0001-redpine-allow-to-build-with-gcc-4.7.patch @@ -0,0 +1,35 @@ +From: Javier Viguera +Date: Thu, 3 Jan 2013 14:38:07 +0100 +Subject: [PATCH] redpine: allow to build with gcc-4.7 + +Otherwise it fails with: + +error: inlining failed in call to always_inline 'ganges_bufferfull_acquire_lock': function body not available +error: inlining failed in call to always_inline 'ganges_bufferfull_release_lock': function body not available + +Signed-off-by: Javier Viguera + +Conflicts: + RS.GENR.LNX.SD_NON_GPL/include/Linux/ganges_mgmt.h +--- + RS.GENR.LNX.SD_NON_GPL/include/Linux/ganges_mgmt.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/RS.GENR.LNX.SD_NON_GPL/include/Linux/ganges_mgmt.h b/RS.GENR.LNX.SD_NON_GPL/include/Linux/ganges_mgmt.h +index c75c22b..92420db 100644 +--- a/RS.GENR.LNX.SD_NON_GPL/include/Linux/ganges_mgmt.h ++++ b/RS.GENR.LNX.SD_NON_GPL/include/Linux/ganges_mgmt.h +@@ -1075,11 +1075,11 @@ INT32 ganges_start_per_tx(PGANGES_CLIENT Adapter,UINT8 *ptr); + GANGES_STATUS ganges_do_continuous_send(PGANGES_CLIENT Adapter, UINT16 mode); + + VOID ganges_fsm_compute_snr(PGANGES_CLIENT Adapter,PScanConfirm scanConfirm,UINT8 mode); +-inline VOID ganges_bufferfull_acquire_lock( ++VOID ganges_bufferfull_acquire_lock( + VOID (*fptr)(PVOID sem,DWORD delay_msec), + PGANGES_CLIENT Adapter); + +-inline BOOLEAN ++BOOLEAN + ganges_bufferfull_release_lock + ( + BOOLEAN (*fptr)(PVOID sem), diff --git a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb index 5a344e245..e1986810a 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb @@ -9,6 +9,7 @@ PR = "r0" FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRCREV = "del-5.9.2.1" SRC_URI = "${DIGI_LOG_GIT}linux-modules/redpine.git;protocol=git \ + file://0001-redpine-allow-to-build-with-gcc-4.7.patch \ file://redpine" S = "${WORKDIR}/git"