Skip to content

Commit d6c4b42

Browse files
viktorxdaviktorxda
authored
[no ci] General: set toolchain name based on chipset family (#1612)
1 parent 1c5f0e9 commit d6c4b42

File tree

8 files changed

+56
-36
lines changed

8 files changed

+56
-36
lines changed

‎.github/workflows/image.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ env:
88
SIGMASTAR: ssc30kd ssc30kq ssc325 ssc333 ssc335 ssc335de ssc337 ssc337de ssc338q ssc377 ssc377d ssc377de ssc378de
99
INGENIC: t10 t10l t20 t20l t20x t21n t30a t30a1 t30l t30n t30x t31a t31al t31l t31lc t31n t31x
1010
ALLWINNER: v851s
11+
TAG_NAME: image
1112

1213
jobs:
1314
toolchain:
@@ -20,9 +21,9 @@ jobs:
2021
create() {
2122
uboot=u-boot-$1-nor.bin
2223
firmware=openipc.$2-nor-$3.tgz
23-
release=images/openipc-$1-nor-$3.bin
24+
release=image/openipc-$1-nor-$3.bin
2425
25-
mkdir -p images output
26+
mkdir -p image output
2627
if ! wget -nv $link/$uboot -O output/$1.bin; then
2728
echo -e "Download failed: $link/$uboot\n"
2829
return 0
@@ -56,6 +57,6 @@ jobs:
5657
- name: Upload
5758
uses: softprops/action-gh-release@v2
5859
with:
59-
tag_name: images
60+
tag_name: ${{env.TAG_NAME}}
6061
make_latest: false
61-
files: images/*.bin
62+
files: image/*.bin

‎.github/workflows/toolchain.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44

55
env:
6-
TAG_NAME: latest
6+
TAG_NAME: toolchain
77

88
jobs:
99
toolchain:
@@ -26,9 +26,6 @@ jobs:
2626
# Ingenic [T31]
2727
- {"platform": "t31"}
2828

29-
# Ingenic [T31] with GLIBC
30-
- {"platform": "t31glibc"}
31-
3229
# Ingenic [T40]
3330
- {"platform": "t40"}
3431

@@ -84,11 +81,9 @@ jobs:
8481
URL=https://github.com/${GITHUB_REPOSITORY}/releases/download/${TAG_NAME}/${GCC}
8582
echo ${URL}
8683
if ! wget -q --spider ${URL}; then
87-
sed -i "/BR2_TOOLCHAIN_EXTERNAL.*/d" ${CONFIG}
8884
echo BR2_PACKAGE_HOST_GDB=y >> ${CONFIG}
8985
echo BR2_PACKAGE_AWS_WEBRTC=y >> ${CONFIG}
90-
make BOARD=${CONFIG} br-source
91-
make BOARD=${CONFIG} br-sdk
86+
make BOARD=${CONFIG} toolchain
9287
SDK=$(find output/images -name *_sdk-buildroot.tar.gz)
9388
mv ${SDK} ${GCC}
9489
echo GCC=${GCC} >> ${GITHUB_ENV}
@@ -98,4 +93,5 @@ jobs:
9893
uses: softprops/action-gh-release@v2
9994
with:
10095
tag_name: ${{env.TAG_NAME}}
96+
make_latest: false
10197
files: ${{env.GCC}}

‎Makefile

+11-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ BR_VER = 2024.02.6
22
BR_MAKE = $(MAKE) -C $(TARGET)/buildroot-$(BR_VER) BR2_EXTERNAL=$(PWD)/general O=$(TARGET)
33
BR_LINK = https://github.com/buildroot/buildroot/archive
44
BR_FILE = /tmp/buildroot-$(BR_VER).tar.gz
5+
BR_CONF = $(TARGET)/openipc_defconfig
56
TARGET ?= $(PWD)/output
67

78
CONFIG = $(error variable BOARD not defined)
@@ -29,8 +30,8 @@ br-%: defconfig
2930

3031
defconfig: prepare
3132
@echo --- $(or $(CONFIG),$(error variable BOARD not found))
32-
@cat $(CONFIG) $(PWD)/general/openipc.fragment > $(TARGET)/openipc_defconfig
33-
@$(BR_MAKE) BR2_DEFCONFIG=$(TARGET)/openipc_defconfig defconfig
33+
@cat $(CONFIG) $(PWD)/general/openipc.fragment > $(BR_CONF)
34+
@$(BR_MAKE) BR2_DEFCONFIG=$(BR_CONF) defconfig
3435

3536
prepare:
3637
@if test ! -e $(TARGET)/buildroot-$(BR_VER); then \
@@ -53,7 +54,7 @@ package:
5354
@find $(PWD)/general/package/* -maxdepth 0 -type d -printf "br-%f\n" | grep -v patch
5455

5556
toolname:
56-
@$(PWD)/general/scripts/show_toolchains.sh $(CONFIG)
57+
@echo br-sdk-$(BR2_OPENIPC_SOC_VENDOR)-$(BR2_OPENIPC_SOC_FAMILY)
5758

5859
clean:
5960
@rm -rf $(TARGET)/build $(TARGET)/images $(TARGET)/per-package $(TARGET)/target
@@ -68,6 +69,13 @@ deps:
6869
timer:
6970
@echo - Build time: $(shell date -d @$(shell expr $(shell date +%s) - $(TIMER)) -u +%M:%S)
7071

72+
toolchain: defconfig
73+
ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
74+
@$(MAKE) -f $(PWD)/general/toolchain.mk BR_CONF=$(BR_CONF) CONFIG=$(PWD)/$(CONFIG)
75+
@$(BR_MAKE) BR2_DEFCONFIG=$(BR_CONF) defconfig
76+
endif
77+
@$(BR_MAKE) sdk
78+
7179
repack:
7280
ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS),y)
7381
ifeq ($(BR2_OPENIPC_FLASH_SIZE),"8")

‎br-ext-chip-grainmedia/configs/gm8135_lite_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ BR2_arm=y
55
BR2_TOOLCHAIN_EXTERNAL=y
66
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
77
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
8-
BR2_TOOLCHAIN_EXTERNAL_UCLIBC=y
98
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz"
109
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-uclibcgnueabi"
1110
BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_3=y

‎br-ext-chip-grainmedia/configs/gm8136_lite_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ BR2_arm=y
55
BR2_TOOLCHAIN_EXTERNAL=y
66
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
77
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
8-
BR2_TOOLCHAIN_EXTERNAL_UCLIBC=y
98
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz"
109
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-uclibcgnueabi"
1110
BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_3=y

‎general/external.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export OPENIPC_MAJESTIC := $(call qstrip,$(BR2_OPENIPC_MAJESTIC))
77
export WGET := wget --show-progress --passive-ftp -nd -t5 -T10
88

99
EXTERNAL_VENDOR := $(BR2_EXTERNAL)/../br-ext-chip-$(OPENIPC_SOC_VENDOR)
10-
OPENIPC_TOOLCHAIN := latest/$(shell $(BR2_EXTERNAL)/scripts/show_toolchains.sh $(BR2_DEFCONFIG))
1110
OPENIPC_KERNEL := $(OPENIPC_SOC_VENDOR)-$(OPENIPC_SOC_FAMILY)
11+
OPENIPC_TOOLCHAIN := toolchain/br-sdk-$(OPENIPC_KERNEL)
1212

1313
include $(sort $(wildcard $(BR2_EXTERNAL)/package/*/*.mk))

