diff --git a/br-ext-chip-allwinner/configs/v83x_lite_defconfig b/br-ext-chip-allwinner/configs/v83x_lite_defconfig
index 5571ed13..12bdf745 100644
--- a/br-ext-chip-allwinner/configs/v83x_lite_defconfig
+++ b/br-ext-chip-allwinner/configs/v83x_lite_defconfig
@@ -27,15 +27,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/allwinner-v83x.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/v83x/kernel/v83x.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/v83x/kernel/v83x.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="allwinner"
-BR2_OPENIPC_MODEL="v83x"
-BR2_OPENIPC_FAMILY="v83x"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="allwinner"
+BR2_OPENIPC_SOC_MODEL="v83x"
+BR2_OPENIPC_SOC_FAMILY="v83x"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-allwinner/configs/v83x_ultimate_defconfig b/br-ext-chip-allwinner/configs/v83x_ultimate_defconfig
index 54404983..5176d139 100644
--- a/br-ext-chip-allwinner/configs/v83x_ultimate_defconfig
+++ b/br-ext-chip-allwinner/configs/v83x_ultimate_defconfig
@@ -27,15 +27,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/allwinner-v83x.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/v83x/kernel/v83x.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/v83x/kernel/v83x.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="allwinner"
-BR2_OPENIPC_MODEL="v83x"
-BR2_OPENIPC_FAMILY="v83x"
-BR2_OPENIPC_RELEASE="ultimate"
+BR2_OPENIPC_SOC_VENDOR="allwinner"
+BR2_OPENIPC_SOC_MODEL="v83x"
+BR2_OPENIPC_SOC_FAMILY="v83x"
+BR2_OPENIPC_FLAVOR="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ambarella/configs/s3l_lite_defconfig b/br-ext-chip-ambarella/configs/s3l_lite_defconfig
index 15a7548a..d5cb47c5 100644
--- a/br-ext-chip-ambarella/configs/s3l_lite_defconfig
+++ b/br-ext-chip-ambarella/configs/s3l_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/ambarella-s3l.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/s3l/kernel/s3l.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/s3l/kernel/s3l.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="ambarella"
-BR2_OPENIPC_MODEL="s3l"
-BR2_OPENIPC_FAMILY="s3l"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="ambarella"
+BR2_OPENIPC_SOC_MODEL="s3l"
+BR2_OPENIPC_SOC_FAMILY="s3l"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-anyka/configs/ak3916ev300_lite_defconfig b/br-ext-chip-anyka/configs/ak3916ev300_lite_defconfig
index e84348f4..99aefc14 100644
--- a/br-ext-chip-anyka/configs/ak3916ev300_lite_defconfig
+++ b/br-ext-chip-anyka/configs/ak3916ev300_lite_defconfig
@@ -25,15 +25,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/anyka-ak3918ev300.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/ak3918ev300/kernel/ak3916ev300.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/ak3918ev300/kernel/ak3916ev300.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="anyka"
-BR2_OPENIPC_MODEL="ak3916ev300"
-BR2_OPENIPC_FAMILY="ak3918ev300"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="anyka"
+BR2_OPENIPC_SOC_MODEL="ak3916ev300"
+BR2_OPENIPC_SOC_FAMILY="ak3918ev300"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-anyka/configs/ak3918ev300_lite_defconfig b/br-ext-chip-anyka/configs/ak3918ev300_lite_defconfig
index 7bafb224..27c36cdb 100644
--- a/br-ext-chip-anyka/configs/ak3918ev300_lite_defconfig
+++ b/br-ext-chip-anyka/configs/ak3918ev300_lite_defconfig
@@ -25,15 +25,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/anyka-ak3918ev300.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/ak3918ev300/kernel/ak3918ev300.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/ak3918ev300/kernel/ak3918ev300.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="anyka"
-BR2_OPENIPC_MODEL="ak3918ev300"
-BR2_OPENIPC_FAMILY="ak3918ev300"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="anyka"
+BR2_OPENIPC_SOC_MODEL="ak3918ev300"
+BR2_OPENIPC_SOC_FAMILY="ak3918ev300"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-fullhan/configs/fh8833v100_lite_defconfig b/br-ext-chip-fullhan/configs/fh8833v100_lite_defconfig
index 4f53d7a0..23cb82c7 100644
--- a/br-ext-chip-fullhan/configs/fh8833v100_lite_defconfig
+++ b/br-ext-chip-fullhan/configs/fh8833v100_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/fullhan-fh8833v100.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/fh8833v100/kernel/fh8833v100.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/fh8833v100/kernel/fh8833v100.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="fullhan"
-BR2_OPENIPC_MODEL="fh8833v100"
-BR2_OPENIPC_FAMILY="fh8833v100"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="fullhan"
+BR2_OPENIPC_SOC_MODEL="fh8833v100"
+BR2_OPENIPC_SOC_FAMILY="fh8833v100"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-fullhan/configs/fh8852v100_lite_defconfig b/br-ext-chip-fullhan/configs/fh8852v100_lite_defconfig
index 8743bf2e..54e6244c 100644
--- a/br-ext-chip-fullhan/configs/fh8852v100_lite_defconfig
+++ b/br-ext-chip-fullhan/configs/fh8852v100_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/fullhan-fh8852v100.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/fh8852v100/kernel/fh8852v100.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/fh8852v100/kernel/fh8852v100.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="fullhan"
-BR2_OPENIPC_MODEL="fh8852v100"
-BR2_OPENIPC_FAMILY="fh8852v100"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="fullhan"
+BR2_OPENIPC_SOC_MODEL="fh8852v100"
+BR2_OPENIPC_SOC_FAMILY="fh8852v100"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-fullhan/configs/fh8852v200_lite_defconfig b/br-ext-chip-fullhan/configs/fh8852v200_lite_defconfig
index b1398d04..269139db 100644
--- a/br-ext-chip-fullhan/configs/fh8852v200_lite_defconfig
+++ b/br-ext-chip-fullhan/configs/fh8852v200_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/fullhan-fh8852v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/fh8852v200/kernel/fh8852v200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/fh8852v200/kernel/fh8852v200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="fullhan"
-BR2_OPENIPC_MODEL="fh8852v200"
-BR2_OPENIPC_FAMILY="fh8852v200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="fullhan"
+BR2_OPENIPC_SOC_MODEL="fh8852v200"
+BR2_OPENIPC_SOC_FAMILY="fh8852v200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-fullhan/configs/fh8852v210_lite_defconfig b/br-ext-chip-fullhan/configs/fh8852v210_lite_defconfig
index cb849307..e687c756 100644
--- a/br-ext-chip-fullhan/configs/fh8852v210_lite_defconfig
+++ b/br-ext-chip-fullhan/configs/fh8852v210_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/fullhan-fh8852v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/fh8852v200/kernel/fh8852v210.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/fh8852v200/kernel/fh8852v210.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="fullhan"
-BR2_OPENIPC_MODEL="fh8852v210"
-BR2_OPENIPC_FAMILY="fh8852v200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="fullhan"
+BR2_OPENIPC_SOC_MODEL="fh8852v210"
+BR2_OPENIPC_SOC_FAMILY="fh8852v200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-fullhan/configs/fh8856v100_lite_defconfig b/br-ext-chip-fullhan/configs/fh8856v100_lite_defconfig
index 2781d85c..03bc5c83 100644
--- a/br-ext-chip-fullhan/configs/fh8856v100_lite_defconfig
+++ b/br-ext-chip-fullhan/configs/fh8856v100_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/fullhan-fh8852v100.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/fh8852v100/kernel/fh8856v100.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/fh8852v100/kernel/fh8856v100.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="fullhan"
-BR2_OPENIPC_MODEL="fh8856v100"
-BR2_OPENIPC_FAMILY="fh8852v100"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="fullhan"
+BR2_OPENIPC_SOC_MODEL="fh8856v100"
+BR2_OPENIPC_SOC_FAMILY="fh8852v100"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-fullhan/configs/fh8856v200_lite_defconfig b/br-ext-chip-fullhan/configs/fh8856v200_lite_defconfig
index af3d3fe7..b9c7c123 100644
--- a/br-ext-chip-fullhan/configs/fh8856v200_lite_defconfig
+++ b/br-ext-chip-fullhan/configs/fh8856v200_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/fullhan-fh8852v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/fh8852v200/kernel/fh8856v200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/fh8852v200/kernel/fh8856v200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="fullhan"
-BR2_OPENIPC_MODEL="fh8856v200"
-BR2_OPENIPC_FAMILY="fh8852v200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="fullhan"
+BR2_OPENIPC_SOC_MODEL="fh8856v200"
+BR2_OPENIPC_SOC_FAMILY="fh8852v200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-fullhan/configs/fh8856v210_lite_defconfig b/br-ext-chip-fullhan/configs/fh8856v210_lite_defconfig
index 6d63f6da..ad509a84 100644
--- a/br-ext-chip-fullhan/configs/fh8856v210_lite_defconfig
+++ b/br-ext-chip-fullhan/configs/fh8856v210_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/fullhan-fh8852v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/fh8852v200/kernel/fh8856v210.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/fh8852v200/kernel/fh8856v210.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="fullhan"
-BR2_OPENIPC_MODEL="fh8856v210"
-BR2_OPENIPC_FAMILY="fh8852v200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="fullhan"
+BR2_OPENIPC_SOC_MODEL="fh8856v210"
+BR2_OPENIPC_SOC_FAMILY="fh8852v200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-fullhan/configs/fh8858v200_lite_defconfig b/br-ext-chip-fullhan/configs/fh8858v200_lite_defconfig
index b4d9f1d7..9bbaae2e 100644
--- a/br-ext-chip-fullhan/configs/fh8858v200_lite_defconfig
+++ b/br-ext-chip-fullhan/configs/fh8858v200_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/fullhan-fh8852v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/fh8852v200/kernel/fh8858v200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/fh8852v200/kernel/fh8858v200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="fullhan"
-BR2_OPENIPC_MODEL="fh8858v200"
-BR2_OPENIPC_FAMILY="fh8852v200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="fullhan"
+BR2_OPENIPC_SOC_MODEL="fh8858v200"
+BR2_OPENIPC_SOC_FAMILY="fh8852v200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-fullhan/configs/fh8858v210_lite_defconfig b/br-ext-chip-fullhan/configs/fh8858v210_lite_defconfig
index a1802b0a..055e12be 100644
--- a/br-ext-chip-fullhan/configs/fh8858v210_lite_defconfig
+++ b/br-ext-chip-fullhan/configs/fh8858v210_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/fullhan-fh8852v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/fh8852v200/kernel/fh8858v210.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/fh8852v200/kernel/fh8858v210.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="fullhan"
-BR2_OPENIPC_MODEL="fh8858v210"
-BR2_OPENIPC_FAMILY="fh8852v200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="fullhan"
+BR2_OPENIPC_SOC_MODEL="fh8858v210"
+BR2_OPENIPC_SOC_FAMILY="fh8852v200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7102_lite_defconfig b/br-ext-chip-goke/configs/gk7102_lite_defconfig
index 1edfdb6f..878fdcf7 100644
--- a/br-ext-chip-goke/configs/gk7102_lite_defconfig
+++ b/br-ext-chip-goke/configs/gk7102_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/goke-gk710x.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/gk710x/kernel/gk710x.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/gk710x/kernel/gk710x.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="goke"
-BR2_OPENIPC_MODEL="gk7102"
-BR2_OPENIPC_FAMILY="gk710x"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="goke"
+BR2_OPENIPC_SOC_MODEL="gk7102"
+BR2_OPENIPC_SOC_FAMILY="gk710x"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7102s_lite_defconfig b/br-ext-chip-goke/configs/gk7102s_lite_defconfig
index 5ce674ea..8ba40924 100644
--- a/br-ext-chip-goke/configs/gk7102s_lite_defconfig
+++ b/br-ext-chip-goke/configs/gk7102s_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/goke-gk710x.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/gk710x/kernel/gk710xs.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/gk710x/kernel/gk710xs.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="goke"
-BR2_OPENIPC_MODEL="gk7102s"
-BR2_OPENIPC_FAMILY="gk710x"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="goke"
+BR2_OPENIPC_SOC_MODEL="gk7102s"
+BR2_OPENIPC_SOC_FAMILY="gk710x"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7202v300_lite_defconfig b/br-ext-chip-goke/configs/gk7202v300_lite_defconfig
index 891610f1..f03559e6 100644
--- a/br-ext-chip-goke/configs/gk7202v300_lite_defconfig
+++ b/br-ext-chip-goke/configs/gk7202v300_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/goke-gk7205v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7202v300.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7202v300.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="goke"
-BR2_OPENIPC_MODEL="gk7202v300"
-BR2_OPENIPC_FAMILY="gk7205v200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="goke"
+BR2_OPENIPC_SOC_MODEL="gk7202v300"
+BR2_OPENIPC_SOC_FAMILY="gk7205v200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig b/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig
index 02934a98..bc49edfd 100644
--- a/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/goke-gk7205v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v200.generic-fpv.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v200.generic-fpv.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="goke"
-BR2_OPENIPC_MODEL="gk7205v200"
-BR2_OPENIPC_FAMILY="gk7205v200"
-BR2_OPENIPC_RELEASE="fpv"
+BR2_OPENIPC_SOC_VENDOR="goke"
+BR2_OPENIPC_SOC_MODEL="gk7205v200"
+BR2_OPENIPC_SOC_FAMILY="gk7205v200"
+BR2_OPENIPC_FLAVOR="fpv"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v200_lite_defconfig b/br-ext-chip-goke/configs/gk7205v200_lite_defconfig
index 869db657..7d8cfd5e 100644
--- a/br-ext-chip-goke/configs/gk7205v200_lite_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v200_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/goke-gk7205v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="goke"
-BR2_OPENIPC_MODEL="gk7205v200"
-BR2_OPENIPC_FAMILY="gk7205v200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="goke"
+BR2_OPENIPC_SOC_MODEL="gk7205v200"
+BR2_OPENIPC_SOC_FAMILY="gk7205v200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v200_lte_defconfig b/br-ext-chip-goke/configs/gk7205v200_lte_defconfig
index c5b0d59e..746feab4 100644
--- a/br-ext-chip-goke/configs/gk7205v200_lte_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v200_lte_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/goke-gk7205v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v200.generic-fpv.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v200.generic-fpv.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="goke"
-BR2_OPENIPC_MODEL="gk7205v200"
-BR2_OPENIPC_FAMILY="gk7205v200"
-BR2_OPENIPC_RELEASE="lte"
+BR2_OPENIPC_SOC_VENDOR="goke"
+BR2_OPENIPC_SOC_MODEL="gk7205v200"
+BR2_OPENIPC_SOC_FAMILY="gk7205v200"
+BR2_OPENIPC_FLAVOR="lte"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v200_original_defconfig b/br-ext-chip-goke/configs/gk7205v200_original_defconfig
index ffe01f1c..466366b4 100644
--- a/br-ext-chip-goke/configs/gk7205v200_original_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v200_original_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/goke-gk7205v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="goke"
-BR2_OPENIPC_MODEL="gk7205v200"
-BR2_OPENIPC_FAMILY="gk7205v200"
-BR2_OPENIPC_RELEASE="original"
+BR2_OPENIPC_SOC_VENDOR="goke"
+BR2_OPENIPC_SOC_MODEL="gk7205v200"
+BR2_OPENIPC_SOC_FAMILY="gk7205v200"
+BR2_OPENIPC_FLAVOR="original"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v200_ultimate_defconfig b/br-ext-chip-goke/configs/gk7205v200_ultimate_defconfig
index 3df7a63b..fcc3ee54 100644
--- a/br-ext-chip-goke/configs/gk7205v200_ultimate_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v200_ultimate_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/goke-gk7205v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="goke"
-BR2_OPENIPC_MODEL="gk7205v200"
-BR2_OPENIPC_FAMILY="gk7205v200"
-BR2_OPENIPC_RELEASE="ultimate"
+BR2_OPENIPC_SOC_VENDOR="goke"
+BR2_OPENIPC_SOC_MODEL="gk7205v200"
+BR2_OPENIPC_SOC_FAMILY="gk7205v200"
+BR2_OPENIPC_FLAVOR="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v210_lite_defconfig b/br-ext-chip-goke/configs/gk7205v210_lite_defconfig
index 4b64635a..55a0e8ef 100644
--- a/br-ext-chip-goke/configs/gk7205v210_lite_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v210_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/goke-gk7205v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="goke"
-BR2_OPENIPC_MODEL="gk7205v210"
-BR2_OPENIPC_FAMILY="gk7205v200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="goke"
+BR2_OPENIPC_SOC_MODEL="gk7205v210"
+BR2_OPENIPC_SOC_FAMILY="gk7205v200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig b/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig
index 80d6bb8e..32defec8 100644
--- a/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/goke-gk7205v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v300.generic-fpv.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v300.generic-fpv.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="goke"
-BR2_OPENIPC_MODEL="gk7205v300"
-BR2_OPENIPC_FAMILY="gk7205v200"
-BR2_OPENIPC_RELEASE="fpv"
+BR2_OPENIPC_SOC_VENDOR="goke"
+BR2_OPENIPC_SOC_MODEL="gk7205v300"
+BR2_OPENIPC_SOC_FAMILY="gk7205v200"
+BR2_OPENIPC_FLAVOR="fpv"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v300_lite_defconfig b/br-ext-chip-goke/configs/gk7205v300_lite_defconfig
index cd66525a..95c95f26 100644
--- a/br-ext-chip-goke/configs/gk7205v300_lite_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v300_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/goke-gk7205v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v300.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v300.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="goke"
-BR2_OPENIPC_MODEL="gk7205v300"
-BR2_OPENIPC_FAMILY="gk7205v200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="goke"
+BR2_OPENIPC_SOC_MODEL="gk7205v300"
+BR2_OPENIPC_SOC_FAMILY="gk7205v200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v300_lte_defconfig b/br-ext-chip-goke/configs/gk7205v300_lte_defconfig
index 403d4c70..42115ccd 100644
--- a/br-ext-chip-goke/configs/gk7205v300_lte_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v300_lte_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/goke-gk7205v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v300.generic-fpv.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v300.generic-fpv.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="goke"
-BR2_OPENIPC_MODEL="gk7205v300"
-BR2_OPENIPC_FAMILY="gk7205v200"
-BR2_OPENIPC_RELEASE="lte"
+BR2_OPENIPC_SOC_VENDOR="goke"
+BR2_OPENIPC_SOC_MODEL="gk7205v300"
+BR2_OPENIPC_SOC_FAMILY="gk7205v200"
+BR2_OPENIPC_FLAVOR="lte"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v300_ultimate_defconfig b/br-ext-chip-goke/configs/gk7205v300_ultimate_defconfig
index eb19ba7b..09a2384b 100644
--- a/br-ext-chip-goke/configs/gk7205v300_ultimate_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v300_ultimate_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/goke-gk7205v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v300.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7205v300.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="goke"
-BR2_OPENIPC_MODEL="gk7205v300"
-BR2_OPENIPC_FAMILY="gk7205v200"
-BR2_OPENIPC_RELEASE="ultimate"
+BR2_OPENIPC_SOC_VENDOR="goke"
+BR2_OPENIPC_SOC_MODEL="gk7205v300"
+BR2_OPENIPC_SOC_FAMILY="gk7205v200"
+BR2_OPENIPC_FLAVOR="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7605v100_lite_defconfig b/br-ext-chip-goke/configs/gk7605v100_lite_defconfig
index acf844e6..478b88d7 100644
--- a/br-ext-chip-goke/configs/gk7605v100_lite_defconfig
+++ b/br-ext-chip-goke/configs/gk7605v100_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/goke-gk7205v200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7605v100.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/gk7205v200/kernel/gk7605v100.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="goke"
-BR2_OPENIPC_MODEL="gk7605v100"
-BR2_OPENIPC_FAMILY="gk7205v200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="goke"
+BR2_OPENIPC_SOC_MODEL="gk7605v100"
+BR2_OPENIPC_SOC_FAMILY="gk7205v200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-grainmedia/configs/gm8135_lite_defconfig b/br-ext-chip-grainmedia/configs/gm8135_lite_defconfig
index 99044e09..5c50b50c 100644
--- a/br-ext-chip-grainmedia/configs/gm8135_lite_defconfig
+++ b/br-ext-chip-grainmedia/configs/gm8135_lite_defconfig
@@ -23,15 +23,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/grainmedia-gm8136.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/gm8136/kernel/gm8135.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/gm8136/kernel/gm8135.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="grainmedia"
-BR2_OPENIPC_MODEL="gm8135"
-BR2_OPENIPC_FAMILY="gm8136"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="grainmedia"
+BR2_OPENIPC_SOC_MODEL="gm8135"
+BR2_OPENIPC_SOC_FAMILY="gm8136"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-grainmedia/configs/gm8136_lite_defconfig b/br-ext-chip-grainmedia/configs/gm8136_lite_defconfig
index 08b081f0..0342ca37 100644
--- a/br-ext-chip-grainmedia/configs/gm8136_lite_defconfig
+++ b/br-ext-chip-grainmedia/configs/gm8136_lite_defconfig
@@ -23,15 +23,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/grainmedia-gm8136.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/gm8136/kernel/gm8136.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/gm8136/kernel/gm8136.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="grainmedia"
-BR2_OPENIPC_MODEL="gm8136"
-BR2_OPENIPC_FAMILY="gm8136"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="grainmedia"
+BR2_OPENIPC_SOC_MODEL="gm8136"
+BR2_OPENIPC_SOC_FAMILY="gm8136"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516av100_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516av100_lite_defconfig
index ebc18b15..f7a08a01 100644
--- a/br-ext-chip-hisilicon/configs/hi3516av100_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516av100_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516av100.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516av100/kernel/hi3516av100.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516av100/kernel/hi3516av100.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516av100"
-BR2_OPENIPC_FAMILY="hi3516av100"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516av100"
+BR2_OPENIPC_SOC_FAMILY="hi3516av100"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516av100_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516av100_ultimate_defconfig
index a034920e..46df1012 100644
--- a/br-ext-chip-hisilicon/configs/hi3516av100_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516av100_ultimate_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516av100.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516av100/kernel/hi3516av100.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516av100/kernel/hi3516av100.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516av100"
-BR2_OPENIPC_FAMILY="hi3516av100"
-BR2_OPENIPC_RELEASE="ultimate"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516av100"
+BR2_OPENIPC_SOC_FAMILY="hi3516av100"
+BR2_OPENIPC_FLAVOR="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516av200_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516av200_lite_defconfig
index 4a3c08af..305eb6fa 100644
--- a/br-ext-chip-hisilicon/configs/hi3516av200_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516av200_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3519v101.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3519v101/kernel/hi3516av200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3519v101/kernel/hi3516av200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516av200"
-BR2_OPENIPC_FAMILY="hi3519v101"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516av200"
+BR2_OPENIPC_SOC_FAMILY="hi3519v101"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516av200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516av200_ultimate_defconfig
index 49e43f19..1ebd928c 100644
--- a/br-ext-chip-hisilicon/configs/hi3516av200_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516av200_ultimate_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3519v101.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3519v101/kernel/hi3516av200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3519v101/kernel/hi3516av200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516av200"
-BR2_OPENIPC_FAMILY="hi3519v101"
-BR2_OPENIPC_RELEASE="ultimate"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516av200"
+BR2_OPENIPC_SOC_FAMILY="hi3519v101"
+BR2_OPENIPC_FLAVOR="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516av300_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516av300_lite_defconfig
index 83be1b51..ab7e2c6f 100644
--- a/br-ext-chip-hisilicon/configs/hi3516av300_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516av300_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516cv500.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516cv500/kernel/hi3516av300.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516cv500/kernel/hi3516av300.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516av300"
-BR2_OPENIPC_FAMILY="hi3516cv500"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516av300"
+BR2_OPENIPC_SOC_FAMILY="hi3516cv500"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516cv100_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516cv100_lite_defconfig
index dbdae3d7..6ff0d2c1 100644
--- a/br-ext-chip-hisilicon/configs/hi3516cv100_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516cv100_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516cv100.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516cv100/kernel/hi3516cv100.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516cv100/kernel/hi3516cv100.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516cv100"
-BR2_OPENIPC_FAMILY="hi3516cv100"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516cv100"
+BR2_OPENIPC_SOC_FAMILY="hi3516cv100"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516cv200_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516cv200_lite_defconfig
index 28661020..b4449f34 100644
--- a/br-ext-chip-hisilicon/configs/hi3516cv200_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516cv200_lite_defconfig
@@ -25,15 +25,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516cv200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516cv200/kernel/hi3516cv200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516cv200/kernel/hi3516cv200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516cv200"
-BR2_OPENIPC_FAMILY="hi3516cv200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516cv200"
+BR2_OPENIPC_SOC_FAMILY="hi3516cv200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516cv300_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516cv300_lite_defconfig
index d6890b79..b3e9b061 100644
--- a/br-ext-chip-hisilicon/configs/hi3516cv300_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516cv300_lite_defconfig
@@ -25,15 +25,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516cv300.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516cv300/kernel/hi3516cv300.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516cv300/kernel/hi3516cv300.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516cv300"
-BR2_OPENIPC_FAMILY="hi3516cv300"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516cv300"
+BR2_OPENIPC_SOC_FAMILY="hi3516cv300"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516cv300_mini_defconfig b/br-ext-chip-hisilicon/configs/hi3516cv300_mini_defconfig
index 7182a0f4..d86c2c69 100644
--- a/br-ext-chip-hisilicon/configs/hi3516cv300_mini_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516cv300_mini_defconfig
@@ -25,15 +25,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516cv300.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516cv300/kernel/hi3516cv300.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516cv300/kernel/hi3516cv300.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516cv300"
-BR2_OPENIPC_FAMILY="hi3516cv300"
-BR2_OPENIPC_RELEASE="mini"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516cv300"
+BR2_OPENIPC_SOC_FAMILY="hi3516cv300"
+BR2_OPENIPC_FLAVOR="mini"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516cv300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516cv300_ultimate_defconfig
index 9c2a4e03..dc73bc8d 100644
--- a/br-ext-chip-hisilicon/configs/hi3516cv300_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516cv300_ultimate_defconfig
@@ -25,15 +25,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516cv300.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516cv300/kernel/hi3516cv300.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516cv300/kernel/hi3516cv300.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516cv300"
-BR2_OPENIPC_FAMILY="hi3516cv300"
-BR2_OPENIPC_RELEASE="ultimate"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516cv300"
+BR2_OPENIPC_SOC_FAMILY="hi3516cv300"
+BR2_OPENIPC_FLAVOR="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516cv500_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516cv500_lite_defconfig
index 91093f93..296c35b9 100644
--- a/br-ext-chip-hisilicon/configs/hi3516cv500_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516cv500_lite_defconfig
@@ -23,15 +23,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516cv500.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516cv500/kernel/hi3516cv500.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516cv500/kernel/hi3516cv500.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516cv500"
-BR2_OPENIPC_FAMILY="hi3516cv500"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516cv500"
+BR2_OPENIPC_SOC_FAMILY="hi3516cv500"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516dv100_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516dv100_lite_defconfig
index 24f4d32e..d7c8f54e 100644
--- a/br-ext-chip-hisilicon/configs/hi3516dv100_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516dv100_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516av100.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516av100/kernel/hi3516dv100.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516av100/kernel/hi3516dv100.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516dv100"
-BR2_OPENIPC_FAMILY="hi3516av100"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516dv100"
+BR2_OPENIPC_SOC_FAMILY="hi3516av100"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516dv100_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516dv100_ultimate_defconfig
index 587d1b6f..1a4cde41 100644
--- a/br-ext-chip-hisilicon/configs/hi3516dv100_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516dv100_ultimate_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516av100.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516av100/kernel/hi3516dv100.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516av100/kernel/hi3516dv100.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516dv100"
-BR2_OPENIPC_FAMILY="hi3516av100"
-BR2_OPENIPC_RELEASE="ultimate"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516dv100"
+BR2_OPENIPC_SOC_FAMILY="hi3516av100"
+BR2_OPENIPC_FLAVOR="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516dv200_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516dv200_lite_defconfig
index 7f387a5d..4c8f632d 100644
--- a/br-ext-chip-hisilicon/configs/hi3516dv200_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516dv200_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516ev200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516dv200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516dv200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516dv200"
-BR2_OPENIPC_FAMILY="hi3516ev200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516dv200"
+BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516dv300_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516dv300_lite_defconfig
index 68e54875..bb3bd628 100644
--- a/br-ext-chip-hisilicon/configs/hi3516dv300_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516dv300_lite_defconfig
@@ -23,15 +23,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516cv500.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516cv500/kernel/hi3516dv300.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516cv500/kernel/hi3516dv300.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516dv300"
-BR2_OPENIPC_FAMILY="hi3516cv500"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516dv300"
+BR2_OPENIPC_SOC_FAMILY="hi3516cv500"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev100_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev100_lite_defconfig
index d00458ae..228bec27 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev100_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev100_lite_defconfig
@@ -25,15 +25,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516cv300.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516cv300/kernel/hi3516ev100.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516cv300/kernel/hi3516ev100.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516ev100"
-BR2_OPENIPC_FAMILY="hi3516cv300"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516ev100"
+BR2_OPENIPC_SOC_FAMILY="hi3516cv300"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig
index b1c9738a..56c4e0dd 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516ev200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev200.generic-fpv.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev200.generic-fpv.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516ev200"
-BR2_OPENIPC_FAMILY="hi3516ev200"
-BR2_OPENIPC_RELEASE="fpv"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516ev200"
+BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
+BR2_OPENIPC_FLAVOR="fpv"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev200_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev200_lite_defconfig
index 8c5551b8..5625d6f1 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev200_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev200_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516ev200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516ev200"
-BR2_OPENIPC_FAMILY="hi3516ev200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516ev200"
+BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev200_lte_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev200_lte_defconfig
index bc73883a..2878ce37 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev200_lte_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev200_lte_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516ev200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev200.generic-fpv.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev200.generic-fpv.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516ev200"
-BR2_OPENIPC_FAMILY="hi3516ev200"
-BR2_OPENIPC_RELEASE="lte"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516ev200"
+BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
+BR2_OPENIPC_FLAVOR="lte"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig
index 4a8c7b8b..cee78698 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516ev200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516ev200"
-BR2_OPENIPC_FAMILY="hi3516ev200"
-BR2_OPENIPC_RELEASE="ultimate"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516ev200"
+BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
+BR2_OPENIPC_FLAVOR="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev300_dev_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev300_dev_defconfig
index 1f5de085..ce9eb766 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev300_dev_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev300_dev_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516ev200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev300.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev300.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516ev300"
-BR2_OPENIPC_FAMILY="hi3516ev200"
-BR2_OPENIPC_RELEASE="dev"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516ev300"
+BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
+BR2_OPENIPC_FLAVOR="dev"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig
index b042d632..cc841ce7 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516ev200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev300.generic-fpv.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev300.generic-fpv.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516ev300"
-BR2_OPENIPC_FAMILY="hi3516ev200"
-BR2_OPENIPC_RELEASE="fpv"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516ev300"
+BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
+BR2_OPENIPC_FLAVOR="fpv"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev300_glibc_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev300_glibc_defconfig
index bda111ec..cf79f54a 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev300_glibc_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev300_glibc_defconfig
@@ -29,15 +29,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516ev200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev300.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev300.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516ev300"
-BR2_OPENIPC_FAMILY="hi3516ev200"
-BR2_OPENIPC_RELEASE="glibc"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516ev300"
+BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
+BR2_OPENIPC_FLAVOR="glibc"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev300_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev300_lite_defconfig
index 8eca7fb4..53a4289f 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev300_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev300_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516ev200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev300.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev300.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516ev300"
-BR2_OPENIPC_FAMILY="hi3516ev200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516ev300"
+BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev300_lte_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev300_lte_defconfig
index 4306e031..df4edd11 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev300_lte_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev300_lte_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516ev200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev300.generic-fpv.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev300.generic-fpv.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516ev300"
-BR2_OPENIPC_FAMILY="hi3516ev200"
-BR2_OPENIPC_RELEASE="lte"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516ev300"
+BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
+BR2_OPENIPC_FLAVOR="lte"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig
index 87ced9dd..51008fa9 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516ev200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev300.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3516ev300.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3516ev300"
-BR2_OPENIPC_FAMILY="hi3516ev200"
-BR2_OPENIPC_RELEASE="ultimate"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3516ev300"
+BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
+BR2_OPENIPC_FLAVOR="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3518cv100_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3518cv100_lite_defconfig
index b8741ebd..74fc518d 100644
--- a/br-ext-chip-hisilicon/configs/hi3518cv100_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3518cv100_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516cv100.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516cv100/kernel/hi3518cv100.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516cv100/kernel/hi3518cv100.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3518cv100"
-BR2_OPENIPC_FAMILY="hi3516cv100"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3518cv100"
+BR2_OPENIPC_SOC_FAMILY="hi3516cv100"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3518ev100_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev100_lite_defconfig
index c1f25169..3eb8cc23 100644
--- a/br-ext-chip-hisilicon/configs/hi3518ev100_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3518ev100_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516cv100.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516cv100/kernel/hi3518ev100.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516cv100/kernel/hi3518ev100.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3518ev100"
-BR2_OPENIPC_FAMILY="hi3516cv100"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3518ev100"
+BR2_OPENIPC_SOC_FAMILY="hi3516cv100"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3518ev200_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev200_lite_defconfig
index ae254d61..c0e390e9 100644
--- a/br-ext-chip-hisilicon/configs/hi3518ev200_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3518ev200_lite_defconfig
@@ -25,15 +25,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516cv200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516cv200/kernel/hi3518ev200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516cv200/kernel/hi3518ev200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3518ev200"
-BR2_OPENIPC_FAMILY="hi3516cv200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3518ev200"
+BR2_OPENIPC_SOC_FAMILY="hi3516cv200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3518ev200_mini_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev200_mini_defconfig
index 247b0fb5..54ea8356 100644
--- a/br-ext-chip-hisilicon/configs/hi3518ev200_mini_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3518ev200_mini_defconfig
@@ -25,15 +25,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516cv200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516cv200/kernel/hi3518ev200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516cv200/kernel/hi3518ev200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3518ev200"
-BR2_OPENIPC_FAMILY="hi3516cv200"
-BR2_OPENIPC_RELEASE="mini"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3518ev200"
+BR2_OPENIPC_SOC_FAMILY="hi3516cv200"
+BR2_OPENIPC_FLAVOR="mini"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig
index f470d7cb..12e12aff 100644
--- a/br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig
@@ -25,15 +25,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516cv200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516cv200/kernel/hi3518ev200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516cv200/kernel/hi3518ev200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3518ev200"
-BR2_OPENIPC_FAMILY="hi3516cv200"
-BR2_OPENIPC_RELEASE="ultimate"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3518ev200"
+BR2_OPENIPC_SOC_FAMILY="hi3516cv200"
+BR2_OPENIPC_FLAVOR="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3518ev201_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev201_lite_defconfig
index 635666b3..b6562a74 100644
--- a/br-ext-chip-hisilicon/configs/hi3518ev201_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3518ev201_lite_defconfig
@@ -25,15 +25,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516cv200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516cv200/kernel/hi3518ev201.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516cv200/kernel/hi3518ev201.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3518ev201"
-BR2_OPENIPC_FAMILY="hi3516cv200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3518ev201"
+BR2_OPENIPC_SOC_FAMILY="hi3516cv200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3518ev300_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev300_lite_defconfig
index 041c6250..6683ec49 100644
--- a/br-ext-chip-hisilicon/configs/hi3518ev300_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3518ev300_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516ev200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3518ev300.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3518ev300.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3518ev300"
-BR2_OPENIPC_FAMILY="hi3516ev200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3518ev300"
+BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig
index fe1606c8..0133844a 100644
--- a/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3516ev200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3518ev300.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3516ev200/kernel/hi3518ev300.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3518ev300"
-BR2_OPENIPC_FAMILY="hi3516ev200"
-BR2_OPENIPC_RELEASE="ultimate"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3518ev300"
+BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
+BR2_OPENIPC_FLAVOR="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3519v101_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3519v101_lite_defconfig
index c3198a9e..1b47f3d5 100644
--- a/br-ext-chip-hisilicon/configs/hi3519v101_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3519v101_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3519v101.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3519v101/kernel/hi3519v101.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3519v101/kernel/hi3519v101.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3519v101"
-BR2_OPENIPC_FAMILY="hi3519v101"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3519v101"
+BR2_OPENIPC_SOC_FAMILY="hi3519v101"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3520dv200_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3520dv200_lite_defconfig
index 0b334b3f..e576835a 100644
--- a/br-ext-chip-hisilicon/configs/hi3520dv200_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3520dv200_lite_defconfig
@@ -26,16 +26,16 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3520dv200.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3520dv200/kernel/hi3520dv200.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3520dv200/kernel/hi3520dv200.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000"
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3520dv200"
-BR2_OPENIPC_FAMILY="hi3520dv200"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3520dv200"
+BR2_OPENIPC_SOC_FAMILY="hi3520dv200"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3536cv100_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3536cv100_lite_defconfig
index e1dba6aa..66cc35c0 100644
--- a/br-ext-chip-hisilicon/configs/hi3536cv100_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3536cv100_lite_defconfig
@@ -26,16 +26,16 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3536cv100.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3536cv100/kernel/hi3536cv100.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3536cv100/kernel/hi3536cv100.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000"
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3536cv100"
-BR2_OPENIPC_FAMILY="hi3536cv100"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3536cv100"
+BR2_OPENIPC_SOC_FAMILY="hi3536cv100"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig
index 29c1edc1..f5821239 100644
--- a/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig
@@ -33,16 +33,16 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3536dv100.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3536dv100/kernel/hi3536dv100.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3536dv100/kernel/hi3536dv100.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000"
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3536dv100"
-BR2_OPENIPC_FAMILY="hi3536dv100"
-BR2_OPENIPC_RELEASE="fpv"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3536dv100"
+BR2_OPENIPC_SOC_FAMILY="hi3536dv100"
+BR2_OPENIPC_FLAVOR="fpv"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3536dv100_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3536dv100_lite_defconfig
index 0881e513..53fadd98 100644
--- a/br-ext-chip-hisilicon/configs/hi3536dv100_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3536dv100_lite_defconfig
@@ -26,16 +26,16 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/hisilicon-hi3536dv100.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/hi3536dv100/kernel/hi3536dv100.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/hi3536dv100/kernel/hi3536dv100.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000"
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="hisilicon"
-BR2_OPENIPC_MODEL="hi3536dv100"
-BR2_OPENIPC_FAMILY="hi3536dv100"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="hisilicon"
+BR2_OPENIPC_SOC_MODEL="hi3536dv100"
+BR2_OPENIPC_SOC_FAMILY="hi3536dv100"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ingenic/configs/t10_lite_defconfig b/br-ext-chip-ingenic/configs/t10_lite_defconfig
index d2e14a6d..5e5712e6 100644
--- a/br-ext-chip-ingenic/configs/t10_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t10_lite_defconfig
@@ -29,15 +29,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/ingenic-t31.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/t21/kernel/t10.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t10.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_LZMA=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="ingenic"
-BR2_OPENIPC_MODEL="t10"
-BR2_OPENIPC_FAMILY="t21"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="ingenic"
+BR2_OPENIPC_SOC_MODEL="t10"
+BR2_OPENIPC_SOC_FAMILY="t21"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ingenic/configs/t20_lite_defconfig b/br-ext-chip-ingenic/configs/t20_lite_defconfig
index c73065da..73bdeaa1 100644
--- a/br-ext-chip-ingenic/configs/t20_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t20_lite_defconfig
@@ -29,15 +29,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/ingenic-t31.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/t21/kernel/t20.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t20.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_LZMA=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="ingenic"
-BR2_OPENIPC_MODEL="t20"
-BR2_OPENIPC_FAMILY="t21"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="ingenic"
+BR2_OPENIPC_SOC_MODEL="t20"
+BR2_OPENIPC_SOC_FAMILY="t21"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ingenic/configs/t21_lite_defconfig b/br-ext-chip-ingenic/configs/t21_lite_defconfig
index 9461e915..376906aa 100644
--- a/br-ext-chip-ingenic/configs/t21_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t21_lite_defconfig
@@ -29,15 +29,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/ingenic-t31.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/t21/kernel/t21.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t21.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_LZMA=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="ingenic"
-BR2_OPENIPC_MODEL="t21"
-BR2_OPENIPC_FAMILY="t21"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="ingenic"
+BR2_OPENIPC_SOC_MODEL="t21"
+BR2_OPENIPC_SOC_FAMILY="t21"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ingenic/configs/t30_lite_defconfig b/br-ext-chip-ingenic/configs/t30_lite_defconfig
index b7332903..d67b9eee 100644
--- a/br-ext-chip-ingenic/configs/t30_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t30_lite_defconfig
@@ -29,15 +29,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/ingenic-t31.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/t21/kernel/t30.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t30.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_LZMA=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="ingenic"
-BR2_OPENIPC_MODEL="t30"
-BR2_OPENIPC_FAMILY="t21"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="ingenic"
+BR2_OPENIPC_SOC_MODEL="t30"
+BR2_OPENIPC_SOC_FAMILY="t21"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ingenic/configs/t31_fpv_defconfig b/br-ext-chip-ingenic/configs/t31_fpv_defconfig
index ec51f8a3..6311fdca 100644
--- a/br-ext-chip-ingenic/configs/t31_fpv_defconfig
+++ b/br-ext-chip-ingenic/configs/t31_fpv_defconfig
@@ -29,15 +29,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/ingenic-t31.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/t31/kernel/t31.generic-fpv.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t31/kernel/t31.generic-fpv.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_LZMA=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="ingenic"
-BR2_OPENIPC_MODEL="t31"
-BR2_OPENIPC_FAMILY="t31"
-BR2_OPENIPC_RELEASE="fpv"
+BR2_OPENIPC_SOC_VENDOR="ingenic"
+BR2_OPENIPC_SOC_MODEL="t31"
+BR2_OPENIPC_SOC_FAMILY="t31"
+BR2_OPENIPC_FLAVOR="fpv"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ingenic/configs/t31_lite_defconfig b/br-ext-chip-ingenic/configs/t31_lite_defconfig
index 760826ff..85402f7b 100644
--- a/br-ext-chip-ingenic/configs/t31_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t31_lite_defconfig
@@ -29,15 +29,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/ingenic-t31.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/t31/kernel/t31.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t31/kernel/t31.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_LZMA=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="ingenic"
-BR2_OPENIPC_MODEL="t31"
-BR2_OPENIPC_FAMILY="t31"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="ingenic"
+BR2_OPENIPC_SOC_MODEL="t31"
+BR2_OPENIPC_SOC_FAMILY="t31"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig
index 75bad408..c2f3bc80 100644
--- a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig
+++ b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig
@@ -29,15 +29,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/ingenic-t31.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/t31/kernel/t31.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t31/kernel/t31.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_LZMA=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="ingenic"
-BR2_OPENIPC_MODEL="t31"
-BR2_OPENIPC_FAMILY="t31"
-BR2_OPENIPC_RELEASE="ultimate"
+BR2_OPENIPC_SOC_VENDOR="ingenic"
+BR2_OPENIPC_SOC_MODEL="t31"
+BR2_OPENIPC_SOC_FAMILY="t31"
+BR2_OPENIPC_FLAVOR="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ingenic/configs/t40_lite_defconfig b/br-ext-chip-ingenic/configs/t40_lite_defconfig
index f0f47808..b06f7a94 100644
--- a/br-ext-chip-ingenic/configs/t40_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t40_lite_defconfig
@@ -29,15 +29,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/ingenic-t40.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/t40/kernel/t40.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t40/kernel/t40.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_LZMA=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="ingenic"
-BR2_OPENIPC_MODEL="t40"
-BR2_OPENIPC_FAMILY="t40"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="ingenic"
+BR2_OPENIPC_SOC_MODEL="t40"
+BR2_OPENIPC_SOC_FAMILY="t40"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ingenic/configs/t40_ultimate_defconfig b/br-ext-chip-ingenic/configs/t40_ultimate_defconfig
index af6d99a6..20b90c72 100644
--- a/br-ext-chip-ingenic/configs/t40_ultimate_defconfig
+++ b/br-ext-chip-ingenic/configs/t40_ultimate_defconfig
@@ -29,15 +29,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/ingenic-t40.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/t40/kernel/t40.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t40/kernel/t40.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_LZMA=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="ingenic"
-BR2_OPENIPC_MODEL="t40"
-BR2_OPENIPC_FAMILY="t40"
-BR2_OPENIPC_RELEASE="ultimate"
+BR2_OPENIPC_SOC_VENDOR="ingenic"
+BR2_OPENIPC_SOC_MODEL="t40"
+BR2_OPENIPC_SOC_FAMILY="t40"
+BR2_OPENIPC_FLAVOR="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-novatek/configs/nt98562_lite_defconfig b/br-ext-chip-novatek/configs/nt98562_lite_defconfig
index aa44ed33..0ab15c78 100644
--- a/br-ext-chip-novatek/configs/nt98562_lite_defconfig
+++ b/br-ext-chip-novatek/configs/nt98562_lite_defconfig
@@ -29,15 +29,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/novatek-nt9856x.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/nt9856x/kernel/nt98562.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/nt9856x/kernel/nt98562.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="novatek"
-BR2_OPENIPC_MODEL="nt98562"
-BR2_OPENIPC_FAMILY="nt9856x"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="novatek"
+BR2_OPENIPC_SOC_MODEL="nt98562"
+BR2_OPENIPC_SOC_FAMILY="nt9856x"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-novatek/configs/nt98566_lite_defconfig b/br-ext-chip-novatek/configs/nt98566_lite_defconfig
index fa7ff351..eb8ccb83 100644
--- a/br-ext-chip-novatek/configs/nt98566_lite_defconfig
+++ b/br-ext-chip-novatek/configs/nt98566_lite_defconfig
@@ -28,15 +28,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/novatek-nt9856x.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/nt9856x/kernel/nt98566.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/nt9856x/kernel/nt98566.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="novatek"
-BR2_OPENIPC_MODEL="nt98566"
-BR2_OPENIPC_FAMILY="nt9856x"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="novatek"
+BR2_OPENIPC_SOC_MODEL="nt98566"
+BR2_OPENIPC_SOC_FAMILY="nt9856x"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-rockchip/configs/rv1109_lite_defconfig b/br-ext-chip-rockchip/configs/rv1109_lite_defconfig
index 5b6f055f..9095347e 100644
--- a/br-ext-chip-rockchip/configs/rv1109_lite_defconfig
+++ b/br-ext-chip-rockchip/configs/rv1109_lite_defconfig
@@ -32,7 +32,7 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/rockchip-rv11xx.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/rv11xx/kernel/rv1126.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/rv11xx/kernel/rv1126.generic.config"
 BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
 BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="rv1109-38x38-v10-spi-nand-imx307.img"
 #BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="rv1109-38x38-v10-spi-nand-imx335.img"
