mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-07 04:58:57 +00:00
Code Issues Projects Releases Wiki Activity

sbsa: Fix build with gcc13

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Khem Raj
2023-02-02 17:48:59 -08:00
committed by Jon Mason
parent 37fd476ae1
commit 70fbe7fe12
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm/recipes-bsp/uefi/sbsa-acs/enum-int-mismatch.patch
+32
View File
@@ -0,0 +1,32 @@
Fix function protype mismatches
These are flagged by gcc13
avs_gic.c:241:1: error: conflicting types for 'val_gic_get_info' due to enum/integer mismatch; have 'uint32_t(uint32_t)' {aka 'unsigned int(unsigned int)'} [-Werror=enum-int-mismatch]
| 241 | val_gic_get_info(uint32_t type)
| | ^~~~~~~~~~~~~~~~
Upstream-Status: Submitted [https://github.com/ARM-software/sbsa-acs/pull/291]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/ShellPkg/Application/sbsa-acs/val/include/val_interface.h
+++ b/ShellPkg/Application/sbsa-acs/val/include/val_interface.h
@@ -155,7 +155,7 @@ typedef enum {
void val_wd_create_info_table(uint64_t *wd_info_table);
void val_wd_free_info_table(void);
uint32_t val_wd_execute_tests(uint32_t level, uint32_t num_pe);
-uint64_t val_wd_get_info(uint32_t index, uint32_t info_type);
+uint64_t val_wd_get_info(uint32_t index, WD_INFO_TYPE_e info_type);
uint32_t val_wd_set_ws0(uint32_t index, uint32_t timeout);
--- a/ShellPkg/Application/sbsa-acs/val/src/avs_gic.c
+++ b/ShellPkg/Application/sbsa-acs/val/src/avs_gic.c
@@ -238,7 +238,7 @@ val_get_cpuif_base(void)
@return 32-bit data
**/
uint32_t
-val_gic_get_info(uint32_t type)
+val_gic_get_info(GIC_INFO_e type)
{
uint32_t rdbase_len;
meta-arm/recipes-bsp/uefi/sbsa-acs_1.0.bb
+1
View File
@@ -8,6 +8,7 @@ SRC_URI += "git://github.com/ARM-software/sbsa-acs;destsuffix=edk2/ShellPkg/Appl
git://github.com/tianocore/edk2-libc;destsuffix=edk2/edk2-libc;protocol=https;branch=master;name=libc \ git://github.com/tianocore/edk2-libc;destsuffix=edk2/edk2-libc;protocol=https;branch=master;name=libc \
file://shell.patch \ file://shell.patch \
file://use_bfd_linker.patch \ file://use_bfd_linker.patch \
file://enum-int-mismatch.patch \
file://0001-Revert-peripheral-test-3-updated-for-multiple-uarts.patch;patchdir=ShellPkg/Application/sbsa-acs \ file://0001-Revert-peripheral-test-3-updated-for-multiple-uarts.patch;patchdir=ShellPkg/Application/sbsa-acs \
" "