Ingenic: separate t21 variants

pull/927/head
Viktor 2023-07-27 17:27:19 +02:00 committed by viktorxda
parent 18644a1711
commit d5d900f423
10 changed files with 19 additions and 19 deletions

View File

@ -29,14 +29,14 @@ BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz" BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t31/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_UIMAGE=y
BR2_LINUX_KERNEL_LZMA=y BR2_LINUX_KERNEL_LZMA=y
# OpenIPC # OpenIPC
BR2_OPENIPC_SOC_VENDOR="ingenic" BR2_OPENIPC_SOC_VENDOR="ingenic"
BR2_OPENIPC_SOC_MODEL="t10" BR2_OPENIPC_SOC_MODEL="t10"
BR2_OPENIPC_SOC_FAMILY="t31" BR2_OPENIPC_SOC_FAMILY="t21"
BR2_OPENIPC_FLAVOR="lite" BR2_OPENIPC_FLAVOR="lite"
BR2_OPENIPC_FLASH_SIZE="8" BR2_OPENIPC_FLASH_SIZE="8"

View File

@ -29,14 +29,14 @@ BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz" BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t31/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_UIMAGE=y
BR2_LINUX_KERNEL_LZMA=y BR2_LINUX_KERNEL_LZMA=y
# OpenIPC # OpenIPC
BR2_OPENIPC_SOC_VENDOR="ingenic" BR2_OPENIPC_SOC_VENDOR="ingenic"
BR2_OPENIPC_SOC_MODEL="t20" BR2_OPENIPC_SOC_MODEL="t20"
BR2_OPENIPC_SOC_FAMILY="t31" BR2_OPENIPC_SOC_FAMILY="t21"
BR2_OPENIPC_FLAVOR="lite" BR2_OPENIPC_FLAVOR="lite"
BR2_OPENIPC_FLASH_SIZE="8" BR2_OPENIPC_FLASH_SIZE="8"

View File

@ -29,14 +29,14 @@ BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz" BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t31/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_UIMAGE=y
BR2_LINUX_KERNEL_LZMA=y BR2_LINUX_KERNEL_LZMA=y
# OpenIPC # OpenIPC
BR2_OPENIPC_SOC_VENDOR="ingenic" BR2_OPENIPC_SOC_VENDOR="ingenic"
BR2_OPENIPC_SOC_MODEL="t21" BR2_OPENIPC_SOC_MODEL="t21"
BR2_OPENIPC_SOC_FAMILY="t31" BR2_OPENIPC_SOC_FAMILY="t21"
BR2_OPENIPC_FLAVOR="lite" BR2_OPENIPC_FLAVOR="lite"
BR2_OPENIPC_FLASH_SIZE="8" BR2_OPENIPC_FLASH_SIZE="8"

View File

@ -29,14 +29,14 @@ BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz" BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t31/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_UIMAGE=y
BR2_LINUX_KERNEL_LZMA=y BR2_LINUX_KERNEL_LZMA=y
# OpenIPC # OpenIPC
BR2_OPENIPC_SOC_VENDOR="ingenic" BR2_OPENIPC_SOC_VENDOR="ingenic"
BR2_OPENIPC_SOC_MODEL="t30" BR2_OPENIPC_SOC_MODEL="t30"
BR2_OPENIPC_SOC_FAMILY="t31" BR2_OPENIPC_SOC_FAMILY="t21"
BR2_OPENIPC_FLAVOR="lite" BR2_OPENIPC_FLAVOR="lite"
BR2_OPENIPC_FLASH_SIZE="8" BR2_OPENIPC_FLASH_SIZE="8"

View File

@ -6,11 +6,17 @@ export OPENIPC_FLAVOR := $(call qstrip,$(BR2_OPENIPC_FLAVOR))
EXTERNAL_VENDOR := $(BR2_EXTERNAL)/../br-ext-chip-$(OPENIPC_SOC_VENDOR) EXTERNAL_VENDOR := $(BR2_EXTERNAL)/../br-ext-chip-$(OPENIPC_SOC_VENDOR)
OPENIPC_TOOLCHAIN := latest/$(shell $(BR2_EXTERNAL)/scripts/show_toolchains.sh $(BR2_DEFCONFIG)) OPENIPC_TOOLCHAIN := latest/$(shell $(BR2_EXTERNAL)/scripts/show_toolchains.sh $(BR2_DEFCONFIG))
ifeq ($(OPENIPC_SOC_FAMILY),t21)
BR2_OPENIPC_KERNEL := $(OPENIPC_SOC_VENDOR)-t31
else
BR2_OPENIPC_KERNEL := $(OPENIPC_SOC_VENDOR)-$(OPENIPC_SOC_FAMILY)
endif
ifeq ($(call qstrip,$(BR2_DL_DIR)),$(TOPDIR)/dl) ifeq ($(call qstrip,$(BR2_DL_DIR)),$(TOPDIR)/dl)
OPENIPC_KERNEL := $(OPENIPC_SOC_VENDOR)-$(OPENIPC_SOC_FAMILY) OPENIPC_KERNEL := $(BR2_OPENIPC_KERNEL)
else else
OPENIPC_KERNEL := $(shell git ls-remote https://github.com/openipc/linux \ OPENIPC_KERNEL := $(shell git ls-remote https://github.com/openipc/linux \
$(OPENIPC_SOC_VENDOR)-$(OPENIPC_SOC_FAMILY) | head -1 | cut -f1) $(BR2_OPENIPC_KERNEL) | head -1 | cut -f1)
LOCAL_DOWNLOAD = y LOCAL_DOWNLOAD = y
endif endif

View File

@ -24,12 +24,6 @@ ifeq ($(MAJESTIC_RELEASE),ultimate)
endif endif
endif endif
ifeq ($(MAJESTIC_FAMILY),t31)
ifneq ($(OPENIPC_SOC_MODEL),t31)
MAJESTIC_FAMILY = t21
endif
endif
ifeq ($(MAJESTIC_RELEASE),lte) ifeq ($(MAJESTIC_RELEASE),lte)
MAJESTIC_RELEASE = fpv MAJESTIC_RELEASE = fpv
endif endif