mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-08 08:30:47 -09:00
package/fmlib: bump version to lf-6.6.52-2.2.0
- The license file was renamed from COPYING to LICENSE. - Added a patch to fix build errors with gcc-14. Signed-off-by: Akhilesh Nema <nemaakhilesh@gmail.com> Reviewed-by: Brandon Maier <brandon.maier@gmail.com> Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
committed by
Julien Olivain
parent
2522130175
commit
a3412adb2a
@@ -0,0 +1,79 @@
|
||||
From 3a1962a70cec74b3dac979e52a2cbcaa8897b9c8 Mon Sep 17 00:00:00 2001
|
||||
From: Akhilesh Nema <nemaakhilesh@gmail.com>
|
||||
Date: Fri, 10 Jan 2025 20:20:50 -0800
|
||||
Subject: [PATCH] Fix the integer conversion error and enum compare
|
||||
warnings on build under gcc-14
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Error:
|
||||
src/fm_lib.c: In function ‘GetDeviceId’:
|
||||
src/fm_lib.c:139:21: error: returning ‘uintptr_t’ {aka ‘long unsigned int’} from a function with return type ‘t_Handle’ {aka ‘void *’} makes pointer from integer without a cast [-Wint-conversion]
|
||||
139 | return p_Dev->id;
|
||||
| ~~~~~^~~~
|
||||
|
||||
Warnings:
|
||||
|
||||
src/fm_lib.c: In function ‘FM_PCD_CcRootModifyNextEngine’:
|
||||
src/fm_lib.c:997:51: warning: comparison between ‘e_FmPcdEngine’ and ‘enum ioc_fm_pcd_engine’ [-Wenum-compare]
|
||||
997 | if (p_FmPcdCcNextEngineParams->nextEngine == e_IOC_FM_PCD_FR) {
|
||||
| ^~
|
||||
src/fm_lib.c: In function ‘FM_PCD_MatchTableAddKey’:
|
||||
src/fm_lib.c:1103:57: warning: comparison between ‘e_FmPcdEngine’ and ‘enum ioc_fm_pcd_engine’ [-Wenum-compare]
|
||||
1103 | else if (p_KeyParams->ccNextEngineParams.nextEngine == e_IOC_FM_PCD_FR) {
|
||||
| ^~
|
||||
src/fm_lib.c: In function ‘FM_PCD_MatchTableModifyKeyAndNextEngine’:
|
||||
src/fm_lib.c:1174:57: warning: comparison between ‘e_FmPcdEngine’ and ‘enum ioc_fm_pcd_engine’ [-Wenum-compare]
|
||||
1174 | else if (p_KeyParams->ccNextEngineParams.nextEngine == e_IOC_FM_PCD_FR) {
|
||||
|
||||
Upstream: https://github.com/nxp-qoriq/fmlib/pull/1
|
||||
|
||||
Signed-off-by: Akhilesh Nema <nemaakhilesh@gmail.com>
|
||||
---
|
||||
src/fm_lib.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/fm_lib.c b/src/fm_lib.c
|
||||
index 4ea40ff..85b4a66 100644
|
||||
--- a/src/fm_lib.c
|
||||
+++ b/src/fm_lib.c
|
||||
@@ -136,7 +136,7 @@ t_Handle GetDeviceId(t_Handle h_Dev)
|
||||
{
|
||||
t_Device *p_Dev = (t_Device*)h_Dev;
|
||||
|
||||
- return p_Dev->id;
|
||||
+ return (t_Handle) p_Dev->id;
|
||||
}
|
||||
|
||||
|
||||
@@ -994,7 +994,7 @@ t_Error FM_PCD_CcRootModifyNextEngine(t_Handle h_CcTree,
|
||||
}
|
||||
|
||||
#if (DPAA_VERSION >= 11)
|
||||
- if (p_FmPcdCcNextEngineParams->nextEngine == e_IOC_FM_PCD_FR) {
|
||||
+ if (p_FmPcdCcNextEngineParams->nextEngine == e_FM_PCD_FR) {
|
||||
t_Device *p_NextDev = (t_Device*) p_FmPcdCcNextEngineParams->params.frParams.h_FrmReplic;
|
||||
params.cc_next_engine_params.params.fr_params.frm_replic_id = UINT_TO_PTR(p_NextDev->id);
|
||||
}
|
||||
@@ -1100,7 +1100,7 @@ t_Error FM_PCD_MatchTableAddKey(t_Handle h_CcNode,
|
||||
params.key_params.cc_next_engine_params.params.kg_params.p_direct_scheme = UINT_TO_PTR(p_NextDev->id);
|
||||
}
|
||||
#if (DPAA_VERSION >= 11)
|
||||
- else if (p_KeyParams->ccNextEngineParams.nextEngine == e_IOC_FM_PCD_FR) {
|
||||
+ else if (p_KeyParams->ccNextEngineParams.nextEngine == e_FM_PCD_FR) {
|
||||
t_Device *p_NextDev = (t_Device*) p_KeyParams->ccNextEngineParams.params.frParams.h_FrmReplic;
|
||||
params.key_params.cc_next_engine_params.params.fr_params.frm_replic_id = UINT_TO_PTR(p_NextDev->id);
|
||||
}
|
||||
@@ -1171,7 +1171,7 @@ t_Error FM_PCD_MatchTableModifyKeyAndNextEngine(t_Handle h_CcNode,
|
||||
params.key_params.cc_next_engine_params.params.kg_params.p_direct_scheme = UINT_TO_PTR(p_NextDev->id);
|
||||
}
|
||||
#if (DPAA_VERSION >= 11)
|
||||
- else if (p_KeyParams->ccNextEngineParams.nextEngine == e_IOC_FM_PCD_FR) {
|
||||
+ else if (p_KeyParams->ccNextEngineParams.nextEngine == e_FM_PCD_FR) {
|
||||
t_Device *p_NextDev = (t_Device*) p_KeyParams->ccNextEngineParams.params.frParams.h_FrmReplic;
|
||||
params.key_params.cc_next_engine_params.params.fr_params.frm_replic_id = UINT_TO_PTR(p_NextDev->id);
|
||||
}
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 64dc76c0adc3aa58bce6aba470dee7dee001d4964ccb1958e899a59d9917b21d fmlib-LSDK-21.08.tar.gz
|
||||
sha256 5d7770fa9f70f0c6f0b4784bbca8401811259a4b1e03455dbd863ffd0d34d2ca COPYING
|
||||
sha256 173f1c41207e50dd3908c7dad192962240fd1a9269bca6e368f401134b3503bf fmlib-lf-6.6.52-2.2.0.tar.gz
|
||||
sha256 5d7770fa9f70f0c6f0b4784bbca8401811259a4b1e03455dbd863ffd0d34d2ca LICENSE
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FMLIB_VERSION = LSDK-21.08
|
||||
FMLIB_VERSION = lf-6.6.52-2.2.0
|
||||
FMLIB_SITE = $(call github,nxp-qoriq,fmlib,$(FMLIB_VERSION))
|
||||
FMLIB_LICENSE = BSD-3-Clause
|
||||
FMLIB_LICENSE_FILES = COPYING
|
||||
FMLIB_LICENSE_FILES = LICENSE
|
||||
FMLIB_DEPENDENCIES = linux
|
||||
FMLIB_INSTALL_STAGING = YES
|
||||
|
||||
|
||||
Reference in New Issue
Block a user