diff --git a/Makefile b/Makefile index fb97acb7..f6cacd27 100644 --- a/Makefile +++ b/Makefile @@ -36,13 +36,7 @@ defconfig: prepare prepare: @if test ! -e $(TARGET)/buildroot-$(BR_VER); then \ wget -c -q $(BR_LINK)/$(BR_VER).tar.gz -O $(BR_FILE); \ - mkdir -p $(TARGET); tar -xf $(BR_FILE) -C $(TARGET); \ - if grep "BR2_OPENIPC_SOC_FAMILY=\"k230\"" $(CONFIG) >/dev/null ; then \ - $(TARGET)/buildroot-$(BR_VER)/support/scripts/apply-patches.sh -s \ - $(TARGET)/buildroot-$(BR_VER)/ \ - general/package/canaan_k230_sdk/buildroot_patch/ *.patch; fi; \ - fi - + mkdir -p $(TARGET); tar -xf $(BR_FILE) -C $(TARGET); fi help: @printf "BR-OpenIPC usage:\n \ diff --git a/br-ext-chip-canaan/configs/k230_canmv_01studio_defconfig b/br-ext-chip-canaan/configs/k230_canmv_01studio_defconfig index 98cccf35..8b29582c 100644 --- a/br-ext-chip-canaan/configs/k230_canmv_01studio_defconfig +++ b/br-ext-chip-canaan/configs/k230_canmv_01studio_defconfig @@ -1,22 +1,6 @@ BR2_riscv=y BR2_RISCV_ISA_RVC=y -BR2_RISCV_ISA_RVV=y - -# Toolchain -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="https://kendryte-download.canaan-creative.com/k230/downloads/dl/gcc/Xuantie-900-gcc-linux-6.6.0-glibc-x86_64-V3.0.2-20250410.tar.gz" -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="riscv64-unknown-linux-gnu" -BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y -# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set -BR2_TOOLCHAIN_EXTERNAL_CXX=y -BR2_TOOLCHAIN_EXTERNAL_FORTRAN=y -BR2_TOOLCHAIN_EXTERNAL_OPENMP=y - -# Filesystem -BR2_TARGET_OPTIMIZATION="-mcpu=c908v -Wno-implicit-function-declaration -Wno-incompatible-pointer-types" +BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="$(TOPDIR)/../../dl" BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/package/canaan_k230_sdk/canaan_k230_post-image.sh" diff --git a/general/package/canaan_k230_sdk/buildroot_patch/0001-support-gcc-14.patch b/general/package/canaan_k230_sdk/buildroot_patch/0001-support-gcc-14.patch deleted file mode 100644 index 51cc954f..00000000 --- a/general/package/canaan_k230_sdk/buildroot_patch/0001-support-gcc-14.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 99d0e3e9da9aaf4c4cbf6a4b10d2ad558e65ed61 Mon Sep 17 00:00:00 2001 -From: wangjianxin -Date: Fri, 30 May 2025 11:53:35 +0800 -Subject: [PATCH] support gcc 14 - ---- - toolchain/Config.in | 5 +++++ - .../toolchain-external-custom/Config.in.options | 4 ++++ - 2 files changed, 9 insertions(+) - mode change 100644 => 100755 toolchain/Config.in - mode change 100644 => 100755 toolchain/toolchain-external/toolchain-external-custom/Config.in.options - -diff --git a/toolchain/Config.in b/toolchain/Config.in -old mode 100644 -new mode 100755 -index bd4f80bd..d0483628 ---- a/toolchain/Config.in -+++ b/toolchain/Config.in -@@ -792,10 +792,15 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_13 - bool - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - -+config BR2_TOOLCHAIN_GCC_AT_LEAST_14 -+ bool -+ select BR2_TOOLCHAIN_GCC_AT_LEAST_13 -+ - # This order guarantees that the highest version is set, as kconfig - # stops affecting a value on the first matching default. - config BR2_TOOLCHAIN_GCC_AT_LEAST - string -+ default "14" if BR2_TOOLCHAIN_GCC_AT_LEAST_14 - default "13" if BR2_TOOLCHAIN_GCC_AT_LEAST_13 - default "12" if BR2_TOOLCHAIN_GCC_AT_LEAST_12 - default "11" if BR2_TOOLCHAIN_GCC_AT_LEAST_11 -diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options -old mode 100644 -new mode 100755 -index 5554d567..838ac79a ---- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options -+++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options -@@ -46,6 +46,10 @@ choice - Set to the gcc version that is used by your external - toolchain. - -+config BR2_TOOLCHAIN_EXTERNAL_GCC_14 -+ bool "14.x" -+ select BR2_TOOLCHAIN_GCC_AT_LEAST_14 -+ - config BR2_TOOLCHAIN_EXTERNAL_GCC_13 - bool "13.x" - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 --- -2.46.0 -