@@ -40,10 +40,10 @@ BR2_LINUX_KERNEL_IMAGE_NAME="zboot.img"
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="rockchip"
-BR2_OPENIPC_MODEL="rv1109"
-BR2_OPENIPC_FAMILY="rv11xx"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="rockchip"
+BR2_OPENIPC_SOC_MODEL="rv1109"
+BR2_OPENIPC_SOC_FAMILY="rv11xx"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-rockchip/configs/rv1126_lite_defconfig b/br-ext-chip-rockchip/configs/rv1126_lite_defconfig
index 50442da9..75285d42 100644
--- a/br-ext-chip-rockchip/configs/rv1126_lite_defconfig
+++ b/br-ext-chip-rockchip/configs/rv1126_lite_defconfig
@@ -32,17 +32,17 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/rockchip-rv11xx.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/rv11xx/kernel/rv1126.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/rv11xx/kernel/rv1126.generic.config"
 BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
 BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="rv1126-ai-cam-ddr3-v1.img"
 BR2_LINUX_KERNEL_IMAGE_NAME="zboot.img"
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="rockchip"
-BR2_OPENIPC_MODEL="rv1126"
-BR2_OPENIPC_FAMILY="rv11xx"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="rockchip"
+BR2_OPENIPC_SOC_MODEL="rv1126"
+BR2_OPENIPC_SOC_FAMILY="rv11xx"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/msc313e_lite_defconfig b/br-ext-chip-sigmastar/configs/msc313e_lite_defconfig
index e6ed6e2a..79b21be1 100644
--- a/br-ext-chip-sigmastar/configs/msc313e_lite_defconfig
+++ b/br-ext-chip-sigmastar/configs/msc313e_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/sigmastar-infinity3.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/infinity3/kernel/msc313e.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/infinity3/kernel/msc313e.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="sigmastar"
-BR2_OPENIPC_MODEL="msc313e"
-BR2_OPENIPC_FAMILY="infinity3"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="sigmastar"
+BR2_OPENIPC_SOC_MODEL="msc313e"
+BR2_OPENIPC_SOC_FAMILY="infinity3"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/msc316dc_lite_defconfig b/br-ext-chip-sigmastar/configs/msc316dc_lite_defconfig
index c00caf67..c267fa37 100644
--- a/br-ext-chip-sigmastar/configs/msc316dc_lite_defconfig
+++ b/br-ext-chip-sigmastar/configs/msc316dc_lite_defconfig
@@ -29,15 +29,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/sigmastar-infinity3.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/infinity3/kernel/msc316dc.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/infinity3/kernel/msc316dc.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="sigmastar"
-BR2_OPENIPC_MODEL="msc316dc"
-BR2_OPENIPC_FAMILY="infinity3"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="sigmastar"
+BR2_OPENIPC_SOC_MODEL="msc316dc"
+BR2_OPENIPC_SOC_FAMILY="infinity3"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/msc316dm_lite_defconfig b/br-ext-chip-sigmastar/configs/msc316dm_lite_defconfig
index adb36a0b..2dbbf660 100644
--- a/br-ext-chip-sigmastar/configs/msc316dm_lite_defconfig
+++ b/br-ext-chip-sigmastar/configs/msc316dm_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/sigmastar-infinity3.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/infinity3/kernel/msc316dm.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/infinity3/kernel/msc316dm.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="sigmastar"
-BR2_OPENIPC_MODEL="msc316dm"
-BR2_OPENIPC_FAMILY="infinity3"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="sigmastar"
+BR2_OPENIPC_SOC_MODEL="msc316dm"
+BR2_OPENIPC_SOC_FAMILY="infinity3"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/ssc325_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc325_lite_defconfig
index 0e0049c9..11baf07e 100644
--- a/br-ext-chip-sigmastar/configs/ssc325_lite_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc325_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/sigmastar-infinity6b0.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/infinity6b0/kernel/ssc325.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/infinity6b0/kernel/ssc325.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="sigmastar"
-BR2_OPENIPC_MODEL="ssc325"
-BR2_OPENIPC_FAMILY="infinity6b0"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="sigmastar"
+BR2_OPENIPC_SOC_MODEL="ssc325"
+BR2_OPENIPC_SOC_FAMILY="infinity6b0"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/ssc333_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc333_lite_defconfig
index 068dff18..70512435 100644
--- a/br-ext-chip-sigmastar/configs/ssc333_lite_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc333_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/sigmastar-infinity6b0.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/infinity6b0/kernel/ssc333.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/infinity6b0/kernel/ssc333.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="sigmastar"
-BR2_OPENIPC_MODEL="ssc333"
-BR2_OPENIPC_FAMILY="infinity6b0"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="sigmastar"
+BR2_OPENIPC_SOC_MODEL="ssc333"
+BR2_OPENIPC_SOC_FAMILY="infinity6b0"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/ssc335_initramfs_defconfig b/br-ext-chip-sigmastar/configs/ssc335_initramfs_defconfig
index ae17e41e..b7c91321 100644
--- a/br-ext-chip-sigmastar/configs/ssc335_initramfs_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc335_initramfs_defconfig
@@ -22,15 +22,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/sigmastar-infinity6b0.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/infinity6b0/kernel/ssc335.initramfs.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/infinity6b0/kernel/ssc335.initramfs.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="sigmastar"
-BR2_OPENIPC_MODEL="ssc335"
-BR2_OPENIPC_FAMILY="infinity6b0"
-BR2_OPENIPC_RELEASE="initramfs"
+BR2_OPENIPC_SOC_VENDOR="sigmastar"
+BR2_OPENIPC_SOC_MODEL="ssc335"
+BR2_OPENIPC_SOC_FAMILY="infinity6b0"
+BR2_OPENIPC_FLAVOR="initramfs"
 
 # Filesystem
 BR2_TARGET_ROOTFS_INITRAMFS=y
