subsys/cfb: correct font definition macro for linker script
This macro provides the required alignment directives to ensure that the
font definitions are placed properly for iteration as members of an
array object.
Closes #17581
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
diff --git a/include/display/cfb.h b/include/display/cfb.h
index 9dbf2fb..69eb828 100644
--- a/include/display/cfb.h
+++ b/include/display/cfb.h
@@ -67,8 +67,7 @@
* @param _lc Character mapped to last font element.
*/
#define FONT_ENTRY_DEFINE(_name, _width, _height, _caps, _data, _fc, _lc) \
- static const struct cfb_font _name \
- __attribute__ ((section(".font_entry."))) __attribute__((used)) = \
+ static const Z_STRUCT_SECTION_ITERABLE(cfb_font, _name) = \
{ \
.width = _width, \
.height = _height, \
diff --git a/include/linker/common-rom.ld b/include/linker/common-rom.ld
index e97a61f..71371bb 100644
--- a/include/linker/common-rom.ld
+++ b/include/linker/common-rom.ld
@@ -132,6 +132,6 @@
SECTION_DATA_PROLOGUE(font_entry_sections,,)
{
__font_entry_start = .;
- KEEP(*(SORT_BY_NAME(".font_entry.*")))
+ KEEP(*(SORT_BY_NAME("._cfb_font.*")))
__font_entry_end = .;
} GROUP_LINK_IN(ROMABLE_REGION)
