From 0e017918e00ab2260855464d160766df465ba400 Mon Sep 17 00:00:00 2001
From: Viktor <35473052+viktorxda@users.noreply.github.com>
Date: Thu, 27 Jul 2023 17:27:19 +0200
Subject: [PATCH] Ingenic: separate t21 variants

---
 .../board/{t31 => t21}/kernel/t10.generic.config   |  0
 .../board/{t31 => t21}/kernel/t20.generic.config   |  0
 .../board/{t31 => t21}/kernel/t21.generic.config   |  0
 .../board/{t31 => t21}/kernel/t30.generic.config   |  0
 br-ext-chip-ingenic/configs/t10_lite_defconfig     |  4 ++--
 br-ext-chip-ingenic/configs/t20_lite_defconfig     |  4 ++--
 br-ext-chip-ingenic/configs/t21_lite_defconfig     |  4 ++--
 br-ext-chip-ingenic/configs/t30_lite_defconfig     |  4 ++--
 general/external.mk                                | 14 ++++++++++----
 general/package/majestic/majestic.mk               |  6 ------
 10 files changed, 18 insertions(+), 18 deletions(-)
 rename br-ext-chip-ingenic/board/{t31 => t21}/kernel/t10.generic.config (100%)
 rename br-ext-chip-ingenic/board/{t31 => t21}/kernel/t20.generic.config (100%)
 rename br-ext-chip-ingenic/board/{t31 => t21}/kernel/t21.generic.config (100%)
 rename br-ext-chip-ingenic/board/{t31 => t21}/kernel/t30.generic.config (100%)

diff --git a/br-ext-chip-ingenic/board/t31/kernel/t10.generic.config b/br-ext-chip-ingenic/board/t21/kernel/t10.generic.config
similarity index 100%
rename from br-ext-chip-ingenic/board/t31/kernel/t10.generic.config
rename to br-ext-chip-ingenic/board/t21/kernel/t10.generic.config
diff --git a/br-ext-chip-ingenic/board/t31/kernel/t20.generic.config b/br-ext-chip-ingenic/board/t21/kernel/t20.generic.config
similarity index 100%
rename from br-ext-chip-ingenic/board/t31/kernel/t20.generic.config
rename to br-ext-chip-ingenic/board/t21/kernel/t20.generic.config
diff --git a/br-ext-chip-ingenic/board/t31/kernel/t21.generic.config b/br-ext-chip-ingenic/board/t21/kernel/t21.generic.config
similarity index 100%
rename from br-ext-chip-ingenic/board/t31/kernel/t21.generic.config
rename to br-ext-chip-ingenic/board/t21/kernel/t21.generic.config
diff --git a/br-ext-chip-ingenic/board/t31/kernel/t30.generic.config b/br-ext-chip-ingenic/board/t21/kernel/t30.generic.config
similarity index 100%
rename from br-ext-chip-ingenic/board/t31/kernel/t30.generic.config
rename to br-ext-chip-ingenic/board/t21/kernel/t30.generic.config
diff --git a/br-ext-chip-ingenic/configs/t10_lite_defconfig b/br-ext-chip-ingenic/configs/t10_lite_defconfig
index 1bc982459..379350335 100644
--- a/br-ext-chip-ingenic/configs/t10_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t10_lite_defconfig
@@ -29,14 +29,14 @@ BR2_LINUX_KERNEL=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_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_LZMA=y
 
 # OpenIPC
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t10"
-BR2_OPENIPC_SOC_FAMILY="t31"
+BR2_OPENIPC_SOC_FAMILY="t21"
 BR2_OPENIPC_FLAVOR="lite"
 BR2_OPENIPC_FLASH_SIZE="8"
 
diff --git a/br-ext-chip-ingenic/configs/t20_lite_defconfig b/br-ext-chip-ingenic/configs/t20_lite_defconfig
index 9223f2093..c5a393d33 100644
--- a/br-ext-chip-ingenic/configs/t20_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t20_lite_defconfig
@@ -29,14 +29,14 @@ BR2_LINUX_KERNEL=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_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_LZMA=y
 
 # OpenIPC
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t20"
-BR2_OPENIPC_SOC_FAMILY="t31"
+BR2_OPENIPC_SOC_FAMILY="t21"
 BR2_OPENIPC_FLAVOR="lite"
 BR2_OPENIPC_FLASH_SIZE="8"
 
diff --git a/br-ext-chip-ingenic/configs/t21_lite_defconfig b/br-ext-chip-ingenic/configs/t21_lite_defconfig
index 766b441c9..f1dd16879 100644
--- a/br-ext-chip-ingenic/configs/t21_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t21_lite_defconfig
@@ -29,14 +29,14 @@ BR2_LINUX_KERNEL=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_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_LZMA=y
 
 # OpenIPC
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t21"
-BR2_OPENIPC_SOC_FAMILY="t31"
+BR2_OPENIPC_SOC_FAMILY="t21"
 BR2_OPENIPC_FLAVOR="lite"
 BR2_OPENIPC_FLASH_SIZE="8"
 
diff --git a/br-ext-chip-ingenic/configs/t30_lite_defconfig b/br-ext-chip-ingenic/configs/t30_lite_defconfig
index c2a10ff31..5456213cc 100644
--- a/br-ext-chip-ingenic/configs/t30_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t30_lite_defconfig
@@ -29,14 +29,14 @@ BR2_LINUX_KERNEL=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_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_LZMA=y
 
 # OpenIPC
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t30"
-BR2_OPENIPC_SOC_FAMILY="t31"
+BR2_OPENIPC_SOC_FAMILY="t21"
 BR2_OPENIPC_FLAVOR="lite"
 BR2_OPENIPC_FLASH_SIZE="8"
 
diff --git a/general/external.mk b/general/external.mk
index 1722b2231..53c49356e 100644
--- a/general/external.mk
+++ b/general/external.mk
@@ -6,12 +6,18 @@ export OPENIPC_FLAVOR := $(call qstrip,$(BR2_OPENIPC_FLAVOR))
 EXTERNAL_VENDOR := $(BR2_EXTERNAL)/../br-ext-chip-$(OPENIPC_SOC_VENDOR)
 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)
-OPENIPC_KERNEL := $(OPENIPC_SOC_VENDOR)-$(OPENIPC_SOC_FAMILY)
+	OPENIPC_KERNEL := $(BR2_OPENIPC_KERNEL)
 else
-OPENIPC_KERNEL := $(shell git ls-remote https://github.com/openipc/linux \
-	$(OPENIPC_SOC_VENDOR)-$(OPENIPC_SOC_FAMILY) | head -1 | cut -f1)
-LOCAL_DOWNLOAD = y
+	OPENIPC_KERNEL := $(shell git ls-remote https://github.com/openipc/linux \
+		$(BR2_OPENIPC_KERNEL) | head -1 | cut -f1)
+	LOCAL_DOWNLOAD = y
 endif
 
 include $(sort $(wildcard $(BR2_EXTERNAL)/package/*/*.mk))
diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk
index 0d428df30..2da77368b 100644
--- a/general/package/majestic/majestic.mk
+++ b/general/package/majestic/majestic.mk
@@ -26,12 +26,6 @@ ifeq ($(MAJESTIC_RELEASE),ultimate)
 	endif
 endif
 
-ifeq ($(MAJESTIC_FAMILY),t31)
-	ifneq ($(OPENIPC_SOC_MODEL),t31)
-		MAJESTIC_FAMILY = t21
-	endif
-endif
-
 ifeq ($(MAJESTIC_RELEASE),lte)
 	MAJESTIC_RELEASE = fpv
 endif