diff --git a/br-ext-chip-sigmastar/configs/ssc335_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc335_lite_defconfig
index 76bad230..872555fa 100644
--- a/br-ext-chip-sigmastar/configs/ssc335_lite_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc335_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/sigmastar-infinity6b0.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/infinity6b0/kernel/ssc335.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/infinity6b0/kernel/ssc335.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="sigmastar"
-BR2_OPENIPC_MODEL="ssc335"
-BR2_OPENIPC_FAMILY="infinity6b0"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="sigmastar"
+BR2_OPENIPC_SOC_MODEL="ssc335"
+BR2_OPENIPC_SOC_FAMILY="infinity6b0"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/ssc335de_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc335de_lite_defconfig
index 39afbab4..8356e35e 100644
--- a/br-ext-chip-sigmastar/configs/ssc335de_lite_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc335de_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/sigmastar-infinity6b0.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/infinity6b0/kernel/ssc335de.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/infinity6b0/kernel/ssc335de.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="sigmastar"
-BR2_OPENIPC_MODEL="ssc335de"
-BR2_OPENIPC_FAMILY="infinity6b0"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="sigmastar"
+BR2_OPENIPC_SOC_MODEL="ssc335de"
+BR2_OPENIPC_SOC_FAMILY="infinity6b0"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/ssc337_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc337_lite_defconfig
index 0925373e..5ffe8847 100644
--- a/br-ext-chip-sigmastar/configs/ssc337_lite_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc337_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/sigmastar-infinity6b0.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/infinity6b0/kernel/ssc337.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/infinity6b0/kernel/ssc337.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="sigmastar"
-BR2_OPENIPC_MODEL="ssc337"
-BR2_OPENIPC_FAMILY="infinity6b0"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="sigmastar"
+BR2_OPENIPC_SOC_MODEL="ssc337"
+BR2_OPENIPC_SOC_FAMILY="infinity6b0"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/ssc337de_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc337de_lite_defconfig
index 3bc92c89..c1da1c72 100644
--- a/br-ext-chip-sigmastar/configs/ssc337de_lite_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc337de_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/sigmastar-infinity6b0.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/infinity6b0/kernel/ssc337de.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/infinity6b0/kernel/ssc337de.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="sigmastar"
-BR2_OPENIPC_MODEL="ssc337de"
-BR2_OPENIPC_FAMILY="infinity6b0"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="sigmastar"
+BR2_OPENIPC_SOC_MODEL="ssc337de"
+BR2_OPENIPC_SOC_FAMILY="infinity6b0"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig
index f1834540..1d1a70bd 100644
--- a/br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig
@@ -23,15 +23,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/sigmastar-infinity6e.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/infinity6e/kernel/ssc338q.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/infinity6e/kernel/ssc338q.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="sigmastar"
-BR2_OPENIPC_MODEL="ssc338q"
-BR2_OPENIPC_FAMILY="infinity6e"
-BR2_OPENIPC_RELEASE="initramfs"
+BR2_OPENIPC_SOC_VENDOR="sigmastar"
+BR2_OPENIPC_SOC_MODEL="ssc338q"
+BR2_OPENIPC_SOC_FAMILY="infinity6e"
+BR2_OPENIPC_FLAVOR="initramfs"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig
index fc5b0e25..7cfb6d70 100644
--- a/br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig
@@ -23,15 +23,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/sigmastar-infinity6e.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/infinity6e/kernel/ssc338q.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/infinity6e/kernel/ssc338q.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="sigmastar"
-BR2_OPENIPC_MODEL="ssc338q"
-BR2_OPENIPC_FAMILY="infinity6e"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="sigmastar"
+BR2_OPENIPC_SOC_MODEL="ssc338q"
+BR2_OPENIPC_SOC_FAMILY="infinity6e"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ti/configs/dm36x_lite_defconfig b/br-ext-chip-ti/configs/dm36x_lite_defconfig
index 1a7b62bc..6660859d 100644
--- a/br-ext-chip-ti/configs/dm36x_lite_defconfig
+++ b/br-ext-chip-ti/configs/dm36x_lite_defconfig
@@ -26,15 +26,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/ti-dm36x.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/dm36x/kernel/dm36x.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/dm36x/kernel/dm36x.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_LZMA=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="ti"
-BR2_OPENIPC_MODEL="dm36x"
-BR2_OPENIPC_FAMILY="dm36x"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="ti"
+BR2_OPENIPC_SOC_MODEL="dm36x"
+BR2_OPENIPC_SOC_FAMILY="dm36x"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-xiongmai/configs/xm510_lite_defconfig b/br-ext-chip-xiongmai/configs/xm510_lite_defconfig
index 0ddc0a88..2e72c52a 100644
--- a/br-ext-chip-xiongmai/configs/xm510_lite_defconfig
+++ b/br-ext-chip-xiongmai/configs/xm510_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/xiongmai-xm510.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/xm510/kernel/xm510.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/xm510/kernel/xm510.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="xiongmai"
-BR2_OPENIPC_MODEL="xm510"
-BR2_OPENIPC_FAMILY="xm510"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="xiongmai"
+BR2_OPENIPC_SOC_MODEL="xm510"
+BR2_OPENIPC_SOC_FAMILY="xm510"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-xiongmai/configs/xm530_lite_defconfig b/br-ext-chip-xiongmai/configs/xm530_lite_defconfig
index bb6ecf71..ed5e7b32 100644
--- a/br-ext-chip-xiongmai/configs/xm530_lite_defconfig
+++ b/br-ext-chip-xiongmai/configs/xm530_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/xiongmai-xm530.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/xm530/kernel/xm530.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/xm530/kernel/xm530.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="xiongmai"
-BR2_OPENIPC_MODEL="xm530"
-BR2_OPENIPC_FAMILY="xm530"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="xiongmai"
+BR2_OPENIPC_SOC_MODEL="xm530"
+BR2_OPENIPC_SOC_FAMILY="xm530"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-xiongmai/configs/xm550_lite_defconfig b/br-ext-chip-xiongmai/configs/xm550_lite_defconfig
index e9f1c8bc..e8949201 100644
--- a/br-ext-chip-xiongmai/configs/xm550_lite_defconfig
+++ b/br-ext-chip-xiongmai/configs/xm550_lite_defconfig
@@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/xiongmai-xm530.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_VENDOR)/board/xm530/kernel/xm530.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/xm530/kernel/xm530.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
 # OpenIPC
