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/configs/t10_lite_defconfig b/br-ext-chip-ingenic/configs/t10_lite_defconfig index ab9be8af..2dcc4604 100644 --- a/br-ext-chip-ingenic/configs/t10_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t10_lite_defconfig @@ -29,7 +29,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.14" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_INGENIC_PATH)/board/t31/kernel/t10.generic.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_INGENIC_PATH)/board/t21/kernel/t10.generic.config" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_LZMA=y BR2_LINUX_KERNEL_EXT_INGENIC_PATCHER=y diff --git a/br-ext-chip-ingenic/configs/t20_lite_defconfig b/br-ext-chip-ingenic/configs/t20_lite_defconfig index de77084f..ced7baf1 100644 --- a/br-ext-chip-ingenic/configs/t20_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t20_lite_defconfig @@ -29,7 +29,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.14" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_INGENIC_PATH)/board/t31/kernel/t20.generic.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_INGENIC_PATH)/board/t21/kernel/t20.generic.config" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_LZMA=y BR2_LINUX_KERNEL_EXT_INGENIC_PATCHER=y diff --git a/br-ext-chip-ingenic/configs/t21_lite_defconfig b/br-ext-chip-ingenic/configs/t21_lite_defconfig index fd496e6e..5896abfc 100644 --- a/br-ext-chip-ingenic/configs/t21_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t21_lite_defconfig @@ -29,7 +29,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.14" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_INGENIC_PATH)/board/t31/kernel/t21.generic.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_INGENIC_PATH)/board/t21/kernel/t21.generic.config" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_LZMA=y BR2_LINUX_KERNEL_EXT_INGENIC_PATCHER=y diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk index 6b7b1db6..a7c0268f 100644 --- a/general/package/majestic/majestic.mk +++ b/general/package/majestic/majestic.mk @@ -13,16 +13,6 @@ FAMILY := $(shell grep "/board/" $(BR2_CONFIG) | head -1 | cut -d "/" -f 3) RELEASE := $(shell grep "BR2_DEFCONFIG" $(BR2_CONFIG) | head -1 | cut -d "_" -f 3) -ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T20),y) - FAMILY := t21 -else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T30),y) - FAMILY := t31 -else ifeq ($(BR2_PACKAGE_INGENIC_OSDRV_T31),y) - FAMILY := t31 -else ifeq ($(BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335),y) - FAMILY := ssc335 -endif - ifeq ($(RELEASE),ultimate) # we don't have Majestic binary Ultimate distributions for these # platforms so use Lite