fbcon,fonts: Refactor framebuffer console rotation

[PATCH 04/10] lib/fonts: Clean up Makefile

Posted by Thomas Zimmermann 6 days, 2 hours ago

Simplify the Makefile. Drop font-obj-y and sort the fonts by dictionary
order. Done in preparation for supporting optional font rotation.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 lib/fonts/Makefile | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/lib/fonts/Makefile b/lib/fonts/Makefile
index 30a85a4292fa..3268d344c0a1 100644
--- a/lib/fonts/Makefile
+++ b/lib/fonts/Makefile
@@ -1,23 +1,22 @@
 # SPDX-License-Identifier: GPL-2.0
 # Font handling
 
-font-objs := fonts.o
+font-y := fonts.o
 
-font-objs-$(CONFIG_FONT_SUN8x16)   += font_sun8x16.o
-font-objs-$(CONFIG_FONT_SUN12x22)  += font_sun12x22.o
-font-objs-$(CONFIG_FONT_8x8)       += font_8x8.o
-font-objs-$(CONFIG_FONT_8x16)      += font_8x16.o
-font-objs-$(CONFIG_FONT_6x11)      += font_6x11.o
-font-objs-$(CONFIG_FONT_7x14)      += font_7x14.o
-font-objs-$(CONFIG_FONT_10x18)     += font_10x18.o
-font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
-font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
-font-objs-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o
-font-objs-$(CONFIG_FONT_6x10)      += font_6x10.o
-font-objs-$(CONFIG_FONT_TER10x18)  += font_ter10x18.o
-font-objs-$(CONFIG_FONT_TER16x32)  += font_ter16x32.o
-font-objs-$(CONFIG_FONT_6x8)       += font_6x8.o
+# Built-in fonts
+font-$(CONFIG_FONT_10x18)     += font_10x18.o
+font-$(CONFIG_FONT_6x10)      += font_6x10.o
+font-$(CONFIG_FONT_6x11)      += font_6x11.o
+font-$(CONFIG_FONT_6x8)       += font_6x8.o
+font-$(CONFIG_FONT_7x14)      += font_7x14.o
+font-$(CONFIG_FONT_8x16)      += font_8x16.o
+font-$(CONFIG_FONT_8x8)       += font_8x8.o
+font-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
+font-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o
+font-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
+font-$(CONFIG_FONT_SUN12x22)  += font_sun12x22.o
+font-$(CONFIG_FONT_SUN8x16)   += font_sun8x16.o
+font-$(CONFIG_FONT_TER10x18)  += font_ter10x18.o
+font-$(CONFIG_FONT_TER16x32)  += font_ter16x32.o
 
-font-objs += $(font-objs-y)
-
-obj-$(CONFIG_FONT_SUPPORT)         += font.o
+obj-$(CONFIG_FONT_SUPPORT) += font.o
-- 
2.53.0

Re: [PATCH 04/10] lib/fonts: Clean up Makefile

Posted by Geert Uytterhoeven 1 day, 7 hours ago

Hi Thomas,

On Fri, 27 Mar 2026 at 14:05, Thomas Zimmermann <tzimmermann@suse.de> wrote:
> Simplify the Makefile. Drop font-obj-y and sort the fonts by dictionary
> order. Done in preparation for supporting optional font rotation.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

Thanks for your patch, which is now commit 3f90ea78f5fe9495
("lib/fonts: Clean up Makefile") in fbdev/for-next.

> --- a/lib/fonts/Makefile
> +++ b/lib/fonts/Makefile
> @@ -1,23 +1,22 @@
>  # SPDX-License-Identifier: GPL-2.0
>  # Font handling
>
> -font-objs := fonts.o
> +font-y := fonts.o
>
> -font-objs-$(CONFIG_FONT_SUN8x16)   += font_sun8x16.o
> -font-objs-$(CONFIG_FONT_SUN12x22)  += font_sun12x22.o
> -font-objs-$(CONFIG_FONT_8x8)       += font_8x8.o
> -font-objs-$(CONFIG_FONT_8x16)      += font_8x16.o
> -font-objs-$(CONFIG_FONT_6x11)      += font_6x11.o
> -font-objs-$(CONFIG_FONT_7x14)      += font_7x14.o
> -font-objs-$(CONFIG_FONT_10x18)     += font_10x18.o
> -font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
> -font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
> -font-objs-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o
> -font-objs-$(CONFIG_FONT_6x10)      += font_6x10.o
> -font-objs-$(CONFIG_FONT_TER10x18)  += font_ter10x18.o
> -font-objs-$(CONFIG_FONT_TER16x32)  += font_ter16x32.o
> -font-objs-$(CONFIG_FONT_6x8)       += font_6x8.o
> +# Built-in fonts
> +font-$(CONFIG_FONT_10x18)     += font_10x18.o
> +font-$(CONFIG_FONT_6x10)      += font_6x10.o
> +font-$(CONFIG_FONT_6x11)      += font_6x11.o
> +font-$(CONFIG_FONT_6x8)       += font_6x8.o
> +font-$(CONFIG_FONT_7x14)      += font_7x14.o
> +font-$(CONFIG_FONT_8x16)      += font_8x16.o
> +font-$(CONFIG_FONT_8x8)       += font_8x8.o

