arch/sim: Guard frame buffer related setting in SIM_X11FB

and remove SIM_VNCSERVER

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2023-09-13 00:54:53 +08:00
committed by GUIDINGLI
parent 4d2cc2ab4d
commit 15e78470f8
4 changed files with 5 additions and 8 deletions
+3 -7
View File
@@ -326,10 +326,10 @@ config SIM_X11FB
---help--- ---help---
Use X11 to provide graphics and input emulation to interact with host. Use X11 to provide graphics and input emulation to interact with host.
if SIM_X11FB
config SIM_X11NOSHM config SIM_X11NOSHM
bool "Don't use shared memory with X11" bool "Don't use shared memory with X11"
default n default n
depends on SIM_X11FB
---help--- ---help---
Don't use shared memory with the X11 graphics device emulation. Don't use shared memory with the X11 graphics device emulation.
@@ -383,14 +383,10 @@ config SIM_FRAMEBUFFER
---help--- ---help---
Emulate a framebuffer Emulate a framebuffer
config SIM_VNCSERVER
bool "VNC server"
depends on VNCSERVER
---help---
Serve a VNC server
endchoice endchoice
endif # SIM_X11FB
if INPUT if INPUT
choice choice
prompt "Input Device" prompt "Input Device"
+1
View File
@@ -19,6 +19,7 @@ CONFIG_DRIVERS_VIDEO=y
CONFIG_EXAMPLES_FB=y CONFIG_EXAMPLES_FB=y
CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_INIT_ENTRYPOINT="fb_main" CONFIG_INIT_ENTRYPOINT="fb_main"
CONFIG_SIM_X11FB=y
CONFIG_START_DAY=28 CONFIG_START_DAY=28
CONFIG_START_MONTH=11 CONFIG_START_MONTH=11
CONFIG_START_YEAR=2008 CONFIG_START_YEAR=2008
+1
View File
@@ -26,6 +26,7 @@ CONFIG_NXFONT_SANS23X27=y
CONFIG_NX_BLOCKING=y CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y CONFIG_NX_KBD=y
CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_SIM_X11FB=y
CONFIG_START_DAY=28 CONFIG_START_DAY=28
CONFIG_START_MONTH=11 CONFIG_START_MONTH=11
CONFIG_START_YEAR=2008 CONFIG_START_YEAR=2008
@@ -23,7 +23,6 @@ CONFIG_NET_USRSOCK_TCP=y
CONFIG_NET_USRSOCK_UDP=y CONFIG_NET_USRSOCK_UDP=y
CONFIG_SCHED_LPWORK=y CONFIG_SCHED_LPWORK=y
CONFIG_SIM_NETUSRSOCK=y CONFIG_SIM_NETUSRSOCK=y
CONFIG_SIM_VNCSERVER=y
CONFIG_VIDEO_FB=y CONFIG_VIDEO_FB=y
CONFIG_VNCSERVER=y CONFIG_VNCSERVER=y
CONFIG_VNCSERVER_COLORFMT_RGB32=y CONFIG_VNCSERVER_COLORFMT_RGB32=y