Merge branch 'master' into LwIP_software

2021-06-08 02:06:41 +08:00 · 2021-06-08 02:06:41 +08:00 · 82e7002069
parent 4caf2266b8 06c351e27c
commit 82e7002069
2000 changed files with 63132 additions and 760 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1 @@
-xsconfig.h
-xsconfig.mk
-.config
-.config.old  
-build
-XiUOS.*
-*.swp
 .vscode
--- a/APP_Framework/Applications/test
+++ b/APP_Framework/Applications/test
--- a/APP_Framework/Framework/test
+++ b/APP_Framework/Framework/test
--- a/board/aiit-arm32-board/third_party_driver/common/Kconfig
+++ b/board/aiit-arm32-board/third_party_driver/common/Kconfig
--- a/board/aiit-arm32-board/third_party_driver/extmem/Kconfig
+++ b/board/aiit-arm32-board/third_party_driver/extmem/Kconfig
--- a/Ubiquitous/XiUOS/.gitignore
+++ b/Ubiquitous/XiUOS/.gitignore
@ -0,0 +1,8 @@
+xsconfig.h
+xsconfig.mk
+.config
+.config.old  
+build
+XiUOS.*
+*.swp
+.vscode
--- a/Ubiquitous/XiUOS/Kconfig
+++ b/Ubiquitous/XiUOS/Kconfig
--- a/Ubiquitous/XiUOS/LICENSE
+++ b/Ubiquitous/XiUOS/LICENSE
--- a/Ubiquitous/XiUOS/Makefile
+++ b/Ubiquitous/XiUOS/Makefile
@ -5,7 +5,7 @@ MAKEFLAGS += --no-print-directory
 .PHONY:COMPILE_APP COMPILE_KERNEL


-support :=kd233 stm32f407-st-discovery maix-go stm32f407zgt6 aiit-riscv64-board aiit-arm32-board hifive1-rev-B hifive1-emulator k210-emulator cortex-m3-emulator
+support :=kd233 stm32f407-st-discovery maix-go stm32f407zgt6 aiit-riscv64-board aiit-arm32-board hifive1-rev-B hifive1-emulator k210-emulator cortex-m3-emulator ok1052-c
 SRC_DIR:=

 export BOARD ?=kd233
