Revert "UBUNTU: [Config] x86-64: SYSFB_SIMPLEFB=y"

SYSFB_SIMPLEFB was confirmed to break the fb on several x86-64 kit, revert it
for now.

This reverts commit 0bf2a2472f71a3001a8a9a0849b6bed7e7069a7b.

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index e30f176ddd1db4bac85e909be5cb9699fc787305..af22ed366eebb7f17ca2ae6dc8fcc206241332f0 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -613,6 +613,7 @@ CONFIG_SUN_PARTITION=y
 CONFIG_SURFACE_3_BUTTON=m
 CONFIG_SURFACE_3_POWER_OPREGION=m
 CONFIG_SURFACE_PRO3_BUTTON=m
+# CONFIG_SYSFB_SIMPLEFB is not set
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m
 CONFIG_TCG_TIS_I2C_ATMEL=m

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 2e57164818024dbf3babce2e13ab79bbb1c5df59..c18e7b90517febe8b6a74e9f2c2a9900589ce583 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -11192,7 +11192,7 @@ CONFIG_INTEL_STRATIX10_SERVICE                  policy<{'arm64': 'm'}>
 CONFIG_INTEL_STRATIX10_RSU                      policy<{'arm64': 'm'}>
 CONFIG_QCOM_SCM                                 policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT           policy<{'arm64': 'n', 'armhf': 'n'}>
-CONFIG_SYSFB_SIMPLEFB                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y'}>
+CONFIG_SYSFB_SIMPLEFB                           policy<{'amd64': 'n', 'arm64': 'y', 'armhf': 'y'}>
 CONFIG_TI_SCI_PROTOCOL                          policy<{'arm64': 'y'}>
 CONFIG_TRUSTED_FOUNDATIONS                      policy<{'armhf': 'y'}>
 CONFIG_TURRIS_MOX_RWTM                          policy<{'arm64': 'm', 'armhf': 'm'}>

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index ba421569e8c1f0d96c44919aa71a7cc6c39640ba..f6f7ed70ac677069acb3e0905aaef5e7116ff3a1 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -643,6 +643,7 @@ CONFIG_SUN_PARTITION=y
 # CONFIG_SURFACE_3_BUTTON is not set
 # CONFIG_SURFACE_3_POWER_OPREGION is not set
 # CONFIG_SURFACE_PRO3_BUTTON is not set
+CONFIG_SYSFB_SIMPLEFB=y
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m
 CONFIG_TCG_TIS_I2C_ATMEL=m

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 38ff9a15f5da09054c25c814b5c624bcf3c1c3ef..e302e479fcf92a55ea2441c5ad83f708f652a1ae 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -623,6 +623,7 @@ CONFIG_SSB=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
 CONFIG_SUN_PARTITION=y
+CONFIG_SYSFB_SIMPLEFB=y
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m
 CONFIG_TCG_TIS_I2C_ATMEL=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index f8540a8cd2715c07675162d4322f0b9f0cf863db..9f7af168c374e247436e827b6df260ffc134d067 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -10906,7 +10906,6 @@ CONFIG_SYSC_R8A779A0=y
 CONFIG_SYSC_RCAR=y
 CONFIG_SYSC_RMOBILE=y
 CONFIG_SYSFB=y
-CONFIG_SYSFB_SIMPLEFB=y
 CONFIG_SYSFS=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_SYSFS_SYSCALL=y