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

sconfig: Move (WEAK_)DEV_PTR from device.h to static.h

Browse source 
Similar to commit 8651731537 ("sconfig: Move config_of_soc from
device.h to static.h"), move these macros to static.h to separate
dependencies on device.h and static.h. These macros resolve to device
alises that are declared in the generated static_devices.h header, so
move them to static.h which includes static_devices.h.

Since static.h remains included in device.h, any source that uses these
macros should still compile correctly. Subsequent commits will add
static.h to files that need them, after which static.h can be dropped
from device.h.

Change-Id: I1c76ad749769591da9c102b11eb618e93b68bd7c
Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84676
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
This commit is contained in:
Nicholas Chin 2024-10-05 22:11:18 -06:00 • committed by Felix Singer
commit 05a13e7ed9
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/include/device/device.h
View file

@ -502,12 +502,4 @@ void scan_smbus(struct device *bus);
void scan_generic_bus(struct device *bus);
void scan_static_bus(struct device *bus);
/* Macro to generate `struct device *` name that points to a device with the given alias. */
#define DEV_PTR(_alias) _dev_##_alias##_ptr
/* Macro to generate weak `struct device *` definition that points to a device with the given
alias. */
#define WEAK_DEV_PTR(_alias) \
__weak DEVTREE_CONST struct device *const DEV_PTR(_alias)
#endif /* DEVICE_H */

10
util/sconfig/main.c
View file

@ -1906,7 +1906,15 @@ static void generate_outputh(FILE *f, const char *fw_conf_header, const char *de
fprintf(f, "#include <%s>\n\n", device_header);
fprintf(f, "/* Returns pointer to config structure of root device (B:D:F = 0:00:0) */\n");
fprintf(f, "#define config_of_soc() __pci_0_00_0_config\n");
fprintf(f, "#define config_of_soc() __pci_0_00_0_config\n\n");
fprintf(f, "/* Macro to generate `struct device *` name that points to a device with the given alias. */\n");
fprintf(f, "#define DEV_PTR(_alias) \t_dev_##_alias##_ptr\n\n");
fprintf(f, "/* Macro to generate weak `struct device *` definition that points to a device with the given\n");
fprintf(f, " alias. */\n");
fprintf(f, "#define WEAK_DEV_PTR(_alias)\t\t\t\\\n");
fprintf(f, "\t__weak DEVTREE_CONST struct device *const DEV_PTR(_alias)\n");
fprintf(f, "\n#endif /* __STATIC_DEVICE_TREE_H */\n");
}