-BR2_OPENIPC_VENDOR="xiongmai"
-BR2_OPENIPC_MODEL="xm550"
-BR2_OPENIPC_FAMILY="xm530"
-BR2_OPENIPC_RELEASE="lite"
+BR2_OPENIPC_SOC_VENDOR="xiongmai"
+BR2_OPENIPC_SOC_MODEL="xm550"
+BR2_OPENIPC_SOC_FAMILY="xm530"
+BR2_OPENIPC_FLAVOR="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/general/Config.in b/general/Config.in
index 3afd56db..789d0944 100644
--- a/general/Config.in
+++ b/general/Config.in
@@ -1,17 +1,17 @@
-config BR2_OPENIPC_VENDOR
-	string "openipc vendor"
+config BR2_OPENIPC_SOC_VENDOR
+	string "openipc soc vendor"
 	default "hisilicon"
 
-config BR2_OPENIPC_MODEL
-	string "openipc model"
+config BR2_OPENIPC_SOC_MODEL
+	string "openipc soc model"
 	default "hi3516ev300"
 
-config BR2_OPENIPC_FAMILY
-	string "openipc family"
+config BR2_OPENIPC_SOC_FAMILY
+	string "openipc soc family"
 	default "hi3516ev200"
 
-config BR2_OPENIPC_RELEASE
-	string "openipc release"
+config BR2_OPENIPC_FLAVOR
+	string "openipc flavor"
 	default "lite"
 
 source "$BR2_EXTERNAL_GENERAL_PATH/package/Config.in"
