diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml
index 155312b8..8da426f3 100644
--- a/.github/workflows/toolchain.yml
+++ b/.github/workflows/toolchain.yml
@@ -14,44 +14,31 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Sigmastar [I6B]
+          # Sigmastar
+          - {"platform": "ssc325"}
           - {"platform": "ssc335"}
-
-          # Sigmastar [I6C]
           - {"platform": "ssc377"}
-
-          # Sigmastar [I6E]
           - {"platform": "ssc338q"}
 
-          # Ingenic [T31]
-          - {"platform": "t31"}
-
-          # Ingenic [T40]
-          - {"platform": "t40"}
-
-          # Hisilicon [HI3516CV100]
+          # Hisilicon
+          - {"platform": "hi3516av100"}
           - {"platform": "hi3516cv100"}
-
-          # Hisilicon [HI3516CV200]
           - {"platform": "hi3516cv200"}
-
-          # Hisilicon [HI3516CV300]
           - {"platform": "hi3516cv300"}
-
-          # Hisilicon [HI3516CV500]
           - {"platform": "hi3516cv500"}
-
-          # Hisilicon [HI3516EV200]
           - {"platform": "hi3516ev200"}
-
-          # Hisilicon [HI3519V101]
           - {"platform": "hi3519v101"}
-
-          # Hisilicon [HI3536CV100]
           - {"platform": "hi3536cv100"}
 
-          # Goke [GK710X]
+          # Goke
           - {"platform": "gk7102"}
+          - {"platform": "gk7205v200"}
+
+          # Ingenic
+          - {"platform": "t20"}
+          - {"platform": "t21"}
+          - {"platform": "t31"}
+          - {"platform": "t40"}
 
           # Fullhan
           - {"platform": "fh8852v100"}
diff --git a/br-ext-chip-grainmedia/configs/gm8135_lite_defconfig b/br-ext-chip-grainmedia/configs/gm8135_lite_defconfig
index 05baf642..2af7de0d 100644
--- a/br-ext-chip-grainmedia/configs/gm8135_lite_defconfig
+++ b/br-ext-chip-grainmedia/configs/gm8135_lite_defconfig
@@ -8,7 +8,6 @@ BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
 BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-uclibcgnueabi"
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_3=y
-BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
 BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/br-ext-chip-grainmedia/configs/gm8136_lite_defconfig b/br-ext-chip-grainmedia/configs/gm8136_lite_defconfig
index 4752a8fa..70166456 100644
--- a/br-ext-chip-grainmedia/configs/gm8136_lite_defconfig
+++ b/br-ext-chip-grainmedia/configs/gm8136_lite_defconfig
@@ -8,7 +8,6 @@ BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
 BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-uclibcgnueabi"
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_3=y
-BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
 BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/general/toolchain.mk b/general/toolchain.mk
index ffdbd776..58057e54 100644
--- a/general/toolchain.mk
+++ b/general/toolchain.mk
@@ -14,6 +14,9 @@ endif
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CXX),y)
 	@echo "BR2_TOOLCHAIN_BUILDROOT_CXX=y" >> $(BR_CONF)
 endif
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_OPENMP),y)
+	@echo "BR2_GCC_ENABLE_OPENMP=y" >> $(BR_CONF)
+endif
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_10),y)
 	@echo "BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y" >> $(BR_CONF)
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19),y)