mirror of
https://github.com/torvalds/linux.git
synced 2026-06-10 07:32:29 +02:00
Revert "rk29: disable VT/FRAMEBUFFER_CONSOLE, enable FB_EARLYSUSPEND, try to fix some time unable to wake up system bug, and faster wake up system"
This reverts commit 1b56ce9847.
Conflicts:
arch/arm/configs/rk29_sdk_defconfig
Android need VT to show /initlogo.rle.
This commit is contained in:
parent
4bd4010a9c
commit
37f7a283e9
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user