diff --git a/general/external.mk b/general/external.mk
index e520f4b5..744c24d1 100644
--- a/general/external.mk
+++ b/general/external.mk
@@ -1,9 +1,9 @@
-export OPENIPC_VENDOR = $(call qstrip,$(BR2_OPENIPC_VENDOR))
-export OPENIPC_MODEL = $(call qstrip,$(BR2_OPENIPC_MODEL))
-export OPENIPC_FAMILY = $(call qstrip,$(BR2_OPENIPC_FAMILY))
-export OPENIPC_RELEASE = $(call qstrip,$(BR2_OPENIPC_RELEASE))
+export OPENIPC_SOC_VENDOR = $(call qstrip,$(BR2_OPENIPC_SOC_VENDOR))
+export OPENIPC_SOC_MODEL = $(call qstrip,$(BR2_OPENIPC_SOC_MODEL))
+export OPENIPC_SOC_FAMILY = $(call qstrip,$(BR2_OPENIPC_SOC_FAMILY))
+export OPENIPC_FLAVOR = $(call qstrip,$(BR2_OPENIPC_FLAVOR))
 
-export BR2_EXTERNAL_VENDOR = $(BR2_EXTERNAL)/../br-ext-chip-$(OPENIPC_VENDOR)
 OPENIPC_TOOLCHAIN = latest/$(shell $(BR2_EXTERNAL)/scripts/show_toolchains.sh $(BR2_DEFCONFIG))
