Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ingenic: separate t21 variants #925

Merged
merged 1 commit into from
Jul 28, 2023
Merged

Ingenic: separate t21 variants #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...genic/board/t31/kernel/t10.generic.config → ...genic/board/t21/kernel/t10.generic.config
View file
Open in desktop
File renamed without changes.
0 ...genic/board/t31/kernel/t20.generic.config → ...genic/board/t21/kernel/t20.generic.config
View file
Open in desktop
File renamed without changes.
0 ...genic/board/t31/kernel/t21.generic.config → ...genic/board/t21/kernel/t21.generic.config
View file
Open in desktop
File renamed without changes.
0 ...genic/board/t31/kernel/t30.generic.config → ...genic/board/t21/kernel/t30.generic.config
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions br-ext-chip-ingenic/configs/t10_lite_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions br-ext-chip-ingenic/configs/t20_lite_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions br-ext-chip-ingenic/configs/t21_lite_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions br-ext-chip-ingenic/configs/t30_lite_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
14 changes: 10 additions & 4 deletions general/external.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
6 changes: 0 additions & 6 deletions general/package/majestic/majestic.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down