[T][SRU][PATCHv2 5/5] UBUNTU: [Config]: enable highdpi Terminus 16x32 font support

[Po-Hsu Lin]

BugLink: https://bugs.launchpad.net/bugs/1819881

Enable the Hi-DPI 16x32 font support.

Also enable the compiled-in font support.

Signed-off-by: Po-Hsu Lin <po-hsu.lin at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 2 +-
 debian.master/config/annotations                   | 3 ++-
 debian.master/config/arm64/config.common.arm64     | 2 +-
 debian.master/config/config.common.ubuntu          | 2 ++
 debian.master/config/i386/config.common.i386       | 2 +-
 debian.master/config/powerpc/config.common.powerpc | 2 +-
 debian.master/config/ppc64el/config.common.ppc64el | 2 +-
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 4204ad9..7ed87f4 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -46,7 +46,7 @@ CONFIG_FB_UDL=m
 CONFIG_FB_VOODOO1=m
 # CONFIG_FMAN_P1023 is not set
 CONFIG_FMAN_P3040_P4080_P5020=y
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
 CONFIG_FRAME_WARN=1024
 CONFIG_FSL_FMAN=y
 CONFIG_FUNCTION_TRACER=y
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 469b39f..f90fb0e 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1699,7 +1699,7 @@ CONFIG_CRC_T10DIF y note<dependancy of boot essential>
 CONFIG_CRC32					y note<dependancy of boot essential>
 CONFIG_CRC32_SELFTEST n flag<TESTING>
 CONFIG_XZ_DEC y note<boot essential -- initramfs decompressor>
-CONFIG_FONTS					p policy<(arch armel armhf &/ value y) | value n>
+CONFIG_FONTS					p policy<(arch amd64 armhf i386 powerpc ppc64el &/ value y) | value n>
 CONFIG_FONT_8x8					y
 CONFIG_FONT_8x16				y
 CONFIG_FONT_6x11				n
@@ -1710,6 +1710,7 @@ CONFIG_FONT_MINI_4x6				n
 CONFIG_FONT_SUN8x16				n
 CONFIG_FONT_SUN12x22				n
 CONFIG_FONT_10x18				n
+CONFIG_FONT_TER16x32                            y
 
 # Menu: Networking options
 CONFIG_PACKET					y note<core protocol>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 82c6c90..11326f1 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -38,7 +38,7 @@ CONFIG_FB_SYS_IMAGEBLIT=m
 CONFIG_FB_VOODOO1=m
 # CONFIG_FMAN_P1023 is not set
 CONFIG_FMAN_P3040_P4080_P5020=y
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_FRAME_WARN=1024
 CONFIG_FSL_FMAN=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 3dc161c..ffc07c60 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2123,6 +2123,7 @@ CONFIG_FMC_CHARDEV=m
 CONFIG_FMC_FAKEDEV=m
 CONFIG_FMC_TRIVIAL=m
 CONFIG_FMC_WRITE_EEPROM=m
+CONFIG_FONTS=y
 # CONFIG_FONT_10x18 is not set
 # CONFIG_FONT_6x10 is not set
 # CONFIG_FONT_6x11 is not set
@@ -2135,6 +2136,7 @@ CONFIG_FONT_ACORN_8x8=y
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_SUN8x16 is not set
 CONFIG_FONT_SUPPORT=y
+CONFIG_FONT_TER16x32=y
 CONFIG_FORCEDETH=m
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index e42c57c..5198088 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -45,7 +45,7 @@ CONFIG_FB_UDL=m
 CONFIG_FB_VOODOO1=m
 # CONFIG_FMAN_P1023 is not set
 CONFIG_FMAN_P3040_P4080_P5020=y
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
 CONFIG_FRAME_WARN=1024
 CONFIG_FSL_FMAN=y
 CONFIG_FUNCTION_TRACER=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 67d7e73..496f36f 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -39,7 +39,7 @@ CONFIG_FB_MACMODES=y
 CONFIG_FB_RADEON=y
 CONFIG_FB_SVGALIB=m
 CONFIG_FB_VOODOO1=y
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
 CONFIG_FRAME_WARN=1024
 CONFIG_FUNCTION_TRACER=y
 # CONFIG_GENERIC_CSUM is not set
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index f0e7fa5..e452328 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -48,7 +48,7 @@ CONFIG_FB_UDL=m
 CONFIG_FB_VOODOO1=m
 # CONFIG_FMAN_P1023 is not set
 CONFIG_FMAN_P3040_P4080_P5020=y
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
 CONFIG_FORCE_MAX_ZONEORDER=9
 CONFIG_FRAME_WARN=2048
 CONFIG_FSL_FMAN=y
-- 
2.7.4