Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develp

2022-10-20 16:36:38 +08:00
parent a4f183c62a a11ff29402
commit 0f2f2028ca
24 changed files with 12677 additions and 11312 deletions
@@ -107,3 +107,6 @@ CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0
 CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=0

+CONFIG_USER_TEST=y
+CONFIG_USER_TEST_LCD=y
+
@@ -23,6 +23,7 @@ CONFIG_BOARD_LOOPSPERMSEC=104926
 CONFIG_BUILTIN=y
 CONFIG_CLOCK_MONOTONIC=y
 CONFIG_ETH0_PHY_LAN8720=y
+CONFIG_FS_PROCFS=y
 CONFIG_IMXRT_ENET_PHYINIT=y
 CONFIG_IMXRT_GPIO_IRQ=y
 CONFIG_IMXRT_GPIO3_0_15_IRQ=y
@@ -72,8 +73,8 @@ CONFIG_READLINE_CMD_HISTORY=y
 CONFIG_READLINE_CMD_HISTORY_LEN=100
 CONFIG_READLINE_CMD_HISTORY_LINELEN=120
 CONFIG_READLINE_TABCOMPLETION=y
-CONFIG_FS_ROMFS=y
-CONFIG_NSH_ROMFSETC=y
-CONFIG_NSH_ARCHROMFS=y
+
 CONFIG_BOARDCTL_RESET=y
 CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_APPLICATION_CONNECTION=y
+CONFIG_SOCKET_DEMO=y
@@ -47,15 +47,17 @@ CONFIG_SYSTEM_NSH=y
 CONFIG_DEV_GPIO=y
 CONFIG_READLINE_CMD_HISTORY=y
 CONFIG_READLINE_CMD_HISTORY_LEN=100
+
 CONFIG_READLINE_CMD_HISTORY_LINELEN=120
 CONFIG_READLINE_TABCOMPLETION=y
 CONFIG_FS_ROMFS=y
 CONFIG_NSH_ROMFSETC=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_BOARDCTL_RESET=y
-CONFIG_CONNECTION_FRAMEWORK_DEBUG=y
 CONFIG_CONNECTION_ADAPTER_WIFI=y
 CONFIG_ADAPTER_ESP07S_WIFI=y
 CONFIG_ADAPTER_WIFI_ESP07S="esp07s_wifi"
 CONFIG_ADAPTER_ESP07S_DRIVER="/dev/ttyS2"
 CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_SUPPORT_CONNECTION_FRAMEWORK=y
+
@@ -62,4 +62,7 @@ CONFIG_K210_HAVE_LCD=y
 CONFIG_K210_LCD=y
 CONFIG_K210_LCD_BACKLIGHT=y
 CONFIG_LCD=y
-CONFIG_LCD_LT768=y
+CONFIG_LCD_LT768=y
+
+CONFIG_USER_TEST=y
+CONFIG_USER_TEST_LCD=y