[B][SRU][PATCHv2 2/2] 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/ppc64el/config.common.ppc64el | 2 +-
 debian.master/config/s390x/config.common.s390x     | 1 +
 7 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index be26c08..fddb11d 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -124,7 +124,7 @@ CONFIG_FIREWIRE_NOSY=m
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIXED_PHY=y
 CONFIG_FMC=m
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
 CONFIG_FRAME_WARN=1024
 CONFIG_FUSION=y
 CONFIG_GAMEPORT=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 1910206..5016f44 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -9795,7 +9795,7 @@ CONFIG_CRC32_SARWATE                            policy<{'amd64': 'n', 'arm64': '
 CONFIG_CRC32_BIT                                policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 
 # Menu: Library routines >> Select compiled-in fonts
-CONFIG_FONTS                                    policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'y', 'i386': 'n', 'ppc64el': 'n'}>
+CONFIG_FONTS                                    policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_FONT_8x8                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
 CONFIG_FONT_8x16                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
 CONFIG_FONT_6x11                                policy<{'armhf': 'n'}>
@@ -9807,6 +9807,7 @@ CONFIG_FONT_6x10                                policy<{'armhf': 'y'}>
 CONFIG_FONT_10x18                               policy<{'armhf': 'n'}>
 CONFIG_FONT_SUN8x16                             policy<{'armhf': 'n'}>
 CONFIG_FONT_SUN12x22                            policy<{'armhf': 'n'}>
+CONFIG_FONT_TER16x32                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 
 # Menu: Library routines >> XZ decompression support
 CONFIG_XZ_DEC                                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 5cd036b..a124620 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -127,7 +127,7 @@ CONFIG_FIREWIRE_NOSY=m
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIXED_PHY=y
 CONFIG_FMC=m
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
 CONFIG_FORCE_MAX_ZONEORDER=13
 CONFIG_FRAME_WARN=1024
 CONFIG_FUSION=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index aa4fbbc..f6a2c30 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3001,6 +3001,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=y
 # CONFIG_FONT_6x11 is not set
@@ -3013,6 +3014,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_FORCE_SMP=y
 CONFIG_FORTIFY_SOURCE=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index c7a6d60..f5d1691 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -120,7 +120,7 @@ CONFIG_FIREWIRE_NOSY=m
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIXED_PHY=y
 CONFIG_FMC=m
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
 CONFIG_FRAME_WARN=1024
 CONFIG_FUSION=y
 CONFIG_GAMEPORT=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index d050fc5..a94287b 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -120,7 +120,7 @@ CONFIG_FIREWIRE_NOSY=m
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIXED_PHY=y
 CONFIG_FMC=m
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
 CONFIG_FORCE_MAX_ZONEORDER=9
 CONFIG_FRAME_WARN=2048
 CONFIG_FUSION=y
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 6f15e3d..fcb298d 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -93,6 +93,7 @@ CONFIG_DM_MQ_DEFAULT=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 # CONFIG_FMC is not set
+CONFIG_FONTS=y
 CONFIG_FORCE_MAX_ZONEORDER=9
 CONFIG_FRAME_WARN=1024
 # CONFIG_FUSION is not set
-- 
2.7.4