diff mbox series

[v2,1/1] Fonts: Replace discarded const qualifier

Message ID 20201102183242.2031659-1-yepeilin.cs@gmail.com (mailing list archive)
State New, archived
Headers show
Series [v2,1/1] Fonts: Replace discarded const qualifier | expand

Commit Message

Peilin Ye Nov. 2, 2020, 6:32 p.m. UTC
From: Lee Jones <lee.jones@linaro.org>

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: <stable@vger.kernel.org>
Cc: Russell King <linux@armlinux.org.uk>
Fixes: 6735b4632def ("Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts")
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Co-developed-by: Peilin Ye <yepeilin.cs@gmail.com>
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
---
Changes in v2:
  - Fix commit ID to 6735b4632def in commit message (Russell King
    <linux@armlinux.org.uk>)
  - Add `const` back for all 13 built-in fonts (Daniel Vetter
    <daniel.vetter@ffwll.ch>)
  - 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(-)

Comments

Lee Jones Nov. 3, 2020, 8:53 a.m. UTC | #1
On Mon, 02 Nov 2020, Peilin Ye wrote:

> From: Lee Jones <lee.jones@linaro.org>
> 
> 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: <stable@vger.kernel.org>
> Cc: Russell King <linux@armlinux.org.uk>
> Fixes: 6735b4632def ("Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts")
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> Co-developed-by: Peilin Ye <yepeilin.cs@gmail.com>
> Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
> ---
> Changes in v2:
>   - Fix commit ID to 6735b4632def in commit message (Russell King
>     <linux@armlinux.org.uk>)
>   - Add `const` back for all 13 built-in fonts (Daniel Vetter
>     <daniel.vetter@ffwll.ch>)
>   - 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.
Daniel Vetter Nov. 3, 2020, 8:58 a.m. UTC | #2
On Tue, Nov 3, 2020 at 9:53 AM Lee Jones <lee.jones@linaro.org> wrote:
>
> On Mon, 02 Nov 2020, Peilin Ye wrote:
>
> > From: Lee Jones <lee.jones@linaro.org>
> >
> > 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: <stable@vger.kernel.org>
> > Cc: Russell King <linux@armlinux.org.uk>
> > Fixes: 6735b4632def ("Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts")
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > Co-developed-by: Peilin Ye <yepeilin.cs@gmail.com>
> > Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
> > ---
> > Changes in v2:
> >   - Fix commit ID to 6735b4632def in commit message (Russell King
> >     <linux@armlinux.org.uk>)
> >   - Add `const` back for all 13 built-in fonts (Daniel Vetter
> >     <daniel.vetter@ffwll.ch>)
> >   - 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.

Should I stuff this into drm-misc-fixes? Or will someone else pick
this up? Greg?

I guess drm-misc-fixes might be easiest since there's a bunch of other
fbcon/font stuff in the queue in drm-misc from Peilin.
-Daniel
Greg Kroah-Hartman Nov. 3, 2020, 9:15 a.m. UTC | #3
On Tue, Nov 03, 2020 at 09:58:18AM +0100, Daniel Vetter wrote:
> On Tue, Nov 3, 2020 at 9:53 AM Lee Jones <lee.jones@linaro.org> wrote:
> >
> > On Mon, 02 Nov 2020, Peilin Ye wrote:
> >
> > > From: Lee Jones <lee.jones@linaro.org>
> > >
> > > 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: <stable@vger.kernel.org>
> > > Cc: Russell King <linux@armlinux.org.uk>
> > > Fixes: 6735b4632def ("Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts")
> > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > > Co-developed-by: Peilin Ye <yepeilin.cs@gmail.com>
> > > Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
> > > ---
> > > Changes in v2:
> > >   - Fix commit ID to 6735b4632def in commit message (Russell King
> > >     <linux@armlinux.org.uk>)
> > >   - Add `const` back for all 13 built-in fonts (Daniel Vetter
> > >     <daniel.vetter@ffwll.ch>)
> > >   - 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.
> 
> Should I stuff this into drm-misc-fixes? Or will someone else pick
> this up? Greg?
> 
> I guess drm-misc-fixes might be easiest since there's a bunch of other
> fbcon/font stuff in the queue in drm-misc from Peilin.

