On Mon, 02 Nov 2020, Peilin Ye wrote: > From: Lee Jones <[email protected]> > > Commit 6735b4632def ("Fonts: Support FONT_EXTRA_WORDS macros for built-in > fonts") introduced the following error when building rpc_defconfig (only > this build appears to be affected): > > `acorndata_8x8' referenced in section `.text' of > arch/arm/boot/compressed/ll_char_wr.o: > defined in discarded section `.data' of arch/arm/boot/compressed/font.o > `acorndata_8x8' referenced in section `.data.rel.ro' of > arch/arm/boot/compressed/font.o: > defined in discarded section `.data' of arch/arm/boot/compressed/font.o > make[3]: *** [/scratch/linux/arch/arm/boot/compressed/Makefile:191: > arch/arm/boot/compressed/vmlinux] Error 1 > make[2]: *** [/scratch/linux/arch/arm/boot/Makefile:61: > arch/arm/boot/compressed/vmlinux] Error 2 > make[1]: *** [/scratch/linux/arch/arm/Makefile:317: zImage] Error 2 > > The .data section is discarded at link time. Reinstating acorndata_8x8 as > const ensures it is still available after linking. Do the same for the > other 12 built-in fonts as well, for consistency purposes. > > Cc: <[email protected]> > Cc: Russell King <[email protected]> > Fixes: 6735b4632def ("Fonts: Support FONT_EXTRA_WORDS macros for built-in > fonts") > Signed-off-by: Lee Jones <[email protected]> > Co-developed-by: Peilin Ye <[email protected]> > Signed-off-by: Peilin Ye <[email protected]> > --- > Changes in v2: > - Fix commit ID to 6735b4632def in commit message (Russell King > <[email protected]>) > - Add `const` back for all 13 built-in fonts (Daniel Vetter > <[email protected]>) > - Add a Fixes: tag > > lib/fonts/font_10x18.c | 2 +- > lib/fonts/font_6x10.c | 2 +- > lib/fonts/font_6x11.c | 2 +- > lib/fonts/font_6x8.c | 2 +- > lib/fonts/font_7x14.c | 2 +- > lib/fonts/font_8x16.c | 2 +- > lib/fonts/font_8x8.c | 2 +- > lib/fonts/font_acorn_8x8.c | 2 +- > lib/fonts/font_mini_4x6.c | 2 +- > lib/fonts/font_pearl_8x8.c | 2 +- > lib/fonts/font_sun12x22.c | 2 +- > lib/fonts/font_sun8x16.c | 2 +- > lib/fonts/font_ter16x32.c | 2 +- > 13 files changed, 13 insertions(+), 13 deletions(-)
LGTM. Thanks for keeping my authorship. Much appreciated. -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