‎general/scripts/show_toolchains.sh

-19
This file was deleted.

‎general/toolchain.mk

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
include $(CONFIG)
2+
3+
all:
4+
@echo -e "\n# SDK" >> $(BR_CONF)
5+
@echo "BR2_TOOLCHAIN_BUILDROOT=y" >> $(BR_CONF)
6+
@echo "BR2_TOOLCHAIN_BUILDROOT_VENDOR=\"openipc\"" >> $(BR_CONF)
7+
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL),y)
8+
@echo "BR2_TOOLCHAIN_BUILDROOT_MUSL=y" >> $(BR_CONF)
9+
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC),y)
10+
@echo "BR2_TOOLCHAIN_BUILDROOT_GLIBC=y" >> $(BR_CONF)
11+
else
12+
@echo "BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y" >> $(BR_CONF)
13+
endif
14+
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CXX),y)
15+
@echo "BR2_TOOLCHAIN_BUILDROOT_CXX=y" >> $(BR_CONF)
16+
endif
17+
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_10),y)
18+
@echo "BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y" >> $(BR_CONF)
19+
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19),y)
20+
@echo "BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y" >> $(BR_CONF)
21+
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9),y)
22+
@echo "BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y" >> $(BR_CONF)
23+
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4),y)
24+
@echo "BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y" >> $(BR_CONF)
25+
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_18),y)
26+
@echo "BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y" >> $(BR_CONF)
27+
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10),y)
28+
@echo "BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y" >> $(BR_CONF)
29+
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_4),y)
30+
@echo "BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_4=y" >> $(BR_CONF)
31+
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_3),y)
32+
@echo "BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_3=y" >> $(BR_CONF)
33+
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_0),y)
34+
@echo "BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0=y" >> $(BR_CONF)
35+
endif
36+
@echo "BR2_GCC_VERSION_13_X=y" >> $(BR_CONF)

0 commit comments

Comments
 (0)