You can take it:

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daniel Vetter Nov. 3, 2020, 9:52 a.m. UTC | #4
On Tue, Nov 03, 2020 at 10:15:38AM +0100, Greg KH wrote:
> On Tue, Nov 03, 2020 at 09:58:18AM +0100, Daniel Vetter wrote:
> > On Tue, Nov 3, 2020 at 9:53 AM Lee Jones <lee.jones@linaro.org> wrote:
> > >
> > > On Mon, 02 Nov 2020, Peilin Ye wrote:
> > >
> > > > From: Lee Jones <lee.jones@linaro.org>
> > > >
> > > > 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: <stable@vger.kernel.org>
> > > > Cc: Russell King <linux@armlinux.org.uk>
> > > > Fixes: 6735b4632def ("Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts")
> > > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > > > Co-developed-by: Peilin Ye <yepeilin.cs@gmail.com>
> > > > Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
> > > > ---
> > > > Changes in v2:
> > > >   - Fix commit ID to 6735b4632def in commit message (Russell King
> > > >     <linux@armlinux.org.uk>)
> > > >   - Add `const` back for all 13 built-in fonts (Daniel Vetter
> > > >     <daniel.vetter@ffwll.ch>)
> > > >   - 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.
> > 
> > Should I stuff this into drm-misc-fixes? Or will someone else pick
> > this up? Greg?
> > 
> > I guess drm-misc-fixes might be easiest since there's a bunch of other
> > fbcon/font stuff in the queue in drm-misc from Peilin.
> 
> You can take it:
> 
> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Applied to drm-misc-fixes, thanks everyone!

Cheers, Daniel
Lee Jones Nov. 3, 2020, 10:55 a.m. UTC | #5
On Tue, 03 Nov 2020, Daniel Vetter wrote:

> On Tue, Nov 03, 2020 at 10:15:38AM +0100, Greg KH wrote:
> > On Tue, Nov 03, 2020 at 09:58:18AM +0100, Daniel Vetter wrote:
> > > On Tue, Nov 3, 2020 at 9:53 AM Lee Jones <lee.jones@linaro.org> wrote:
> > > >
> > > > On Mon, 02 Nov 2020, Peilin Ye wrote:
> > > >
> > > > > From: Lee Jones <lee.jones@linaro.org>
> > > > >
> > > > > 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: <stable@vger.kernel.org>
> > > > > Cc: Russell King <linux@armlinux.org.uk>
> > > > > Fixes: 6735b4632def ("Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts")
> > > > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > > > > Co-developed-by: Peilin Ye <yepeilin.cs@gmail.com>
> > > > > Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
> > > > > ---
> > > > > Changes in v2:
> > > > >   - Fix commit ID to 6735b4632def in commit message (Russell King
> > > > >     <linux@armlinux.org.uk>)
> > > > >   - Add `const` back for all 13 built-in fonts (Daniel Vetter
> > > > >     <daniel.vetter@ffwll.ch>)
> > > > >   - 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.
> > > 
> > > Should I stuff this into drm-misc-fixes? Or will someone else pick
> > > this up? Greg?
> > > 
> > > I guess drm-misc-fixes might be easiest since there's a bunch of other
> > > fbcon/font stuff in the queue in drm-misc from Peilin.
> > 
> > You can take it:
> > 
> > Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 
> Applied to drm-misc-fixes, thanks everyone!

Would you be kind enough to let us know when this lands in Mainline
please?  We'll need to back-port it to start fixing up our Stable
kernels ASAP.

TIA.
Peilin Ye Nov. 3, 2020, 11:42 a.m. UTC | #6
On Tue, Nov 03, 2020 at 10:55:23AM +0000, Lee Jones wrote:
> Would you be kind enough to let us know when this lands in Mainline
> please?  We'll need to back-port it to start fixing up our Stable
> kernels ASAP.

Sure, I will keep track of it, and update here when it happens. Thank
you, and sorry again for the trouble,

Peilin Ye
Peilin Ye Nov. 7, 2020, 5:19 a.m. UTC | #7
Hi all,

On Tue, Nov 03, 2020 at 10:55:23AM +0000, Lee Jones wrote:
> Would you be kind enough to let us know when this lands in Mainline
> please?  We'll need to back-port it to start fixing up our Stable
> kernels ASAP.

Patch is in mainline now:

9522750c66c689b739e151fcdf895420dc81efc0 Fonts: Replace discarded const qualifier

