Revert "rk29: disable VT/FRAMEBUFFER_CONSOLE, enable FB_EARLYSUSPEND, try to fix...

This reverts commit 1b56ce984734b2f7c05fede31e8cc23070b86d6c.
Conflicts:

	arch/arm/configs/rk29_sdk_defconfig

Android need VT to show /initlogo.rle.

diff --git a/arch/arm/configs/rk29_Winaccord_defconfig b/arch/arm/configs/rk29_Winaccord_defconfig
index 1a7a9a9ccb52b54a6cce8f0d8da256a3e72d7745..f310b3cdadc349fc51f0783947706f6e14c01a8e 100644 (file)
--- a/arch/arm/configs/rk29_Winaccord_defconfig
+++ b/arch/arm/configs/rk29_Winaccord_defconfig
@@ -784,7 +784,7 @@ CONFIG_INPUT_GPIO=y
 #
 # Character devices
 #
-# CONFIG_VT is not set
+CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y

diff --git a/arch/arm/configs/rk29_a22_defconfig b/arch/arm/configs/rk29_a22_defconfig
index 9174793227da7bf32a54c922ec2b23023f18ed01..8bb7ac58d113b6b7845234c2ba72f19e0dab705b 100755 (executable)
--- a/arch/arm/configs/rk29_a22_defconfig
+++ b/arch/arm/configs/rk29_a22_defconfig
@@ -875,7 +875,11 @@ CONFIG_GS_MMA8452=y
 #
 # Character devices
 #
-# CONFIG_VT is not set
+CONFIG_VT=y
+# CONFIG_CONSOLE_TRANSLATIONS is not set
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
 CONFIG_DEVMEM=y
 CONFIG_DEVKMEM=y
 # CONFIG_SERIAL_NONSTANDARD is not set

diff --git a/arch/arm/configs/rk29_ddr3sdk_defconfig b/arch/arm/configs/rk29_ddr3sdk_defconfig
index 429dae5b07eb5a584c479e7cfe2351970af0d767..21aa3bdb8727b7061a9386809fafd6108232ab95 100644 (file)
--- a/arch/arm/configs/rk29_ddr3sdk_defconfig
+++ b/arch/arm/configs/rk29_ddr3sdk_defconfig
@@ -875,7 +875,7 @@ CONFIG_GS_MMA8452=y
 #
 # Character devices
 #
-# CONFIG_VT is not set
+CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y

diff --git a/arch/arm/configs/rk29_malata_defconfig b/arch/arm/configs/rk29_malata_defconfig
index 5846bb5252a930ab1fb7e3a810560eec5784428b..b17e870c543466ec0197bf6b4d7b329b9580862e 100644 (file)
--- a/arch/arm/configs/rk29_malata_defconfig
+++ b/arch/arm/configs/rk29_malata_defconfig
@@ -822,7 +822,7 @@ CONFIG_GS_MMA8452=y
 #
 # Character devices
 #
-# CONFIG_VT is not set
+CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y

diff --git a/arch/arm/configs/rk29_phonesdk_defconfig b/arch/arm/configs/rk29_phonesdk_defconfig
index 4d99ab1212ccc0f4d6f1053f3942a3c7c27b97f7..76ef42f00f755ae9607744cde68202fdc301854e 100755 (executable)
--- a/arch/arm/configs/rk29_phonesdk_defconfig
+++ b/arch/arm/configs/rk29_phonesdk_defconfig
@@ -903,7 +903,7 @@ CONFIG_GS_MMA8452=y
 #
 # Character devices
 #
-# CONFIG_VT is not set
+CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y

diff --git a/arch/arm/configs/rk29_sdk_defconfig b/arch/arm/configs/rk29_sdk_defconfig
index ebc8a3d3d1471ffa596e1b592c209ec67b23e1f8..f41fa86d80be70c000eca2f1356e7e1d91ac4f8c 100755 (executable)
--- a/arch/arm/configs/rk29_sdk_defconfig
+++ b/arch/arm/configs/rk29_sdk_defconfig
@@ -1053,7 +1053,11 @@ CONFIG_GS_L3G4200D=y
 #
 # Character devices
 #
-# CONFIG_VT is not set
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
 CONFIG_DEVMEM=y
 CONFIG_DEVKMEM=y
 # CONFIG_SERIAL_NONSTANDARD is not set

diff --git a/arch/arm/configs/rk29_sdk_yaffs2_defconfig b/arch/arm/configs/rk29_sdk_yaffs2_defconfig
index a5808462b54b5094591b6a98c7a4593deec25c5a..a027478c6502680865cf316319ab82de1e8ce723 100644 (file)
--- a/arch/arm/configs/rk29_sdk_yaffs2_defconfig
+++ b/arch/arm/configs/rk29_sdk_yaffs2_defconfig
@@ -825,7 +825,7 @@ CONFIG_INPUT_GPIO=y
 #
 # Character devices
 #
-# CONFIG_VT is not set
+CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y