Please sort the anonymous entries by increasing font size.

> +font-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
> +font-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o
> +font-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
> +font-$(CONFIG_FONT_SUN12x22)  += font_sun12x22.o
> +font-$(CONFIG_FONT_SUN8x16)   += font_sun8x16.o
> +font-$(CONFIG_FONT_TER10x18)  += font_ter10x18.o
> +font-$(CONFIG_FONT_TER16x32)  += font_ter16x32.o
>
> -font-objs += $(font-objs-y)
> -
> -obj-$(CONFIG_FONT_SUPPORT)         += font.o
> +obj-$(CONFIG_FONT_SUPPORT) += font.o

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 04/10] lib/fonts: Clean up Makefile

Posted by Thomas Zimmermann 1 day, 7 hours ago

Hi

Am 01.04.26 um 09:48 schrieb Geert Uytterhoeven:
> Hi Thomas,
>
> On Fri, 27 Mar 2026 at 14:05, Thomas Zimmermann <tzimmermann@suse.de> wrote:
>> Simplify the Makefile. Drop font-obj-y and sort the fonts by dictionary
>> order. Done in preparation for supporting optional font rotation.
>>
>> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> Thanks for your patch, which is now commit 3f90ea78f5fe9495
> ("lib/fonts: Clean up Makefile") in fbdev/for-next.
>
>> --- a/lib/fonts/Makefile
>> +++ b/lib/fonts/Makefile
>> @@ -1,23 +1,22 @@
>>   # SPDX-License-Identifier: GPL-2.0
>>   # Font handling
>>
>> -font-objs := fonts.o
>> +font-y := fonts.o
>>
>> -font-objs-$(CONFIG_FONT_SUN8x16)   += font_sun8x16.o
>> -font-objs-$(CONFIG_FONT_SUN12x22)  += font_sun12x22.o
>> -font-objs-$(CONFIG_FONT_8x8)       += font_8x8.o
>> -font-objs-$(CONFIG_FONT_8x16)      += font_8x16.o
>> -font-objs-$(CONFIG_FONT_6x11)      += font_6x11.o
>> -font-objs-$(CONFIG_FONT_7x14)      += font_7x14.o
>> -font-objs-$(CONFIG_FONT_10x18)     += font_10x18.o
>> -font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
>> -font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
>> -font-objs-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o
>> -font-objs-$(CONFIG_FONT_6x10)      += font_6x10.o
>> -font-objs-$(CONFIG_FONT_TER10x18)  += font_ter10x18.o
>> -font-objs-$(CONFIG_FONT_TER16x32)  += font_ter16x32.o
>> -font-objs-$(CONFIG_FONT_6x8)       += font_6x8.o
>> +# Built-in fonts
>> +font-$(CONFIG_FONT_10x18)     += font_10x18.o
>> +font-$(CONFIG_FONT_6x10)      += font_6x10.o
>> +font-$(CONFIG_FONT_6x11)      += font_6x11.o
>> +font-$(CONFIG_FONT_6x8)       += font_6x8.o
>> +font-$(CONFIG_FONT_7x14)      += font_7x14.o
>> +font-$(CONFIG_FONT_8x16)      += font_8x16.o
>> +font-$(CONFIG_FONT_8x8)       += font_8x8.o
> Please sort the anonymous entries by increasing font size.

Makes sense. I'll also leave a comment on the sorting order.

Best regards
Thomas

>
>> +font-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
>> +font-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o
>> +font-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
>> +font-$(CONFIG_FONT_SUN12x22)  += font_sun12x22.o
>> +font-$(CONFIG_FONT_SUN8x16)   += font_sun8x16.o
>> +font-$(CONFIG_FONT_TER10x18)  += font_ter10x18.o
>> +font-$(CONFIG_FONT_TER16x32)  += font_ter16x32.o
>>
>> -font-objs += $(font-objs-y)
>> -
>> -obj-$(CONFIG_FONT_SUPPORT)         += font.o
>> +obj-$(CONFIG_FONT_SUPPORT) += font.o
> Gr{oetje,eeting}s,
>
>                          Geert
>

-- 
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Jochen Jaser, Andrew McDonald, Werner Knoblich, (HRB 36809, AG Nürnberg)

Re: [PATCH 04/10] lib/fonts: Clean up Makefile

Posted by Jiri Slaby 1 day, 6 hours ago