Thank you,
Peilin Ye
Greg Kroah-Hartman Nov. 7, 2020, 3:36 p.m. UTC | #8
On Sat, Nov 07, 2020 at 12:19:18AM -0500, Peilin Ye wrote:
> Hi all,
> 
> On Tue, Nov 03, 2020 at 10:55:23AM +0000, Lee Jones wrote:
> > Would you be kind enough to let us know when this lands in Mainline
> > please?  We'll need to back-port it to start fixing up our Stable
> > kernels ASAP.
> 
> Patch is in mainline now:
> 
> 9522750c66c689b739e151fcdf895420dc81efc0 Fonts: Replace discarded const qualifier

Now queued up for stable, thanks!

greg k-h
diff mbox series

Patch

diff --git a/lib/fonts/font_10x18.c b/lib/fonts/font_10x18.c
index 0e2deac97da0..e02f9df24d1e 100644
--- a/lib/fonts/font_10x18.c
+++ b/lib/fonts/font_10x18.c
@@ -8,7 +8,7 @@ 
 
 #define FONTDATAMAX 9216
 
-static struct font_data fontdata_10x18 = {
+static const struct font_data fontdata_10x18 = {
 	{ 0, 0, FONTDATAMAX, 0 }, {
 	/* 0 0x00 '^@' */
 	0x00, 0x00, /* 0000000000 */
diff --git a/lib/fonts/font_6x10.c b/lib/fonts/font_6x10.c
index 87da8acd07db..6e3c4b7691c8 100644
--- a/lib/fonts/font_6x10.c
+++ b/lib/fonts/font_6x10.c
@@ -3,7 +3,7 @@ 
 
 #define FONTDATAMAX 2560
 
-static struct font_data fontdata_6x10 = {
+static const struct font_data fontdata_6x10 = {
 	{ 0, 0, FONTDATAMAX, 0 }, {
 	/* 0 0x00 '^@' */
 	0x00, /* 00000000 */
diff --git a/lib/fonts/font_6x11.c b/lib/fonts/font_6x11.c
index 5e975dfa10a5..2d22a24e816f 100644
--- a/lib/fonts/font_6x11.c
+++ b/lib/fonts/font_6x11.c
@@ -9,7 +9,7 @@ 
 
 #define FONTDATAMAX (11*256)
 
-static struct font_data fontdata_6x11 = {
+static const struct font_data fontdata_6x11 = {
 	{ 0, 0, FONTDATAMAX, 0 }, {
 	/* 0 0x00 '^@' */
 	0x00, /* 00000000 */
diff --git a/lib/fonts/font_6x8.c b/lib/fonts/font_6x8.c
index 700039a9ceae..e7442a0d183d 100644
--- a/lib/fonts/font_6x8.c
+++ b/lib/fonts/font_6x8.c
@@ -3,7 +3,7 @@ 
 
 #define FONTDATAMAX 2048
 
-static struct font_data fontdata_6x8 = {
+static const struct font_data fontdata_6x8 = {
 	{ 0, 0, FONTDATAMAX, 0 }, {
 	/* 0 0x00 '^@' */
 	0x00, /* 000000 */
diff --git a/lib/fonts/font_7x14.c b/lib/fonts/font_7x14.c
index 86d298f38505..9cc7ae2e03f7 100644
--- a/lib/fonts/font_7x14.c
+++ b/lib/fonts/font_7x14.c
@@ -8,7 +8,7 @@ 
 
 #define FONTDATAMAX 3584
 
-static struct font_data fontdata_7x14 = {
+static const struct font_data fontdata_7x14 = {
 	{ 0, 0, FONTDATAMAX, 0 }, {
 	/* 0 0x00 '^@' */
 	0x00, /* 0000000 */
diff --git a/lib/fonts/font_8x16.c b/lib/fonts/font_8x16.c
index 37cedd36ca5e..bab25dc59e8d 100644
--- a/lib/fonts/font_8x16.c
+++ b/lib/fonts/font_8x16.c
@@ -10,7 +10,7 @@ 
 
 #define FONTDATAMAX 4096
 
-static struct font_data fontdata_8x16 = {
+static const struct font_data fontdata_8x16 = {
 	{ 0, 0, FONTDATAMAX, 0 }, {
 	/* 0 0x00 '^@' */
 	0x00, /* 00000000 */
diff --git a/lib/fonts/font_8x8.c b/lib/fonts/font_8x8.c
index 8ab695538395..109d0572368f 100644
--- a/lib/fonts/font_8x8.c
+++ b/lib/fonts/font_8x8.c
@@ -9,7 +9,7 @@ 
 
 #define FONTDATAMAX 2048
 
-static struct font_data fontdata_8x8 = {
+static const struct font_data fontdata_8x8 = {
 	{ 0, 0, FONTDATAMAX, 0 }, {
 	/* 0 0x00 '^@' */
 	0x00, /* 00000000 */
diff --git a/lib/fonts/font_acorn_8x8.c b/lib/fonts/font_acorn_8x8.c
index 069b3e80c434..fb395f0d4031 100644
--- a/lib/fonts/font_acorn_8x8.c
+++ b/lib/fonts/font_acorn_8x8.c
@@ -5,7 +5,7 @@ 
 
 #define FONTDATAMAX 2048
 
-static struct font_data acorndata_8x8 = {
+static const struct font_data acorndata_8x8 = {
 { 0, 0, FONTDATAMAX, 0 }, {
 /* 00 */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ^@ */
 /* 01 */  0x7e, 0x81, 0xa5, 0x81, 0xbd, 0x99, 0x81, 0x7e, /* ^A */
diff --git a/lib/fonts/font_mini_4x6.c b/lib/fonts/font_mini_4x6.c
index 1449876c6a27..592774a90917 100644
--- a/lib/fonts/font_mini_4x6.c
+++ b/lib/fonts/font_mini_4x6.c
@@ -43,7 +43,7 @@  __END__;
 
 #define FONTDATAMAX 1536
 
-static struct font_data fontdata_mini_4x6 = {
+static const struct font_data fontdata_mini_4x6 = {
 	{ 0, 0, FONTDATAMAX, 0 }, {
 	/*{*/
 	  	/*   Char 0: ' '  */
diff --git a/lib/fonts/font_pearl_8x8.c b/lib/fonts/font_pearl_8x8.c
index 32d65551e7ed..a6f95ebce950 100644
--- a/lib/fonts/font_pearl_8x8.c
+++ b/lib/fonts/font_pearl_8x8.c
@@ -14,7 +14,7 @@ 
 
 #define FONTDATAMAX 2048
 
-static struct font_data fontdata_pearl8x8 = {
+static const struct font_data fontdata_pearl8x8 = {
    { 0, 0, FONTDATAMAX, 0 }, {
    /* 0 0x00 '^@' */
    0x00, /* 00000000 */
diff --git a/lib/fonts/font_sun12x22.c b/lib/fonts/font_sun12x22.c
index 641a6b4dca42..a5b65bd49604 100644
--- a/lib/fonts/font_sun12x22.c
+++ b/lib/fonts/font_sun12x22.c
@@ -3,7 +3,7 @@ 
 
 #define FONTDATAMAX 11264
 
-static struct font_data fontdata_sun12x22 = {
+static const struct font_data fontdata_sun12x22 = {
 	{ 0, 0, FONTDATAMAX, 0 }, {
 	/* 0 0x00 '^@' */
 	0x00, 0x00, /* 000000000000 */
diff --git a/lib/fonts/font_sun8x16.c b/lib/fonts/font_sun8x16.c
index 193fe6d988e0..e577e76a6a7c 100644
--- a/lib/fonts/font_sun8x16.c
+++ b/lib/fonts/font_sun8x16.c
@@ -3,7 +3,7 @@ 
 
 #define FONTDATAMAX 4096
 
-static struct font_data fontdata_sun8x16 = {
+static const struct font_data fontdata_sun8x16 = {
 { 0, 0, FONTDATAMAX, 0 }, {
 /* */ 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,
diff --git a/lib/fonts/font_ter16x32.c b/lib/fonts/font_ter16x32.c
index 91b9c283bd9c..f7c3abb6b99e 100644
--- a/lib/fonts/font_ter16x32.c
+++ b/lib/fonts/font_ter16x32.c
@@ -4,7 +4,7 @@ 
 
 #define FONTDATAMAX 16384
 
-static struct font_data fontdata_ter16x32 = {
+static const struct font_data fontdata_ter16x32 = {
 	{ 0, 0, FONTDATAMAX, 0 }, {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x7f, 0xfc,