From 770725e85722165f280dd28e5a83d6d55f0d8978 Mon Sep 17 00:00:00 2001
From: cronyx <xcronyx@gmail.com>
Date: Sun, 15 May 2022 10:29:10 +0300
Subject: [PATCH] more fix and add majestic source select for 16ev200 16cv300

---
 .../configs/unknown_unknown_hi3516cv300_ultimate_defconfig  | 1 +
 .../configs/unknown_unknown_hi3516ev200_ultimate_defconfig  | 1 +
 building.sh                                                 | 6 ++++++
 general/package/majestic-hi3516cv300/Config.in              | 5 +++++
 .../package/majestic-hi3516cv300/majestic-hi3516cv300.mk    | 6 ++++++
 5 files changed, 19 insertions(+)

diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_ultimate_defconfig
index c7cf0180..bc20e059 100644
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_ultimate_defconfig
@@ -75,6 +75,7 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
 BR2_PACKAGE_LIBYAML=y
 BR2_PACKAGE_MAJESTIC_FONTS=y
 BR2_PACKAGE_MAJESTIC_HI3516CV300=y
+# BR2_PACKAGE_MAJESTIC_ULTIMATE is not set
 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_hi3516ev200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig
index d6e86cf5..f01b1f2b 100644
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig
@@ -76,6 +76,7 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
 BR2_PACKAGE_LIBYAML=y
 BR2_PACKAGE_MAJESTIC_FONTS=y
 BR2_PACKAGE_MAJESTIC_HI3516EV300=y
+BR2_PACKAGE_MAJESTIC_ULTIMATE=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 99c633f2..3166462f 100755
--- a/building.sh
+++ b/building.sh
@@ -249,6 +249,11 @@ hi3516cv300() {
   fresh && make PLATFORM=hisilicon BOARD=unknown_unknown_${soc}_openipc all && rename
 }
 
+hi3516cv300_ultimate() {
+  soc="hi3516cv300"
+  fresh && make PLATFORM=hisilicon BOARD=unknown_unknown_${soc}_ultimate all && rename
+}
+
 hi3516ev100() {
   soc="hi3516ev100"
   fresh && make PLATFORM=hisilicon BOARD=unknown_unknown_${soc}_openipc all && rename
@@ -567,6 +572,7 @@ xm550() {
 # hi3516dv100                   # OpenIPC
 #
 # hi3516cv300                   # OpenIPC
+# hi3516cv300_ultimate          # OpenIPC_ultimate version
 # hi3516ev100                   # OpenIPC
 #
 # hi3516dv200                   # OpenIPC
diff --git a/general/package/majestic-hi3516cv300/Config.in b/general/package/majestic-hi3516cv300/Config.in
index d1ddc440..07e76840 100644
--- a/general/package/majestic-hi3516cv300/Config.in
+++ b/general/package/majestic-hi3516cv300/Config.in
@@ -5,3 +5,8 @@ config BR2_PACKAGE_MAJESTIC_HI3516CV300
 	  Tiny but powerful IPC streaming software
 
 	  https://openipc.org
+
+config BR2_PACKAGE_MAJESTIC_ULTIMATE
+        bool "Use this option for the ultimate build"
+        default n
+
diff --git a/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk b/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk
index c86c702d..32a2da78 100644
--- a/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk
+++ b/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk
@@ -10,6 +10,12 @@ MAJESTIC_HI3516CV300_SITE = https://openipc.s3-eu-west-1.amazonaws.com
 MAJESTIC_HI3516CV300_LICENSE = MIT
 MAJESTIC_HI3516CV300_LICENSE_FILES = LICENSE
 
+ifeq ($(BR2_PACKAGE_MAJESTIC_ULTIMATE),y)
+MAJESTIC_HI3516СV300_SOURCE = majestic.hi3516сv300.ultimate.master.tar.bz2
+else
+MAJESTIC_HI3516СV300_SOURCE = majestic.hi3516сv300.lite.master.tar.bz2
+endif
+
 define MAJESTIC_HI3516CV300_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
 	$(INSTALL) -m 644 $(@D)/majestic-mini.yaml $(TARGET_DIR)/etc/majestic.yaml