Commit 9522750c authored by Lee Jones's avatar Lee Jones Committed by Daniel Vetter

Fonts: Replace discarded const qualifier

Commit 6735b463 ("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: <stable@vger.kernel.org>
Cc: Russell King <linux@armlinux.org.uk>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fixes: 6735b463 ("Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts")
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Co-developed-by: default avatarPeilin Ye <yepeilin.cs@gmail.com>
Signed-off-by: default avatarPeilin Ye <yepeilin.cs@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20201102183242.2031659-1-yepeilin.cs@gmail.com
parent 077aa5c8
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#define FONTDATAMAX 9216 #define FONTDATAMAX 9216
static struct font_data fontdata_10x18 = { static const struct font_data fontdata_10x18 = {
{ 0, 0, FONTDATAMAX, 0 }, { { 0, 0, FONTDATAMAX, 0 }, {
/* 0 0x00 '^@' */ /* 0 0x00 '^@' */
0x00, 0x00, /* 0000000000 */ 0x00, 0x00, /* 0000000000 */
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#define FONTDATAMAX 2560 #define FONTDATAMAX 2560
static struct font_data fontdata_6x10 = { static const struct font_data fontdata_6x10 = {
{ 0, 0, FONTDATAMAX, 0 }, { { 0, 0, FONTDATAMAX, 0 }, {
/* 0 0x00 '^@' */ /* 0 0x00 '^@' */
0x00, /* 00000000 */ 0x00, /* 00000000 */
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#define FONTDATAMAX (11*256) #define FONTDATAMAX (11*256)
static struct font_data fontdata_6x11 = { static const struct font_data fontdata_6x11 = {
{ 0, 0, FONTDATAMAX, 0 }, { { 0, 0, FONTDATAMAX, 0 }, {
/* 0 0x00 '^@' */ /* 0 0x00 '^@' */
0x00, /* 00000000 */ 0x00, /* 00000000 */
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#define FONTDATAMAX 2048 #define FONTDATAMAX 2048
static struct font_data fontdata_6x8 = { static const struct font_data fontdata_6x8 = {
{ 0, 0, FONTDATAMAX, 0 }, { { 0, 0, FONTDATAMAX, 0 }, {
/* 0 0x00 '^@' */ /* 0 0x00 '^@' */
0x00, /* 000000 */ 0x00, /* 000000 */
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#define FONTDATAMAX 3584 #define FONTDATAMAX 3584
static struct font_data fontdata_7x14 = { static const struct font_data fontdata_7x14 = {
{ 0, 0, FONTDATAMAX, 0 }, { { 0, 0, FONTDATAMAX, 0 }, {
/* 0 0x00 '^@' */ /* 0 0x00 '^@' */
0x00, /* 0000000 */ 0x00, /* 0000000 */
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#define FONTDATAMAX 4096 #define FONTDATAMAX 4096
static struct font_data fontdata_8x16 = { static const struct font_data fontdata_8x16 = {
{ 0, 0, FONTDATAMAX, 0 }, { { 0, 0, FONTDATAMAX, 0 }, {
/* 0 0x00 '^@' */ /* 0 0x00 '^@' */
0x00, /* 00000000 */ 0x00, /* 00000000 */
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#define FONTDATAMAX 2048 #define FONTDATAMAX 2048
static struct font_data fontdata_8x8 = { static const struct font_data fontdata_8x8 = {
{ 0, 0, FONTDATAMAX, 0 }, { { 0, 0, FONTDATAMAX, 0 }, {
/* 0 0x00 '^@' */ /* 0 0x00 '^@' */
0x00, /* 00000000 */ 0x00, /* 00000000 */
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define FONTDATAMAX 2048 #define FONTDATAMAX 2048
static struct font_data acorndata_8x8 = { static const struct font_data acorndata_8x8 = {
{ 0, 0, FONTDATAMAX, 0 }, { { 0, 0, FONTDATAMAX, 0 }, {
/* 00 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ^@ */ /* 00 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ^@ */
/* 01 */ 0x7e, 0x81, 0xa5, 0x81, 0xbd, 0x99, 0x81, 0x7e, /* ^A */ /* 01 */ 0x7e, 0x81, 0xa5, 0x81, 0xbd, 0x99, 0x81, 0x7e, /* ^A */
......
...@@ -43,7 +43,7 @@ __END__; ...@@ -43,7 +43,7 @@ __END__;
#define FONTDATAMAX 1536 #define FONTDATAMAX 1536
static struct font_data fontdata_mini_4x6 = { static const struct font_data fontdata_mini_4x6 = {
{ 0, 0, FONTDATAMAX, 0 }, { { 0, 0, FONTDATAMAX, 0 }, {
/*{*/ /*{*/
/* Char 0: ' ' */ /* Char 0: ' ' */
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#define FONTDATAMAX 2048 #define FONTDATAMAX 2048
static struct font_data fontdata_pearl8x8 = { static const struct font_data fontdata_pearl8x8 = {
{ 0, 0, FONTDATAMAX, 0 }, { { 0, 0, FONTDATAMAX, 0 }, {
/* 0 0x00 '^@' */ /* 0 0x00 '^@' */
0x00, /* 00000000 */ 0x00, /* 00000000 */
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#define FONTDATAMAX 11264 #define FONTDATAMAX 11264
static struct font_data fontdata_sun12x22 = { static const struct font_data fontdata_sun12x22 = {
{ 0, 0, FONTDATAMAX, 0 }, { { 0, 0, FONTDATAMAX, 0 }, {
/* 0 0x00 '^@' */ /* 0 0x00 '^@' */
0x00, 0x00, /* 000000000000 */ 0x00, 0x00, /* 000000000000 */
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#define FONTDATAMAX 4096 #define FONTDATAMAX 4096
static struct font_data fontdata_sun8x16 = { static const struct font_data fontdata_sun8x16 = {
{ 0, 0, FONTDATAMAX, 0 }, { { 0, 0, FONTDATAMAX, 0 }, {
/* */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
/* */ 0x00,0x00,0x7e,0x81,0xa5,0x81,0x81,0xbd,0x99,0x81,0x81,0x7e,0x00,0x00,0x00,0x00, /* */ 0x00,0x00,0x7e,0x81,0xa5,0x81,0x81,0xbd,0x99,0x81,0x81,0x7e,0x00,0x00,0x00,0x00,
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#define FONTDATAMAX 16384 #define FONTDATAMAX 16384
static struct font_data fontdata_ter16x32 = { static const struct font_data fontdata_ter16x32 = {
{ 0, 0, FONTDATAMAX, 0 }, { { 0, 0, FONTDATAMAX, 0 }, {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x7f, 0xfc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment