erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tree: Fix cast an object of type 'nullptr_t' to 'uintptr_t' error

Browse source 
This to fix the error when using C23:
cannot cast an object of type 'nullptr_t' to 'uintptr_t' (aka 'unsigned long')
return (uintptr_t)NULL;
                  ^

Change-Id: Ibdc8794513a508fc61a5046692f854183c36b781
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84893
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jakub Czapiga <czapiga@google.com>
This commit is contained in:
Elyes Haouas 2024-10-28 08:18:59 +01:00
commit 686b36bab8
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/drivers/intel/fsp2_0/temp_ram_exit.c
View file

@ -29,7 +29,7 @@ static void fsp_temp_ram_exit(void)
temp_ram_exit = (void *)(uintptr_t)(hdr.image_base + hdr.temp_ram_exit_entry_offset);
printk(BIOS_DEBUG, "Calling TempRamExit: %p\n", temp_ram_exit);
if (ENV_X86_64 && CONFIG(PLATFORM_USES_FSP2_X86_32))
status = protected_mode_call_1arg(temp_ram_exit, (uintptr_t)NULL);
status = protected_mode_call_1arg(temp_ram_exit, 0);
else
status = temp_ram_exit(NULL);

2
src/lib/thread.c
View file

@ -251,7 +251,7 @@ static void threads_initialize(void)
set_current_thread(t);
t->stack_orig = (uintptr_t)NULL; /* We never free the main thread */
t->stack_orig = 0; /* We never free the main thread */
t->id = 0;
t->can_yield = 1;

2
src/soc/intel/apollolake/romstage.c
View file

@ -293,7 +293,7 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version)
parse_devicetree_setting(mupd);
/* Do NOT let FSP do any GPIO pad configuration */
mupd->FspmConfig.PreMemGpioTablePtr = (uintptr_t)NULL;
mupd->FspmConfig.PreMemGpioTablePtr = 0;
mupd->FspmConfig.SkipCseRbp = CONFIG(SKIP_CSE_RBP);

6
src/soc/intel/common/block/i2c/i2c.c
View file

@ -88,7 +88,7 @@ uintptr_t dw_i2c_base_address(unsigned int bus)
/* Find device+function for this controller */
devfn = dw_i2c_soc_bus_to_devfn(bus);
if (devfn < 0)
return (uintptr_t)NULL;
return 0;
/* Form a PCI address for this device */
dev = PCI_DEV(0, PCI_SLOT(devfn), PCI_FUNC(devfn));
@ -114,12 +114,12 @@ uintptr_t dw_i2c_base_address(unsigned int bus)
devfn = dw_i2c_soc_bus_to_devfn(bus);
if (devfn < 0)
return (uintptr_t)NULL;
return 0;
/* devfn -> dev */
dev = pcidev_path_on_root(devfn);
if (!dev || !dev->enabled)
return (uintptr_t)NULL;
return 0;
/* dev -> bar0 */
res = probe_resource(dev, PCI_BASE_ADDRESS_0);

2
tests/lib/imd-test.c
View file

@ -232,7 +232,7 @@ static void test_imd_recover(void **state)
const struct imd_entry *lg_entry;
/* Fail when the limit for lg was not set. */
imd.lg.limit = (uintptr_t)NULL;
imd.lg.limit = 0;
assert_int_equal(-1, imd_recover(&imd));
/* Set the limit for lg. */

4
tests/lib/imd_cbmem-test.c
View file

@ -21,9 +21,9 @@
static void reset_imd(void)
{
imd.lg.limit = (uintptr_t)NULL;
imd.lg.limit = 0;
imd.lg.r = NULL;
imd.sm.limit = (uintptr_t)NULL;
imd.sm.limit = 0;
imd.sm.r = NULL;
cbmem_initialized = 0;