On 01. 04. 26, 9:58, Thomas Zimmermann wrote:
>>> -font-objs-$(CONFIG_FONT_SUN8x16)   += font_sun8x16.o
>>> -font-objs-$(CONFIG_FONT_SUN12x22)  += font_sun12x22.o
>>> -font-objs-$(CONFIG_FONT_8x8)       += font_8x8.o
>>> -font-objs-$(CONFIG_FONT_8x16)      += font_8x16.o
>>> -font-objs-$(CONFIG_FONT_6x11)      += font_6x11.o
>>> -font-objs-$(CONFIG_FONT_7x14)      += font_7x14.o
>>> -font-objs-$(CONFIG_FONT_10x18)     += font_10x18.o
>>> -font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
>>> -font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
>>> -font-objs-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o
>>> -font-objs-$(CONFIG_FONT_6x10)      += font_6x10.o
>>> -font-objs-$(CONFIG_FONT_TER10x18)  += font_ter10x18.o
>>> -font-objs-$(CONFIG_FONT_TER16x32)  += font_ter16x32.o
>>> -font-objs-$(CONFIG_FONT_6x8)       += font_6x8.o
>>> +# Built-in fonts
>>> +font-$(CONFIG_FONT_10x18)     += font_10x18.o
>>> +font-$(CONFIG_FONT_6x10)      += font_6x10.o
>>> +font-$(CONFIG_FONT_6x11)      += font_6x11.o
>>> +font-$(CONFIG_FONT_6x8)       += font_6x8.o
>>> +font-$(CONFIG_FONT_7x14)      += font_7x14.o
>>> +font-$(CONFIG_FONT_8x16)      += font_8x16.o
>>> +font-$(CONFIG_FONT_8x8)       += font_8x8.o
>> Please sort the anonymous entries by increasing font size.
> 
> Makes sense. I'll also leave a comment on the sorting order.

>>> +font-$(CONFIG_FONT_SUN12x22)  += font_sun12x22.o
>>> +font-$(CONFIG_FONT_SUN8x16)   += font_sun8x16.o

I'd sort even the non-anonymous ^^.

thanks,
-- 
js
suse labs

Re: [PATCH 04/10] lib/fonts: Clean up Makefile

Posted by Thomas Zimmermann 1 day, 6 hours ago

Hi

Am 01.04.26 um 10:58 schrieb Jiri Slaby:
> On 01. 04. 26, 9:58, Thomas Zimmermann wrote:
>>>> -font-objs-$(CONFIG_FONT_SUN8x16)   += font_sun8x16.o
>>>> -font-objs-$(CONFIG_FONT_SUN12x22)  += font_sun12x22.o
>>>> -font-objs-$(CONFIG_FONT_8x8)       += font_8x8.o
>>>> -font-objs-$(CONFIG_FONT_8x16)      += font_8x16.o
>>>> -font-objs-$(CONFIG_FONT_6x11)      += font_6x11.o
>>>> -font-objs-$(CONFIG_FONT_7x14)      += font_7x14.o
>>>> -font-objs-$(CONFIG_FONT_10x18)     += font_10x18.o
>>>> -font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
>>>> -font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
>>>> -font-objs-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o
>>>> -font-objs-$(CONFIG_FONT_6x10)      += font_6x10.o
>>>> -font-objs-$(CONFIG_FONT_TER10x18)  += font_ter10x18.o
>>>> -font-objs-$(CONFIG_FONT_TER16x32)  += font_ter16x32.o
>>>> -font-objs-$(CONFIG_FONT_6x8)       += font_6x8.o
>>>> +# Built-in fonts
>>>> +font-$(CONFIG_FONT_10x18)     += font_10x18.o
>>>> +font-$(CONFIG_FONT_6x10)      += font_6x10.o
>>>> +font-$(CONFIG_FONT_6x11)      += font_6x11.o
>>>> +font-$(CONFIG_FONT_6x8)       += font_6x8.o
>>>> +font-$(CONFIG_FONT_7x14)      += font_7x14.o
>>>> +font-$(CONFIG_FONT_8x16)      += font_8x16.o
>>>> +font-$(CONFIG_FONT_8x8)       += font_8x8.o
>>> Please sort the anonymous entries by increasing font size.
>>
>> Makes sense. I'll also leave a comment on the sorting order.
>
>>>> +font-$(CONFIG_FONT_SUN12x22)  += font_sun12x22.o
>>>> +font-$(CONFIG_FONT_SUN8x16)   += font_sun8x16.o
>
> I'd sort even the non-anonymous ^^.

My plan is now to sort by font-family, then by font height, then by font 
width. Each in ascending order.

Best regards
Thomas

>
> thanks,

-- 
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Jochen Jaser, Andrew McDonald, Werner Knoblich, (HRB 36809, AG Nürnberg)