Skip to content

Commit

Permalink
Ingenic: use separate release for t10/t20 platform (#1268)
Browse files Browse the repository at this point in the history
  • Loading branch information
@viktorxda
viktorxda authored Jan 20, 2024
1 parent 81c888a commit 2bf4f41
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 33 deletions.
0 ...genic/board/t21/kernel/t10.generic.config → ...genic/board/t20/kernel/t10.generic.config
View file
File renamed without changes.
0 ...genic/board/t21/kernel/t20.generic.config → ...genic/board/t20/kernel/t20.generic.config
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions br-ext-chip-ingenic/configs/t10_lite_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
# Kernel
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_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_SOC_VENDOR)-t31.tar.gz"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t10.generic.config"
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t20/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="t21"
BR2_OPENIPC_SOC_FAMILY="t20"
BR2_OPENIPC_FLAVOR="lite"
BR2_OPENIPC_FLASH_SIZE="8"

Expand Down
6 changes: 3 additions & 3 deletions br-ext-chip-ingenic/configs/t20_lite_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
# Kernel
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_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_SOC_VENDOR)-t31.tar.gz"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t20.generic.config"
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t20/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="t21"
BR2_OPENIPC_SOC_FAMILY="t20"
BR2_OPENIPC_FLAVOR="lite"
BR2_OPENIPC_FLASH_SIZE="8"

Expand Down
6 changes: 3 additions & 3 deletions br-ext-chip-ingenic/configs/t20_ultimate_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
# Kernel
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_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_SOC_VENDOR)-t31.tar.gz"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t20.generic.config"
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t20/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="t21"
BR2_OPENIPC_SOC_FAMILY="t20"
BR2_OPENIPC_FLAVOR="ultimate"
BR2_OPENIPC_FLASH_SIZE="16"

Expand Down
2 changes: 1 addition & 1 deletion br-ext-chip-ingenic/configs/t21_lite_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
# Kernel
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_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_SOC_VENDOR)-t31.tar.gz"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t21.generic.config"
BR2_LINUX_KERNEL_UIMAGE=y
Expand Down
2 changes: 1 addition & 1 deletion br-ext-chip-ingenic/configs/t21_ultimate_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
# Kernel
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_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_SOC_VENDOR)-t31.tar.gz"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t21.generic.config"
BR2_LINUX_KERNEL_UIMAGE=y
Expand Down
2 changes: 1 addition & 1 deletion br-ext-chip-ingenic/configs/t30_lite_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
# Kernel
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_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_SOC_VENDOR)-t31.tar.gz"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t30.generic.config"
BR2_LINUX_KERNEL_UIMAGE=y
Expand Down
15 changes: 1 addition & 14 deletions general/external.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,6 @@ 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 := $(BR2_OPENIPC_KERNEL)
else
OPENIPC_KERNEL := $(shell git ls-remote https://github.com/openipc/linux \
$(BR2_OPENIPC_KERNEL) | head -1 | cut -f1)
LOCAL_DOWNLOAD = y
endif
OPENIPC_KERNEL := $(OPENIPC_SOC_VENDOR)-$(OPENIPC_SOC_FAMILY)

include $(sort $(wildcard $(BR2_EXTERNAL)/package/*/*.mk))
10 changes: 3 additions & 7 deletions general/package/majestic/majestic.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@

MAJESTIC_SITE = https://openipc.s3-eu-west-1.amazonaws.com
MAJESTIC_SOURCE = majestic.$(MAJESTIC_FAMILY).$(MAJESTIC_RELEASE).master.tar.bz2

MAJESTIC_LICENSE = PROPRIETARY
MAJESTIC_LICENSE_FILES = LICENSE

MAJESTIC_FAMILY = $(OPENIPC_SOC_FAMILY)
MAJESTIC_RELEASE = $(OPENIPC_FLAVOR)

# we don't have Majestic ultimate for these platforms
MAJESTIC_LIST = hi3516av100 hi3519v101
# filter Majestic ultimate for these platforms
MAJESTIC_LIST = t20 t21 hi3516av100 hi3519v101

ifneq ($(filter $(MAJESTIC_LIST),$(MAJESTIC_FAMILY)),)
MAJESTIC_RELEASE = lite
Expand All @@ -29,8 +28,7 @@ MAJESTIC_DEPENDENCIES = \
libogg-openipc \
mbedtls-openipc \
opus-openipc \
json-c \
zlib
json-c

MAJESTIC_STRIP_COMPONENTS = 0

Expand All @@ -44,8 +42,6 @@ define MAJESTIC_INSTALL_TARGET_CMDS

$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic

rm -rf $(MAJESTIC_DL_DIR)
endef

$(eval $(generic-package))

0 comments on commit 2bf4f41

Please sign in to comment.