--- a/Ubiquitous/XiUOS/README.md
+++ b/Ubiquitous/XiUOS/README.md
--- a/Ubiquitous/XiUOS/applications/Kconfig
+++ b/Ubiquitous/XiUOS/applications/Kconfig
--- a/Ubiquitous/XiUOS/applications/Makefile
+++ b/Ubiquitous/XiUOS/applications/Makefile
--- a/Ubiquitous/XiUOS/applications/app_newlib/Makefile
+++ b/Ubiquitous/XiUOS/applications/app_newlib/Makefile
--- a/Ubiquitous/XiUOS/applications/app_newlib/fs_syscalls.c
+++ b/Ubiquitous/XiUOS/applications/app_newlib/fs_syscalls.c
--- a/Ubiquitous/XiUOS/applications/app_newlib/include/libc.h
+++ b/Ubiquitous/XiUOS/applications/app_newlib/include/libc.h
--- a/Ubiquitous/XiUOS/applications/app_newlib/mem_syscalls.c
+++ b/Ubiquitous/XiUOS/applications/app_newlib/mem_syscalls.c
--- a/Ubiquitous/XiUOS/applications/app_newlib/stdio.c
+++ b/Ubiquitous/XiUOS/applications/app_newlib/stdio.c
--- a/Ubiquitous/XiUOS/applications/app_newlib/task_syscalls.c
+++ b/Ubiquitous/XiUOS/applications/app_newlib/task_syscalls.c
--- a/Ubiquitous/XiUOS/applications/app_newlib/time_syscalls.c
+++ b/Ubiquitous/XiUOS/applications/app_newlib/time_syscalls.c
--- a/Ubiquitous/XiUOS/applications/app_test/Kconfig
+++ b/Ubiquitous/XiUOS/applications/app_test/Kconfig
--- a/Ubiquitous/XiUOS/applications/app_test/Makefile
+++ b/Ubiquitous/XiUOS/applications/app_test/Makefile
--- a/Ubiquitous/XiUOS/applications/app_test/test_adhoc_lora.c
+++ b/Ubiquitous/XiUOS/applications/app_test/test_adhoc_lora.c
--- a/Ubiquitous/XiUOS/applications/app_test/test_spi_flash.c
+++ b/Ubiquitous/XiUOS/applications/app_test/test_spi_flash.c
--- a/Ubiquitous/XiUOS/applications/connection_demo/adhoc_lora_demo/Makefile
+++ b/Ubiquitous/XiUOS/applications/connection_demo/adhoc_lora_demo/Makefile
--- a/Ubiquitous/XiUOS/applications/connection_demo/adhoc_lora_demo/client.c
+++ b/Ubiquitous/XiUOS/applications/connection_demo/adhoc_lora_demo/client.c
--- a/Ubiquitous/XiUOS/applications/connection_demo/adhoc_lora_demo/gateway.c
+++ b/Ubiquitous/XiUOS/applications/connection_demo/adhoc_lora_demo/gateway.c
--- a/Ubiquitous/XiUOS/applications/connection_demo/bluetooth_demo/Makefile
+++ b/Ubiquitous/XiUOS/applications/connection_demo/bluetooth_demo/Makefile
--- a/Ubiquitous/XiUOS/applications/connection_demo/bluetooth_demo/bluetooth_receive_demo.c
+++ b/Ubiquitous/XiUOS/applications/connection_demo/bluetooth_demo/bluetooth_receive_demo.c
--- a/Ubiquitous/XiUOS/applications/connection_demo/bluetooth_demo/bluetooth_send_demo.c
+++ b/Ubiquitous/XiUOS/applications/connection_demo/bluetooth_demo/bluetooth_send_demo.c
--- a/Ubiquitous/XiUOS/applications/connection_demo/ethernet_demo/Makefile
+++ b/Ubiquitous/XiUOS/applications/connection_demo/ethernet_demo/Makefile
--- a/Ubiquitous/XiUOS/applications/connection_demo/ethernet_demo/ethernet_demo.c
+++ b/Ubiquitous/XiUOS/applications/connection_demo/ethernet_demo/ethernet_demo.c
--- a/Ubiquitous/XiUOS/applications/connection_demo/nbiot_demo/Makefile
+++ b/Ubiquitous/XiUOS/applications/connection_demo/nbiot_demo/Makefile
--- a/Ubiquitous/XiUOS/applications/connection_demo/nbiot_demo/nbiot_demo.c
+++ b/Ubiquitous/XiUOS/applications/connection_demo/nbiot_demo/nbiot_demo.c
--- a/Ubiquitous/XiUOS/applications/connection_demo/wifi_demo/Makefile
+++ b/Ubiquitous/XiUOS/applications/connection_demo/wifi_demo/Makefile
--- a/Ubiquitous/XiUOS/applications/connection_demo/wifi_demo/wifi_demo.c
+++ b/Ubiquitous/XiUOS/applications/connection_demo/wifi_demo/wifi_demo.c
--- a/Ubiquitous/XiUOS/applications/connection_demo/zigbee_demo/Makefile
+++ b/Ubiquitous/XiUOS/applications/connection_demo/zigbee_demo/Makefile
--- a/Ubiquitous/XiUOS/applications/connection_demo/zigbee_demo/zigbee_receive_demo.c
+++ b/Ubiquitous/XiUOS/applications/connection_demo/zigbee_demo/zigbee_receive_demo.c
--- a/Ubiquitous/XiUOS/applications/connection_demo/zigbee_demo/zigbee_send_demo.c
+++ b/Ubiquitous/XiUOS/applications/connection_demo/zigbee_demo/zigbee_send_demo.c
--- a/Ubiquitous/XiUOS/applications/cppmain.cpp
+++ b/Ubiquitous/XiUOS/applications/cppmain.cpp
--- a/Ubiquitous/XiUOS/applications/framework_init.c
+++ b/Ubiquitous/XiUOS/applications/framework_init.c
--- a/Ubiquitous/XiUOS/applications/main.c
+++ b/Ubiquitous/XiUOS/applications/main.c
--- a/Ubiquitous/XiUOS/applications/sd_card_mount.c
+++ b/Ubiquitous/XiUOS/applications/sd_card_mount.c
--- a/Ubiquitous/XiUOS/applications/sensor_app/Makefile
+++ b/Ubiquitous/XiUOS/applications/sensor_app/Makefile
--- a/Ubiquitous/XiUOS/applications/sensor_app/co2_zg09.c
+++ b/Ubiquitous/XiUOS/applications/sensor_app/co2_zg09.c
--- a/Ubiquitous/XiUOS/applications/sensor_app/humidity_hs300x.c
+++ b/Ubiquitous/XiUOS/applications/sensor_app/humidity_hs300x.c
--- a/Ubiquitous/XiUOS/applications/sensor_app/pm1_0_ps5308.c
+++ b/Ubiquitous/XiUOS/applications/sensor_app/pm1_0_ps5308.c
--- a/Ubiquitous/XiUOS/applications/sensor_app/temperature_hs300x.c
+++ b/Ubiquitous/XiUOS/applications/sensor_app/temperature_hs300x.c
--- a/Ubiquitous/XiUOS/applications/sensor_app/voice_d124.c
+++ b/Ubiquitous/XiUOS/applications/sensor_app/voice_d124.c
--- a/Ubiquitous/XiUOS/applications/spi_sd_card_mount.c
+++ b/Ubiquitous/XiUOS/applications/spi_sd_card_mount.c
--- a/Ubiquitous/XiUOS/applications/tflite_mnist/.gitignore
+++ b/Ubiquitous/XiUOS/applications/tflite_mnist/.gitignore
--- a/Ubiquitous/XiUOS/applications/tflite_mnist/Kconfig
+++ b/Ubiquitous/XiUOS/applications/tflite_mnist/Kconfig
--- a/Ubiquitous/XiUOS/applications/tflite_mnist/Makefile
+++ b/Ubiquitous/XiUOS/applications/tflite_mnist/Makefile
--- a/Ubiquitous/XiUOS/applications/tflite_mnist/README.md
+++ b/Ubiquitous/XiUOS/applications/tflite_mnist/README.md
--- a/Ubiquitous/XiUOS/applications/tflite_mnist/digit.h
+++ b/Ubiquitous/XiUOS/applications/tflite_mnist/digit.h
--- a/Ubiquitous/XiUOS/applications/tflite_mnist/mnistapp.cpp
+++ b/Ubiquitous/XiUOS/applications/tflite_mnist/mnistapp.cpp
--- a/Ubiquitous/XiUOS/applications/tflite_mnist/mnistmain.c
+++ b/Ubiquitous/XiUOS/applications/tflite_mnist/mnistmain.c
--- a/Ubiquitous/XiUOS/applications/tflite_mnist/model.h
+++ b/Ubiquitous/XiUOS/applications/tflite_mnist/model.h
--- a/Ubiquitous/XiUOS/applications/tflite_mnist/tools/mnist-c-digit.py
+++ b/Ubiquitous/XiUOS/applications/tflite_mnist/tools/mnist-c-digit.py
--- a/Ubiquitous/XiUOS/applications/tflite_mnist/tools/mnist-c-model.py
+++ b/Ubiquitous/XiUOS/applications/tflite_mnist/tools/mnist-c-model.py
--- a/Ubiquitous/XiUOS/applications/tflite_mnist/tools/mnist-inference.py
+++ b/Ubiquitous/XiUOS/applications/tflite_mnist/tools/mnist-inference.py
--- a/Ubiquitous/XiUOS/applications/tflite_mnist/tools/mnist-train.py
+++ b/Ubiquitous/XiUOS/applications/tflite_mnist/tools/mnist-train.py
--- a/Ubiquitous/XiUOS/applications/tflite_sin/Kconfig
+++ b/Ubiquitous/XiUOS/applications/tflite_sin/Kconfig
--- a/Ubiquitous/XiUOS/applications/tflite_sin/Makefile
+++ b/Ubiquitous/XiUOS/applications/tflite_sin/Makefile
--- a/Ubiquitous/XiUOS/applications/tflite_sin/constants.cc
+++ b/Ubiquitous/XiUOS/applications/tflite_sin/constants.cc
--- a/Ubiquitous/XiUOS/applications/tflite_sin/constants.h
+++ b/Ubiquitous/XiUOS/applications/tflite_sin/constants.h
--- a/Ubiquitous/XiUOS/applications/tflite_sin/main_functions.cc
+++ b/Ubiquitous/XiUOS/applications/tflite_sin/main_functions.cc
--- a/Ubiquitous/XiUOS/applications/tflite_sin/main_functions.h
+++ b/Ubiquitous/XiUOS/applications/tflite_sin/main_functions.h
--- a/Ubiquitous/XiUOS/applications/tflite_sin/model.cc
+++ b/Ubiquitous/XiUOS/applications/tflite_sin/model.cc
--- a/Ubiquitous/XiUOS/applications/tflite_sin/model.h
+++ b/Ubiquitous/XiUOS/applications/tflite_sin/model.h
--- a/Ubiquitous/XiUOS/applications/tflite_sin/output_handler.cc
+++ b/Ubiquitous/XiUOS/applications/tflite_sin/output_handler.cc
--- a/Ubiquitous/XiUOS/applications/tflite_sin/output_handler.h
+++ b/Ubiquitous/XiUOS/applications/tflite_sin/output_handler.h
--- a/Ubiquitous/XiUOS/applications/tflite_sin/sinmain.c
+++ b/Ubiquitous/XiUOS/applications/tflite_sin/sinmain.c
--- a/Ubiquitous/XiUOS/applications/user_api/Makefile
+++ b/Ubiquitous/XiUOS/applications/user_api/Makefile
--- a/Ubiquitous/XiUOS/applications/user_api/general_functions/Makefile
+++ b/Ubiquitous/XiUOS/applications/user_api/general_functions/Makefile
--- a/Ubiquitous/XiUOS/applications/user_api/general_functions/linklist/Makefile
+++ b/Ubiquitous/XiUOS/applications/user_api/general_functions/linklist/Makefile
--- a/Ubiquitous/XiUOS/applications/user_api/general_functions/linklist/double_linklist.c
+++ b/Ubiquitous/XiUOS/applications/user_api/general_functions/linklist/double_linklist.c
--- a/Ubiquitous/XiUOS/applications/user_api/general_functions/linklist/single_linklist.c
+++ b/Ubiquitous/XiUOS/applications/user_api/general_functions/linklist/single_linklist.c
--- a/Ubiquitous/XiUOS/applications/user_api/general_functions/linklist/xs_klist.h
+++ b/Ubiquitous/XiUOS/applications/user_api/general_functions/linklist/xs_klist.h
--- a/Ubiquitous/XiUOS/applications/user_api/include/bus.h
+++ b/Ubiquitous/XiUOS/applications/user_api/include/bus.h
--- a/Ubiquitous/XiUOS/applications/user_api/include/bus_serial.h
+++ b/Ubiquitous/XiUOS/applications/user_api/include/bus_serial.h
--- a/Ubiquitous/XiUOS/applications/user_api/include/dev_serial.h
+++ b/Ubiquitous/XiUOS/applications/user_api/include/dev_serial.h
--- a/Ubiquitous/XiUOS/applications/user_api/posix_support/Kconfig
+++ b/Ubiquitous/XiUOS/applications/user_api/posix_support/Kconfig
--- a/Ubiquitous/XiUOS/applications/user_api/posix_support/Makefile
+++ b/Ubiquitous/XiUOS/applications/user_api/posix_support/Makefile
--- a/Ubiquitous/XiUOS/applications/user_api/posix_support/include/fs.h
+++ b/Ubiquitous/XiUOS/applications/user_api/posix_support/include/fs.h
--- a/Ubiquitous/XiUOS/applications/user_api/posix_support/include/mqueue.h
+++ b/Ubiquitous/XiUOS/applications/user_api/posix_support/include/mqueue.h
--- a/Ubiquitous/XiUOS/applications/user_api/posix_support/include/pthread
+++ b/Ubiquitous/XiUOS/applications/user_api/posix_support/include/pthread
--- a/Ubiquitous/XiUOS/applications/user_api/posix_support/include/pthread.h
+++ b/Ubiquitous/XiUOS/applications/user_api/posix_support/include/pthread.h
--- a/Ubiquitous/XiUOS/applications/user_api/posix_support/include/semaphore.h
+++ b/Ubiquitous/XiUOS/applications/user_api/posix_support/include/semaphore.h
--- a/Ubiquitous/XiUOS/applications/user_api/posix_support/mqueue.c
+++ b/Ubiquitous/XiUOS/applications/user_api/posix_support/mqueue.c
--- a/Ubiquitous/XiUOS/applications/user_api/posix_support/pthread.c
+++ b/Ubiquitous/XiUOS/applications/user_api/posix_support/pthread.c
--- a/Ubiquitous/XiUOS/applications/user_api/posix_support/pthread_mutex.c
+++ b/Ubiquitous/XiUOS/applications/user_api/posix_support/pthread_mutex.c
--- a/Ubiquitous/XiUOS/applications/user_api/posix_support/semaphore.c
+++ b/Ubiquitous/XiUOS/applications/user_api/posix_support/semaphore.c
--- a/Ubiquitous/XiUOS/applications/user_api/switch_api/Makefile
+++ b/Ubiquitous/XiUOS/applications/user_api/switch_api/Makefile
--- a/Ubiquitous/XiUOS/applications/user_api/switch_api/user_api.h
+++ b/Ubiquitous/XiUOS/applications/user_api/switch_api/user_api.h
--- a/Ubiquitous/XiUOS/applications/user_api/switch_api/user_event.c
+++ b/Ubiquitous/XiUOS/applications/user_api/switch_api/user_event.c
--- a/Ubiquitous/XiUOS/applications/user_api/switch_api/user_fs.c
+++ b/Ubiquitous/XiUOS/applications/user_api/switch_api/user_fs.c
--- a/Ubiquitous/XiUOS/applications/user_api/switch_api/user_mem.c
+++ b/Ubiquitous/XiUOS/applications/user_api/switch_api/user_mem.c
--- a/Ubiquitous/XiUOS/applications/user_api/switch_api/user_msg.c
+++ b/Ubiquitous/XiUOS/applications/user_api/switch_api/user_msg.c
--- a/Ubiquitous/XiUOS/applications/user_api/switch_api/user_mutex.c
+++ b/Ubiquitous/XiUOS/applications/user_api/switch_api/user_mutex.c
--- a/Ubiquitous/XiUOS/applications/user_api/switch_api/user_print_info.c
+++ b/Ubiquitous/XiUOS/applications/user_api/switch_api/user_print_info.c
--- a/Show More
+++ b/Show More