From 83e95bdff4c48c661b50e1eec56d5fd293b28fbb Mon Sep 17 00:00:00 2001
From: Shell <smokewood@qq.com>
Date: Thu, 28 Mar 2024 23:42:56 +0800
Subject: sync smart & dfs (#8672)

Signed-off-by: xqyjlj <xqyjlj@126.com>
Signed-off-by: Shell <smokewood@qq.com>
Co-authored-by: xqyjlj <xqyjlj@126.com>
---
 bsp/qemu-vexpress-a9/.config                   |  4 ++--
 bsp/qemu-vexpress-a9/rtconfig.h                |  3 ++-
 bsp/qemu-virt64-aarch64/applications/console.c | 25 -------------------------
 bsp/qemu-virt64-aarch64/applications/main.c    |  1 -
 4 files changed, 4 insertions(+), 29 deletions(-)

(limited to 'bsp')

diff --git a/bsp/qemu-vexpress-a9/.config b/bsp/qemu-vexpress-a9/.config
index 9c2d7d8d95..d7e75a08e0 100644
--- a/bsp/qemu-vexpress-a9/.config
+++ b/bsp/qemu-vexpress-a9/.config
@@ -81,7 +81,7 @@ CONFIG_RT_USING_CONSOLE=y
 CONFIG_RT_CONSOLEBUF_SIZE=256
 CONFIG_RT_CONSOLE_DEVICE_NAME="uart0"
 CONFIG_RT_VER_NUM=0x50100
-# CONFIG_RT_USING_STDC_ATOMIC is not set
+CONFIG_RT_USING_STDC_ATOMIC=y
 CONFIG_RT_BACKTRACE_LEVEL_MAX_NR=32
 CONFIG_RT_USING_CACHE=y
 CONFIG_RT_USING_HW_ATOMIC=y
@@ -203,7 +203,7 @@ CONFIG_RT_USING_SOFT_RTC=y
 CONFIG_RT_USING_SDIO=y
 CONFIG_RT_SDIO_STACK_SIZE=4096
 CONFIG_RT_SDIO_THREAD_PRIORITY=15
-CONFIG_RT_MMCSD_STACK_SIZE=4096
+CONFIG_RT_MMCSD_STACK_SIZE=16384
 CONFIG_RT_MMCSD_THREAD_PREORITY=22
 CONFIG_RT_MMCSD_MAX_PARTITION=16
 # CONFIG_RT_SDIO_DEBUG is not set
diff --git a/bsp/qemu-vexpress-a9/rtconfig.h b/bsp/qemu-vexpress-a9/rtconfig.h
index d0b3ce7d14..7ba40f4429 100644
--- a/bsp/qemu-vexpress-a9/rtconfig.h
+++ b/bsp/qemu-vexpress-a9/rtconfig.h
@@ -54,6 +54,7 @@
 #define RT_CONSOLEBUF_SIZE 256
 #define RT_CONSOLE_DEVICE_NAME "uart0"
 #define RT_VER_NUM 0x50100
+#define RT_USING_STDC_ATOMIC
 #define RT_BACKTRACE_LEVEL_MAX_NR 32
 #define RT_USING_CACHE
 #define RT_USING_HW_ATOMIC
@@ -138,7 +139,7 @@
 #define RT_USING_SDIO
 #define RT_SDIO_STACK_SIZE 4096
 #define RT_SDIO_THREAD_PRIORITY 15
-#define RT_MMCSD_STACK_SIZE 4096
+#define RT_MMCSD_STACK_SIZE 16384
 #define RT_MMCSD_THREAD_PREORITY 22
 #define RT_MMCSD_MAX_PARTITION 16
 #define RT_USING_SPI
diff --git a/bsp/qemu-virt64-aarch64/applications/console.c b/bsp/qemu-virt64-aarch64/applications/console.c
index f560206a3f..b69b9b3b97 100644
--- a/bsp/qemu-virt64-aarch64/applications/console.c
+++ b/bsp/qemu-virt64-aarch64/applications/console.c
@@ -10,10 +10,6 @@
 
 #include <rtthread.h>
 
-#if defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_SMART)
-#include <console.h>
-#endif
-
 #include <virtio_console.h>
 
 static int console_init()
@@ -36,8 +32,6 @@ static int console_init()
 }
 INIT_ENV_EXPORT(console_init);
 
-#ifdef FINSH_USING_MSH
-
 static int console(int argc, char **argv)
 {
     rt_err_t result = RT_EOK;
@@ -48,23 +42,6 @@ static int console(int argc, char **argv)
         {
             rt_kprintf("console change to %s\n", argv[2]);
             rt_console_set_device(argv[2]);
-
-        #ifdef RT_USING_POSIX_DEVIO
-            {
-                rt_device_t dev = rt_device_find(argv[2]);
-
-                if (dev != RT_NULL)
-                {
-                    #ifdef RT_USING_SMART
-                        console_set_iodev(dev);
-                    #else
-                        rt_kprintf("TODO not supported\n");
-                    #endif
-                }
-            }
-        #else
-            finsh_set_device(argv[2]);
-        #endif /* RT_USING_POSIX_DEVIO */
         }
         else
         {
@@ -81,5 +58,3 @@ static int console(int argc, char **argv)
     return result;
 }
 MSH_CMD_EXPORT(console, set console name);
-
-#endif /* FINSH_USING_MSH */
diff --git a/bsp/qemu-virt64-aarch64/applications/main.c b/bsp/qemu-virt64-aarch64/applications/main.c
index 63833efc20..4447a4f47d 100644
--- a/bsp/qemu-virt64-aarch64/applications/main.c
+++ b/bsp/qemu-virt64-aarch64/applications/main.c
@@ -8,7 +8,6 @@
  * 2020/10/7      bernard      the first version
  */
 
-#include <stdio.h>
 #include <rtthread.h>
 
 int main(void)
-- 
cgit v1.3.1