diff --git a/br-ext-chip-goke/configs/gk7205v200_lte_defconfig b/br-ext-chip-goke/configs/gk7205v200_lte_defconfig
index 78d49c83..ff786cd5 100644
--- a/br-ext-chip-goke/configs/gk7205v200_lte_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v200_lte_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="gk7205v200"
 BR2_OPENIPC_SOC_FAMILY="gk7205v200"
 BR2_OPENIPC_VARIANT="lte"
 BR2_OPENIPC_FLASH_SIZE="8"
+BR2_OPENIPC_MAJESTIC="fpv"
 
 # 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 4cc74a65..54c4a1fc 100644
--- a/br-ext-chip-goke/configs/gk7205v300_lte_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v300_lte_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="gk7205v300"
 BR2_OPENIPC_SOC_FAMILY="gk7205v200"
 BR2_OPENIPC_VARIANT="lte"
 BR2_OPENIPC_FLASH_SIZE="8"
+BR2_OPENIPC_MAJESTIC="fpv"
 
 # 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 30ec8836..84fe963d 100644
--- a/br-ext-chip-hisilicon/configs/hi3516av100_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516av100_ultimate_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="hi3516av100"
 BR2_OPENIPC_SOC_FAMILY="hi3516av100"
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="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 be482eeb..b6b7b37b 100644
--- a/br-ext-chip-hisilicon/configs/hi3516av200_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516av200_ultimate_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="hi3516av200"
 BR2_OPENIPC_SOC_FAMILY="hi3519v101"
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="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 16da25bc..6e99a462 100644
--- a/br-ext-chip-hisilicon/configs/hi3516dv100_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516dv100_ultimate_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="hi3516dv100"
 BR2_OPENIPC_SOC_FAMILY="hi3516av100"
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="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 4168b893..12ff8241 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev200_lte_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev200_lte_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="hi3516ev200"
 BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
 BR2_OPENIPC_VARIANT="lte"
 BR2_OPENIPC_FLASH_SIZE="8"
+BR2_OPENIPC_MAJESTIC="fpv"
 
 # 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 b81dab4c..da6a8a1e 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev300_lte_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev300_lte_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="hi3516ev300"
 BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
 BR2_OPENIPC_VARIANT="lte"
 BR2_OPENIPC_FLASH_SIZE="8"
+BR2_OPENIPC_MAJESTIC="fpv"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ingenic/configs/t20_ultimate_defconfig b/br-ext-chip-ingenic/configs/t20_ultimate_defconfig
index 60ba10d7..4e0d1b8a 100644
--- a/br-ext-chip-ingenic/configs/t20_ultimate_defconfig
+++ b/br-ext-chip-ingenic/configs/t20_ultimate_defconfig
@@ -40,6 +40,7 @@ BR2_OPENIPC_SOC_FAMILY="t20"
 BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ingenic/configs/t21_ultimate_defconfig b/br-ext-chip-ingenic/configs/t21_ultimate_defconfig
index a8f49985..36a72d2c 100644
--- a/br-ext-chip-ingenic/configs/t21_ultimate_defconfig
+++ b/br-ext-chip-ingenic/configs/t21_ultimate_defconfig
@@ -40,6 +40,7 @@ BR2_OPENIPC_SOC_FAMILY="t21"
 BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="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 62a1ac18..97b466e1 100644
--- a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig
+++ b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig
@@ -40,6 +40,7 @@ BR2_OPENIPC_SOC_FAMILY="t31"
 BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="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 cd1752d5..e96f920d 100644
--- a/br-ext-chip-ingenic/configs/t40_ultimate_defconfig
+++ b/br-ext-chip-ingenic/configs/t40_ultimate_defconfig
@@ -40,6 +40,7 @@ BR2_OPENIPC_SOC_FAMILY="t40"
 BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig b/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig
index db48ef18..461e79a5 100644
--- a/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig
@@ -33,6 +33,7 @@ BR2_OPENIPC_SOC_MODEL="ssc30kq"
 BR2_OPENIPC_SOC_FAMILY="infinity6e"
 BR2_OPENIPC_VARIANT="fpv"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig
index 61e1fd4d..90b7a97a 100644
--- a/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig
@@ -33,6 +33,7 @@ BR2_OPENIPC_SOC_MODEL="ssc338q"
 BR2_OPENIPC_SOC_FAMILY="infinity6e"
 BR2_OPENIPC_VARIANT="fpv"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/general/Config.in b/general/Config.in
index 5c7aef4e..6629e98d 100644
--- a/general/Config.in
+++ b/general/Config.in
@@ -22,4 +22,8 @@ config BR2_OPENIPC_FLASH_SIZE
 	string "OpenIPC flash size"
 	default "8"
 
+config BR2_OPENIPC_MAJESTIC
+	string "OpenIPC Majestic"
+	default ""
+
 source "$BR2_EXTERNAL_GENERAL_PATH/package/Config.in"
diff --git a/general/external.mk b/general/external.mk
index 64261085..1394fe36 100644
--- a/general/external.mk
+++ b/general/external.mk
@@ -3,6 +3,7 @@ export OPENIPC_SOC_MODEL := $(call qstrip,$(BR2_OPENIPC_SOC_MODEL))
 export OPENIPC_SOC_FAMILY := $(call qstrip,$(BR2_OPENIPC_SOC_FAMILY))
 export OPENIPC_SNS_MODEL := $(call qstrip,$(BR2_OPENIPC_SNS_MODEL))
 export OPENIPC_VARIANT := $(call qstrip,$(BR2_OPENIPC_VARIANT))
+export OPENIPC_MAJESTIC := $(call qstrip,$(BR2_OPENIPC_MAJESTIC))
 
 EXTERNAL_VENDOR := $(BR2_EXTERNAL)/../br-ext-chip-$(OPENIPC_SOC_VENDOR)
 OPENIPC_TOOLCHAIN := latest/$(shell $(BR2_EXTERNAL)/scripts/show_toolchains.sh $(BR2_DEFCONFIG))
diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk
index 4ed64922..fb052564 100644
--- a/general/package/majestic/majestic.mk
+++ b/general/package/majestic/majestic.mk
@@ -10,20 +10,7 @@ MAJESTIC_LICENSE = PROPRIETARY
 MAJESTIC_LICENSE_FILES = LICENSE
 
 MAJESTIC_FAMILY = $(OPENIPC_SOC_FAMILY)
-MAJESTIC_VARIANT = $(OPENIPC_VARIANT)
-
-MAJESTIC_ULTIMATE = hi3516av100 hi3519v101
-ifneq ($(filter $(MAJESTIC_ULTIMATE),$(MAJESTIC_FAMILY)),)
-	MAJESTIC_VARIANT = lite
-endif
-
-ifeq ($(MAJESTIC_VARIANT),lte)
-	MAJESTIC_VARIANT = fpv
-endif
-
-ifeq ($(OPENIPC_SOC_VENDOR),ingenic)
-	MAJESTIC_VARIANT = lite
-endif
+MAJESTIC_VARIANT = $(or $(OPENIPC_MAJESTIC), $(OPENIPC_VARIANT))
 
 MAJESTIC_VENDOR = hisilicon goke ingenic sigmastar
 ifneq ($(filter $(MAJESTIC_VENDOR),$(OPENIPC_SOC_VENDOR)),)