OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

[no ci] Configs: set separate variable for Majestic version (#1311)

pull/1316/head
viktorxda 2024-02-10 23:51:43 +01:00 committed by GitHub
parent 993e917f43
commit 823680b988
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
br-ext-chip-goke/configs/gk7205v200_lte_defconfig
View File

@ -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

1
br-ext-chip-goke/configs/gk7205v300_lte_defconfig
View File

@ -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

1
br-ext-chip-hisilicon/configs/hi3516av100_ultimate_defconfig
View File

@ -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

1
br-ext-chip-hisilicon/configs/hi3516av200_ultimate_defconfig
View File

@ -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

1
br-ext-chip-hisilicon/configs/hi3516dv100_ultimate_defconfig
View File

@ -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

1
br-ext-chip-hisilicon/configs/hi3516ev200_lte_defconfig
View File

@ -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

1
br-ext-chip-hisilicon/configs/hi3516ev300_lte_defconfig
View File

@ -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

1
br-ext-chip-ingenic/configs/t20_ultimate_defconfig
View File

@ -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

1
br-ext-chip-ingenic/configs/t21_ultimate_defconfig
View File

@ -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

1
br-ext-chip-ingenic/configs/t31_ultimate_defconfig
View File

@ -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

1
br-ext-chip-ingenic/configs/t40_ultimate_defconfig
View File

@ -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

1
br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig
View File

@ -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

1
br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig
View File

@ -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

4
general/Config.in
View File

@ -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"

1
general/external.mk
View File

@ -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))

15
general/package/majestic/majestic.mk
View File

@ -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)),)