Merge branch 'master' of https://gitee.com/openLuat/luatos-soc-air105

# Conflicts:
#	application/include/luat_conf_bsp.h

application/include/luat_conf_bsp.h

@@ -72,7 +72,6 @@
 #define LUAT_USE_NETWORK 1
 #define LUAT_USE_TLS 1
 #define LUAT_USE_LORA 1
-// #define LUAT_USE_MLX90640 1
 #define LUAT_USE_MINIZ 1
 
 //----------------------------
@@ -116,7 +115,6 @@
 #define LV_FONT_OPPOSANS_M_16
 //---------------------
 // LVGL
-#define LUAT_USE_LCD
 #define LUAT_USE_LVGL
 #define LV_DISP_DEF_REFR_PERIOD gLVFlashTime
 extern unsigned int gLVFlashTime;
@@ -175,7 +173,9 @@ extern unsigned int gLVFlashTime;
 #define LV_USE_PERF_MONITOR     1
 #define __LVGL_SLEEP_ENABLE__
 #define __LUATOS_TICK_64BIT__
-#define LUAT_USE_MEMORY_OPTIMIZATION_CODE_MMAP
+#ifndef LUAT_USE_MEMORY_OPTIMIZATION_CODE_MMAP
+#define LUAT_USE_MEMORY_OPTIMIZATION_CODE_MMAP 1
+#endif
 
 #ifndef __LV_DEBUG__
 #undef LV_USE_PERF_MONITOR

xmake.lua

@@ -161,6 +161,20 @@ target("lvgl")
     set_targetdir("$(buildir)/lib")
 target_end()
 
+target("miniz")
+    set_kind("static")
+    set_plat("cross")
+    set_arch("c-sky")
+
+    add_files(luatos.."components/miniz/*.c")
+    add_includedirs("application/include")
+    add_includedirs("bsp/air105/include",{public = true})
+    add_includedirs(luatos.."lua/include")
+    add_includedirs(luatos.."luat/include")
+    add_includedirs(luatos.."components/miniz")
+    set_targetdir("$(buildir)/lib")
+target_end()
+
 ---//-----------------------------
 -- target("tflm")
 --     tfroot = "Third_Party/tflm-cmsis/"
@@ -201,6 +215,7 @@ if with_luatos then
         AIR105_VERSION = conf_data:match("#define LUAT_BSP_VERSION \"(%w+)\"")
         local LVGL_CONF = conf_data:find("// #define LUAT_USE_LVGL\n")
         if LVGL_CONF == nil then target:add("deps", "lvgl") end
+        target:add("deps", "miniz")
     end)
 
     --add_deps("tflm")