Skip to content
Permalink
Browse files

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>
  • Loading branch information...
pabigot authored and andrewboie committed Jul 16, 2019
1 parent 0626c8f commit a66a036a8fe936fb41224a9aa25e3eeda8b28602
Showing with 2 additions and 3 deletions.
  1. +1 −2 include/display/cfb.h
  2. +1 −1 include/linker/common-rom.ld
@@ -67,8 +67,7 @@ struct cfb_font {
* @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, \
@@ -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)

0 comments on commit a66a036

Please sign in to comment.
You can’t perform that action at this time.