From 15e78470f8ca459a626fc6a3af84c7642c37548c Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Wed, 13 Sep 2023 00:54:53 +0800
Subject: [PATCH] arch/sim: Guard frame buffer related setting in SIM_X11FB

and remove SIM_VNCSERVER

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 arch/sim/Kconfig                               | 10 +++-------
 boards/sim/sim/sim/configs/fb/defconfig        |  1 +
 boards/sim/sim/sim/configs/nx/defconfig        |  1 +
 boards/sim/sim/sim/configs/vncserver/defconfig |  1 -
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/arch/sim/Kconfig b/arch/sim/Kconfig
index 7193b9c0e8ff6..c55d729f1d2d5 100644
--- a/arch/sim/Kconfig
+++ b/arch/sim/Kconfig
@@ -326,10 +326,10 @@ config SIM_X11FB
 	---help---
 		Use X11 to provide graphics and input emulation to interact with host.
 
+if SIM_X11FB
 config SIM_X11NOSHM
 	bool "Don't use shared memory with X11"
 	default n
-	depends on SIM_X11FB
 	---help---
 		Don't use shared memory with the X11 graphics device emulation.
 
@@ -383,14 +383,10 @@ config SIM_FRAMEBUFFER
 	---help---
 		Emulate a framebuffer
 
-config SIM_VNCSERVER
-	bool "VNC server"
-	depends on VNCSERVER
-	---help---
-		Serve a VNC server
-
 endchoice
 
+endif # SIM_X11FB
+
 if INPUT
 choice
 	prompt "Input Device"
diff --git a/boards/sim/sim/sim/configs/fb/defconfig b/boards/sim/sim/sim/configs/fb/defconfig
index 43f4b2b13d1e6..7a7f93db9993f 100644
--- a/boards/sim/sim/sim/configs/fb/defconfig
+++ b/boards/sim/sim/sim/configs/fb/defconfig
@@ -19,6 +19,7 @@ CONFIG_DRIVERS_VIDEO=y
 CONFIG_EXAMPLES_FB=y
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_INIT_ENTRYPOINT="fb_main"
+CONFIG_SIM_X11FB=y
 CONFIG_START_DAY=28
 CONFIG_START_MONTH=11
 CONFIG_START_YEAR=2008
diff --git a/boards/sim/sim/sim/configs/nx/defconfig b/boards/sim/sim/sim/configs/nx/defconfig
index e2d85227186f9..688b9f451356d 100644
--- a/boards/sim/sim/sim/configs/nx/defconfig
+++ b/boards/sim/sim/sim/configs/nx/defconfig
@@ -26,6 +26,7 @@ CONFIG_NXFONT_SANS23X27=y
 CONFIG_NX_BLOCKING=y
 CONFIG_NX_KBD=y
 CONFIG_NX_XYINPUT_MOUSE=y
+CONFIG_SIM_X11FB=y
 CONFIG_START_DAY=28
 CONFIG_START_MONTH=11
 CONFIG_START_YEAR=2008
diff --git a/boards/sim/sim/sim/configs/vncserver/defconfig b/boards/sim/sim/sim/configs/vncserver/defconfig
index a8de2d713e6a1..3b51cc68da7d6 100644
--- a/boards/sim/sim/sim/configs/vncserver/defconfig
+++ b/boards/sim/sim/sim/configs/vncserver/defconfig
@@ -23,7 +23,6 @@ CONFIG_NET_USRSOCK_TCP=y
 CONFIG_NET_USRSOCK_UDP=y
 CONFIG_SCHED_LPWORK=y
 CONFIG_SIM_NETUSRSOCK=y
-CONFIG_SIM_VNCSERVER=y
 CONFIG_VIDEO_FB=y
 CONFIG_VNCSERVER=y
 CONFIG_VNCSERVER_COLORFMT_RGB32=y