feat(toolchain):update toolchain for RK3576

clusterApp/Makefile

@@ -4,8 +4,8 @@ CD		=	make --no-print-directory
 BIN		=	$(DESTDIR)/$(APPNAME)
 
 #readonly APP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-CURR_DIR = /home/huaxu/develop/Cluster/clusterApp/
-ROOTFS = /home/huaxu/develop/Cluster/packages/install/
+CURR_DIR = /home/huaxu/develop/cluster/clusterApp/
+ROOTFS = /home/huaxu/develop/cluster/packages/install/
 #ROOTFS = ${APP_DIR}/../packages/install/
 TARGET_PATH_LIB = $(ROOTFS)/lib
 TARGET_PATH_INCLUDE = $(ROOTFS)/include
@@ -26,7 +26,7 @@ DEPS += $(ROOTFS)/lib/libcjson.a
 DEPS += -lz -lpng -lcjson
 
 #Make command to use for dependencies
-CROSS_COMPILE = /opt/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf/bin/arm-none-linux-gnueabihf-
+CROSS_COMPILE = /opt/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-
 CC = $(CROSS_COMPILE)gcc 
 AR = $(CROSS_COMPILE)ar
 
@@ -55,7 +55,6 @@ CFLAGS += -Iinclude \
 # 	-I/home/lst/workspace/jpeg/jpeg-9c/install/include \
 # 	-I/home/lst/workspace/zlib/zlib_build/ \
 # 	-I/home/lst/workspace/libpng/libpng_build/ \
-
 # 	-I$(ROOTFS)/usr/src/linux/include
 
 CFLAGS += -L$(ROOTFS)/lib \

clusterApp/src/InsRender/Render.c

@@ -15877,7 +15877,7 @@ static void Render_PwrOnState()
             glClearColor(0.0,0.0,0.0,1.0);
         }
 
-        glEnable(GL_TEXTURE_2D);
+        //glEnable(GL_TEXTURE_2D);
         glActiveTexture(GL_TEXTURE0);
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -16456,7 +16456,7 @@ static void Render_PwrOffState()
     glEnableVertexAttribArray(Prgm_Simple_Texture_ATTR_Vtx);
     glEnableVertexAttribArray(Prgm_Simple_Texture_ATTR_Txc);
 
-    glEnable(GL_TEXTURE_2D);
+    //glEnable(GL_TEXTURE_2D);
     glActiveTexture(GL_TEXTURE0);
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -16558,7 +16558,7 @@ void ShowUpgradeUI()
     glEnableVertexAttribArray(Prgm_Simple_Texture_ATTR_Vtx);
     glEnableVertexAttribArray(Prgm_Simple_Texture_ATTR_Txc);
 
-    glEnable(GL_TEXTURE_2D);
+    //glEnable(GL_TEXTURE_2D);
     glActiveTexture(GL_TEXTURE0);
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -16759,7 +16759,7 @@ void ShowXmartUpgrade()
     glEnableVertexAttribArray(Prgm_Simple_Texture_ATTR_Vtx);
     glEnableVertexAttribArray(Prgm_Simple_Texture_ATTR_Txc);
 
-    glEnable(GL_TEXTURE_2D);
+    //glEnable(GL_TEXTURE_2D);
     glActiveTexture(GL_TEXTURE0);
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -16896,6 +16896,8 @@ void *Render(void *argv)
         }
     }
 
+    printf("start ScreenColorTest\n");
+
     switch(ScreenColorTest)
     {
     case 1: /*Black*/
@@ -16983,6 +16985,7 @@ void *Render(void *argv)
     {
         HmiDspState = HMI_DSP_LAUNCHING;
         ShowUpgradeUI();
+        printf("ShowUpgradeUI\n");
         return NULL;
     }
 
@@ -16990,6 +16993,7 @@ void *Render(void *argv)
     {
         XmartState = Xmart_ON;
         ShowXmartUpgrade();
+        printf("ShowXmartUpgrade\n");
         return NULL;
     }
 
@@ -17069,6 +17073,15 @@ void *Render(void *argv)
         workMode = WORK_MODE_OFF;
 //        mRender_RenderState = POWER_ON_BMP_PLAYING;
     }
+
+    #if 1
+    /* for test */
+    workMode = WORK_MODE_ON;
+    #endif 
+    
+
+    printf("workMode %d\n", workMode);
+
     if(mRender_WorkMode != workMode)
     {
         if(workMode == WORK_MODE_ON) // [WORK_MODE_OFF] switch to [WORK_MODE_ON]
@@ -17097,6 +17110,7 @@ void *Render(void *argv)
         }
     }
 
+    printf("mRender_RenderState %d\n", mRender_RenderState);
     switch(mRender_RenderState)
     {
     case POWER_ON_BMP_PLAYING:
@@ -17156,6 +17170,7 @@ void *Render(void *argv)
         Render_PwrOffState();
         break;
     }
+    printf("End of Render\n");
 
     return NULL;
 }

packages/build_packages.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-##CROSS_COMPILE=/opt/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf/bin/arm-none-linux-gnueabihf-
-TOOLCHAIN_DIR="/opt/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf/bin"
-CROSS_PREFIX="arm-none-linux-gnueabihf"
+##CROSS_COMPILE=/opt/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-
+TOOLCHAIN_DIR="/opt/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin"
+CROSS_PREFIX="aarch64-none-linux-gnu"
 
 readonly PKG_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
@@ -134,7 +134,7 @@ meson setup build_dir/ \
   -D gbm=enabled \
   -D glx=disabled \
   -D platforms= \
-  -D gallium-drivers=panfrost \
+  -D gallium-drivers=panfrost,swrast \
   -D vulkan-drivers= \
   -D llvm=disabled \
   -D xlib-lease=disabled \

packages/cross_file.txt

@@ -1,9 +1,9 @@
 # cross_file_armhf.txt
 [binaries]
-c = '/opt/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf/bin/arm-none-linux-gnueabihf-gcc'      # 你的 C 交叉编译器
-cpp = '/opt/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf/bin/arm-none-linux-gnueabihf-g++'    # 你的 C++ 交叉编译器
-ar = '/opt/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf/bin/arm-none-linux-gnueabihf-ar'      # 归档工具
-strip = '/opt/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf/bin/arm-none-linux-gnueabihf-strip' # strip 工具
+c = '/opt/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-gcc'      # 你的 C 交叉编译器
+cpp = '/opt/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-g++'    # 你的 C++ 交叉编译器
+ar = '/opt/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-ar'      # 归档工具
+strip = '/opt/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-strip' # strip 工具
 pkg-config = 'pkg-config'           # pkg-config，通常使用主机的即可，可能需要调整 PKG_CONFIG_PATH
 
 [host_machine]
@@ -18,5 +18,5 @@ c_link_args = []
 
 [properties]
 needs_exe_wrapper = true           # 因为无法在主机上运行目标二进制文件
-sys_root = '/home/huaxu/develop/Cluster/packages/install'
-pkg_config_libdir = '//home/huaxu/develop/Cluster/packages/install/lib/pkgconfig'
+sys_root = '/usr' # 注意xxx/install要修改成依赖包的安装路经
+pkg_config_libdir = '/home/huaxu/develop/cluster/packages/install/lib/pkgconfig' # 注意xxx/install要修改成依赖包的安装路经