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

Fix FAMILY inferring for ancient Ingenic chips (#578)

pull/579/head
Dmitry Ilyin 2022-11-22 19:27:57 +03:00 committed by GitHub
parent 96b2a0ed2f
commit 741151a4d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
br-ext-chip-ingenic/board/t31/kernel/t10.generic.config → br-ext-chip-ingenic/board/t21/kernel/t10.generic.config
View File

0
br-ext-chip-ingenic/board/t31/kernel/t20.generic.config → br-ext-chip-ingenic/board/t21/kernel/t20.generic.config
View File

0
br-ext-chip-ingenic/board/t31/kernel/t21.generic.config → br-ext-chip-ingenic/board/t21/kernel/t21.generic.config
View File

2
br-ext-chip-ingenic/configs/t10_lite_defconfig
View File

@ -29,7 +29,7 @@ BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.14" BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.14"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y 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_UIMAGE=y
BR2_LINUX_KERNEL_LZMA=y BR2_LINUX_KERNEL_LZMA=y
BR2_LINUX_KERNEL_EXT_INGENIC_PATCHER=y BR2_LINUX_KERNEL_EXT_INGENIC_PATCHER=y

2
br-ext-chip-ingenic/configs/t20_lite_defconfig
View File

@ -29,7 +29,7 @@ BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.14" BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.14"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y 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_UIMAGE=y
BR2_LINUX_KERNEL_LZMA=y BR2_LINUX_KERNEL_LZMA=y
BR2_LINUX_KERNEL_EXT_INGENIC_PATCHER=y BR2_LINUX_KERNEL_EXT_INGENIC_PATCHER=y

2
br-ext-chip-ingenic/configs/t21_lite_defconfig
View File

@ -29,7 +29,7 @@ BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.14" BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.14"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y 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_UIMAGE=y
BR2_LINUX_KERNEL_LZMA=y BR2_LINUX_KERNEL_LZMA=y
BR2_LINUX_KERNEL_EXT_INGENIC_PATCHER=y BR2_LINUX_KERNEL_EXT_INGENIC_PATCHER=y

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

@ -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) 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) ifeq ($(RELEASE),ultimate)
# we don't have Majestic binary Ultimate distributions for these # we don't have Majestic binary Ultimate distributions for these
# platforms so use Lite # platforms so use Lite