+EXTERNAL_VENDOR = $(BR2_EXTERNAL)/../br-ext-chip-$(OPENIPC_SOC_VENDOR)
 
 include $(sort $(wildcard $(BR2_EXTERNAL)/package/*/*.mk))
diff --git a/general/package/all-patches/linux/0001-change-uimage-header.patch b/general/package/all-patches/linux/0001-change-uimage-header.patch
index fee65f6f..da2fa9b7 100644
--- a/general/package/all-patches/linux/0001-change-uimage-header.patch
+++ b/general/package/all-patches/linux/0001-change-uimage-header.patch
@@ -6,6 +6,6 @@ diff -uarN  a/scripts/Makefile.lib b/scripts/Makefile.lib
  UIMAGE_LOADADDR ?= arch_must_set_this
  UIMAGE_ENTRYADDR ?= $(UIMAGE_LOADADDR)
 -UIMAGE_NAME ?= 'Linux-$(KERNELRELEASE)'
-+UIMAGE_NAME ?= 'Linux-$(KERNELRELEASE)-$(OPENIPC_MODEL)'
++UIMAGE_NAME ?= 'Linux-$(KERNELRELEASE)-$(OPENIPC_SOC_MODEL)'
  UIMAGE_IN ?= $<
  UIMAGE_OUT ?= $@
diff --git a/general/package/datalink/datalink.mk b/general/package/datalink/datalink.mk
index a150c9c7..12f129c4 100644
--- a/general/package/datalink/datalink.mk
+++ b/general/package/datalink/datalink.mk
@@ -8,7 +8,7 @@ DATALINK_SITE =
 DATALINK_LICENSE = GPL-2.0
 
 DATALINK_FPATH = air
-ifeq ($(OPENIPC_FAMILY),hi3536dv100)
+ifeq ($(OPENIPC_SOC_FAMILY),hi3536dv100)
 	DATALINK_FPATH = gs
 endif
 
diff --git a/general/package/df_sdwan_edge/df_sdwan_edge.mk b/general/package/df_sdwan_edge/df_sdwan_edge.mk
index 495c7b45..64793ebf 100644
--- a/general/package/df_sdwan_edge/df_sdwan_edge.mk
+++ b/general/package/df_sdwan_edge/df_sdwan_edge.mk
@@ -6,7 +6,7 @@
 
 # - Package information
 DF_SDWAN_EDGE_VERSION = current
-DF_SDWAN_EDGE_SOURCE = df_sdwan_edge.$(OPENIPC_FAMILY).tar.xz
+DF_SDWAN_EDGE_SOURCE = df_sdwan_edge.$(OPENIPC_SOC_FAMILY).tar.xz
 DF_SDWAN_EDGE_SITE = http://getdataflow.ru/download/sdwan/openipc
 DF_SDWAN_EDGE_LICENSE = PROPRIETARY
 DF_SDWAN_EDGE_LICENSE_FILES = LICENSE
diff --git a/general/package/goke-osdrv-gk710x/goke-osdrv-gk710x.mk b/general/package/goke-osdrv-gk710x/goke-osdrv-gk710x.mk
index 7d97f4df..d2d056f6 100644
--- a/general/package/goke-osdrv-gk710x/goke-osdrv-gk710x.mk
+++ b/general/package/goke-osdrv-gk710x/goke-osdrv-gk710x.mk
@@ -9,9 +9,9 @@ GOKE_OSDRV_GK710X_SITE =
 GOKE_OSDRV_GK710X_LICENSE = MIT
 GOKE_OSDRV_GK710X_LICENSE_FILES = LICENSE
 
-ifeq ($(OPENIPC_MODEL),gk7102)
+ifeq ($(OPENIPC_SOC_MODEL),gk7102)
 	GOKE_OSDRV_GK710X_FIRMWARE = gk_fw_710x.bin
-else ifeq ($(OPENIPC_MODEL),gk7102s)
+else ifeq ($(OPENIPC_SOC_MODEL),gk7102s)
 	GOKE_OSDRV_GK710X_FIRMWARE = gk_fw_710xs.bin
 endif
 
diff --git a/general/package/hisilicon-opensdk/hisilicon-opensdk.mk b/general/package/hisilicon-opensdk/hisilicon-opensdk.mk
index 6869d382..8bde17b9 100644
--- a/general/package/hisilicon-opensdk/hisilicon-opensdk.mk
+++ b/general/package/hisilicon-opensdk/hisilicon-opensdk.mk
@@ -15,24 +15,24 @@ HISILICON_OPENSDK_MODULE_MAKE_OPTS = \
 	DISABLE_PM=1 \
 	DISABLE_TDE=1 \
 	DISABLE_VO=1 \
-	CHIPARCH=$(OPENIPC_FAMILY)
+	CHIPARCH=$(OPENIPC_SOC_FAMILY)
 
-ifeq ($(OPENIPC_FAMILY),hi3516ev200)
+ifeq ($(OPENIPC_SOC_FAMILY),hi3516ev200)
 	HISILICON_OPENSDK_MODULE_MAKE_OPTS += DISABLE_ISP=1
 	HISILICON_OPENSDK_SDK_CODE = 0x3516E200
-else ifeq ($(OPENIPC_FAMILY),gk7205v200)
+else ifeq ($(OPENIPC_SOC_FAMILY),gk7205v200)
 	HISILICON_OPENSDK_SDK_CODE = 0x7205200
 endif
 
 # for userspace libraries
 define HISILICON_OPENSDK_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) CHIPARCH=$(OPENIPC_FAMILY) SDK_CODE=$(HISILICON_OPENSDK_SDK_CODE) -C $(@D)/libraries all
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) CHIPARCH=$(OPENIPC_SOC_FAMILY) SDK_CODE=$(HISILICON_OPENSDK_SDK_CODE) -C $(@D)/libraries all
 endef
 
 define HISILICON_OPENSDK_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors
-	$(INSTALL) -D -m 0644 $(@D)/libraries/sensor/$(OPENIPC_FAMILY)/sony_imx335/libsns_imx335.so $(TARGET_DIR)/usr/lib/sensors
-	$(INSTALL) -D -m 0644 $(@D)/libraries/sensor/$(OPENIPC_FAMILY)/sony_imx307/libsns_imx307.so $(TARGET_DIR)/usr/lib/sensors
+	$(INSTALL) -D -m 0644 $(@D)/libraries/sensor/$(OPENIPC_SOC_FAMILY)/sony_imx335/libsns_imx335.so $(TARGET_DIR)/usr/lib/sensors
+	$(INSTALL) -D -m 0644 $(@D)/libraries/sensor/$(OPENIPC_SOC_FAMILY)/sony_imx307/libsns_imx307.so $(TARGET_DIR)/usr/lib/sensors
 endef
 
 $(eval $(kernel-module))
diff --git a/general/package/ingenic-opensdk/ingenic-opensdk.mk b/general/package/ingenic-opensdk/ingenic-opensdk.mk
index 731274f0..d3a85e0f 100644
--- a/general/package/ingenic-opensdk/ingenic-opensdk.mk
+++ b/general/package/ingenic-opensdk/ingenic-opensdk.mk
@@ -11,7 +11,7 @@ INGENIC_OPENSDK_LICENSE_FILES = LICENSE
 
 INGENIC_OPENSDK_MODULE_SUBDIRS = kernel
 INGENIC_OPENSDK_MODULE_MAKE_OPTS = \
-	SOC=$(OPENIPC_MODEL)
+	SOC=$(OPENIPC_SOC_MODEL)
 
 $(eval $(kernel-module))
 $(eval $(generic-package))
diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk
index 4af21a01..8c473488 100644
--- a/general/package/majestic/majestic.mk
+++ b/general/package/majestic/majestic.mk
@@ -10,8 +10,8 @@ MAJESTIC_SITE = https://openipc.s3-eu-west-1.amazonaws.com
 MAJESTIC_LICENSE = PROPRIETARY
 MAJESTIC_LICENSE_FILES = LICENSE
 
-MAJESTIC_FAMILY = $(OPENIPC_FAMILY)
-MAJESTIC_RELEASE = $(OPENIPC_RELEASE)
+MAJESTIC_FAMILY = $(OPENIPC_SOC_FAMILY)
+MAJESTIC_RELEASE = $(OPENIPC_FLAVOR)
 
 ifeq ($(MAJESTIC_RELEASE),ultimate)
 	# we don't have Majestic ultimate for these platforms
diff --git a/general/package/wifibroadcast/wifibroadcast.mk b/general/package/wifibroadcast/wifibroadcast.mk
index 0cec2d9c..68fe8d72 100644
--- a/general/package/wifibroadcast/wifibroadcast.mk
+++ b/general/package/wifibroadcast/wifibroadcast.mk
@@ -8,7 +8,7 @@ WIFIBROADCAST_SITE = $(call github,svpcom,wfb-ng,wfb-ng-$(WIFIBROADCAST_VERSION)
 WIFIBROADCAST_LICENSE = GPL-2.0
 
 WIFIBROADCAST_FPATH = air
-ifeq ($(OPENIPC_FAMILY),hi3536dv100)
+ifeq ($(OPENIPC_SOC_FAMILY),hi3536dv100)
 	WIFIBROADCAST_FPATH = gs
 endif
 
diff --git a/general/scripts/rootfs_script.sh b/general/scripts/rootfs_script.sh
index cc3ac973..2663981f 100755
--- a/general/scripts/rootfs_script.sh
+++ b/general/scripts/rootfs_script.sh
@@ -5,7 +5,7 @@ FILE=${TARGET_DIR}/usr/lib/os-release
 
 echo OPENIPC_VERSION=${DATE:0:1}.${DATE:1} >> ${FILE}
 date +GITHUB_VERSION="\"${GIT_BRANCH-local}+${GIT_HASH-build}, %Y-%m-%d"\" >> ${FILE}
-echo BUILD_OPTION=${OPENIPC_RELEASE} >> ${FILE}
+echo BUILD_OPTION=${OPENIPC_FLAVOR} >> ${FILE}
 date +TIME_STAMP=%s >> ${FILE}
 rm -f ${TARGET_DIR}/usr/bin/gdbserver
 
@@ -15,7 +15,7 @@ if ! grep -q "USES_GLIBC" ${BR2_CONFIG} && ! grep -qP ${CONF} ${BR2_CONFIG}; the
 fi
 
 if grep -q "USES_MUSL" ${BR2_CONFIG}; then
-  LIST=${BR2_EXTERNAL}/scripts/excludes/${OPENIPC_MODEL}_${OPENIPC_RELEASE}.list
+  LIST=${BR2_EXTERNAL}/scripts/excludes/${OPENIPC_SOC_MODEL}_${OPENIPC_FLAVOR}.list
   test -e ${LIST} && xargs -a ${LIST} -I % rm -rf ${TARGET_DIR}/%
 
   ln -sf /lib/libc.so ${TARGET_DIR}/lib/ld-uClibc.so.0