diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig index efbb3792..c92fdcc7 100644 --- a/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig +++ b/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig @@ -71,6 +71,7 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_GK7205V200=y +# BR2_PACKAGE_MAJESTIC_FPV=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_fpv_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_fpv_defconfig index bdf18104..29146c20 100644 --- a/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_fpv_defconfig +++ b/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_fpv_defconfig @@ -71,6 +71,7 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_GK7205V200=y +# BR2_PACKAGE_MAJESTIC_FPV=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig index 387b84b9..ef0f1150 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig @@ -71,6 +71,7 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_HI3516EV300=y +# BR2_PACKAGE_MAJESTIC_HI3516EV300=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/building.sh b/building.sh index ab41dc83..2fb8a3ad 100755 --- a/building.sh +++ b/building.sh @@ -574,7 +574,7 @@ xm550() { # gk7205v200_ufanet # Ufanet # gk7205v300 # OpenIPC # gk7205v300_ultimate # OpenIPC_ultimate version -gk7205v300_fpv # FPV (ultimate by default) +# gk7205v300_fpv # FPV (ultimate by default) # gk7605v100 # testing.. # ####### diff --git a/general/package/majestic-gk7205v200/Config.in b/general/package/majestic-gk7205v200/Config.in index 216d867d..f7d2d8c9 100644 --- a/general/package/majestic-gk7205v200/Config.in +++ b/general/package/majestic-gk7205v200/Config.in @@ -9,3 +9,7 @@ config BR2_PACKAGE_MAJESTIC_GK7205V200 config BR2_PACKAGE_MAJESTIC_ULTIMATE bool "Use this option for the ultimate build" default n + +config BR2_PACKAGE_MAJESTIC_FPV + bool "Use this option for the fpv build" + default n diff --git a/general/package/majestic-gk7205v200/majestic-gk7205v200.mk b/general/package/majestic-gk7205v200/majestic-gk7205v200.mk index ca9cde17..2d310501 100644 --- a/general/package/majestic-gk7205v200/majestic-gk7205v200.mk +++ b/general/package/majestic-gk7205v200/majestic-gk7205v200.mk @@ -12,6 +12,8 @@ MAJESTIC_GK7205V200_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_MAJESTIC_ULTIMATE),y) MAJESTIC_GK7205V200_SOURCE = majestic.gk7205v200.ultimate.master.tar.bz2 +else ifeq ($(BR2_PACKAGE_MAJESTIC_FPV),y) +MAJESTIC_GK7205V200_SOURCE = majestic.gk7205v200.fpv.master.tar.bz2 else MAJESTIC_GK7205V200_SOURCE = majestic.gk7205v200.lite.master.tar.bz2 endif diff --git a/general/package/majestic-hi3516ev300/Config.in b/general/package/majestic-hi3516ev300/Config.in index 8d7cccb2..e26f8dad 100644 --- a/general/package/majestic-hi3516ev300/Config.in +++ b/general/package/majestic-hi3516ev300/Config.in @@ -9,3 +9,7 @@ config BR2_PACKAGE_MAJESTIC_HI3516EV300 config BR2_PACKAGE_MAJESTIC_ULTIMATE bool "Use this option for the ultimate build" default n + +config BR2_PACKAGE_MAJESTIC_FPV + bool "Use this option for the fpv build" + default n diff --git a/general/package/majestic-hi3516ev300/majestic-hi3516ev300.mk b/general/package/majestic-hi3516ev300/majestic-hi3516ev300.mk index a3e801f2..23054e16 100644 --- a/general/package/majestic-hi3516ev300/majestic-hi3516ev300.mk +++ b/general/package/majestic-hi3516ev300/majestic-hi3516ev300.mk @@ -12,6 +12,8 @@ MAJESTIC_HI3516EV300_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_MAJESTIC_ULTIMATE),y) MAJESTIC_HI3516EV300_SOURCE = majestic.hi3516ev300.ultimate.master.tar.bz2 +else ifeq ($(BR2_PACKAGE_MAJESTIC_FPV),y) +MAJESTIC_HI3516EV300_SOURCE = majestic.hi3516ev300.fpv.master.tar.bz2 else MAJESTIC_HI3516EV300_SOURCE = majestic.hi3516ev300.lite.master.tar.bz2 endif