Merge remote-tracking branch 'upstream/master'

9 files changed, 30 insertions, 11 deletions

diff --git a/bsp/imxrt1052-evk/drivers/drv_hp_rtc.c b/bsp/imxrt1052-evk/drivers/drv_hp_rtc.c
index 29093e0eb8..42448ae737 100644
--- a/bsp/imxrt1052-evk/drivers/drv_hp_rtc.c
+++ b/bsp/imxrt1052-evk/drivers/drv_hp_rtc.c
@@ -61,7 +61,6 @@ static int set_timestamp(time_t timestamp)
     return RT_EOK;
 }
 
-/* �����ӿ� */
 static rt_err_t rt1052_hp_rtc_init(rt_device_t dev)
 {
     snvs_hp_rtc_config_t snvsRtcConfig;
@@ -112,7 +111,6 @@ static rt_err_t rt1052_hp_rtc_control(rt_device_t dev, int cmd, void *args)
         }
         break;
             
-        /* ������ */
         default:
             return RT_EINVAL; 
     }
diff --git a/bsp/v2m-mps2/rtconfig.py b/bsp/v2m-mps2/rtconfig.py
index b63ea11a91..fd76abcf42 100644
--- a/bsp/v2m-mps2/rtconfig.py
+++ b/bsp/v2m-mps2/rtconfig.py
@@ -5,9 +5,6 @@ ARCH='arm'
 CPU='cortex-m7'
 CROSS_TOOL='keil'
 
-if os.getenv('RTT_CC'):
-	CROSS_TOOL = os.getenv('RTT_CC')
-
 if CROSS_TOOL == 'keil':
 	PLATFORM 	= 'armcc'
 	EXEC_PATH 	= 'C:/Keil_v5'
@@ -48,7 +45,6 @@ if PLATFORM == 'armcc':
     CFLAGS += ' --c99'
 
     POST_ACTION = 'fromelf -z $TARGET'
-    # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
 else:
 	print("only support armcc in this bsp")
 	exit(-1)
diff --git a/components/drivers/Kconfig b/components/drivers/Kconfig
index 90ad1c940f..fc02b0eaed 100755
--- a/components/drivers/Kconfig
+++ b/components/drivers/Kconfig
@@ -90,6 +90,7 @@ config RT_USING_RTC
         default n
     config RTC_SYNC_USING_NTP
         bool "Using NTP auto sync RTC time"
+        select PKG_USING_NETUTILS
         select PKG_NETUTILS_NTP
         default n
         
diff --git a/components/drivers/rtc/rtc.c b/components/drivers/rtc/rtc.c
index a33e1dfccf..f64a528ef0 100644
--- a/components/drivers/rtc/rtc.c
+++ b/components/drivers/rtc/rtc.c
@@ -225,6 +225,8 @@ int rt_rtc_ntp_sync_init(void)
     }
 
     init_ok = RT_TRUE;
+		
+    return RT_EOK;
 }
 INIT_COMPONENT_EXPORT(rt_rtc_ntp_sync_init);
 #endif /* RTC_SYNC_USING_NTP */
diff --git a/components/libc/compilers/armlibc/sys/unistd.h b/components/libc/compilers/armlibc/sys/unistd.h
index 38ba8b5072..56979955ba 100644
--- a/components/libc/compilers/armlibc/sys/unistd.h
+++ b/components/libc/compilers/armlibc/sys/unistd.h
@@ -4,6 +4,11 @@
 #include <rtthread.h>
 
 #ifdef RT_USING_DFS
+
+#define STDIN_FILENO    0       /* standard input file descriptor */
+#define STDOUT_FILENO   1       /* standard output file descriptor */
+#define STDERR_FILENO   2       /* standard error file descriptor */
+
 #include <dfs_posix.h>
 #else
 #define _FREAD      0x0001  /* read enabled */
diff --git a/components/libc/compilers/dlib/fcntl.h b/components/libc/compilers/dlib/fcntl.h
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/components/libc/compilers/dlib/fcntl.h
diff --git a/components/libc/compilers/dlib/sys/stat.h b/components/libc/compilers/dlib/sys/stat.h
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/components/libc/compilers/dlib/sys/stat.h
diff --git a/components/libc/compilers/dlib/sys/unistd.h b/components/libc/compilers/dlib/sys/unistd.h
index 06a46746c0..dbe4f3010d 100644
--- a/components/libc/compilers/dlib/sys/unistd.h
+++ b/components/libc/compilers/dlib/sys/unistd.h
@@ -2,6 +2,11 @@
 #define _SYS_UNISTD_H
 
 #ifdef RT_USING_DFS
+
+#define STDIN_FILENO    0       /* standard input file descriptor */
+#define STDOUT_FILENO   1       /* standard output file descriptor */
+#define STDERR_FILENO   2       /* standard error file descriptor */
+
 #include <dfs_posix.h>
 #else
 #define	_FREAD		0x0001	/* read enabled */
diff --git a/include/libc/libc_stat.h b/include/libc/libc_stat.h
index 69871dd101..26752393db 100644
--- a/include/libc/libc_stat.h
+++ b/include/libc/libc_stat.h
@@ -77,11 +77,23 @@
 
 struct stat
 {
-    struct rt_device* st_dev;
-    uint16_t st_mode;
-    uint32_t st_size;
-    time_t   st_mtime;
-    uint32_t st_blksize;
+    struct rt_device *st_dev;
+    uint16_t  st_ino;
+    uint16_t  st_mode;
+    uint16_t  st_nlink;
+    uint16_t  st_uid;
+    uint16_t  st_gid;
+    struct rt_device *st_rdev;
+    uint32_t  st_size;
+    time_t    st_atime;
+    long      st_spare1;
+    time_t    st_mtime;
+    long      st_spare2;
+    time_t    st_ctime;
+    long      st_spare3;
+    uint32_t  st_blksize;
+    uint32_t  st_blocks;
+    long      st_spare4[2];
 };
 
 #endif