From 402955e0be0a33d129caa1ddf13dcdbeb0af68f2 Mon Sep 17 00:00:00 2001
From: wangjianxin <wangjianxin@canaan-creative.com>
Date: Fri, 30 May 2025 17:50:24 +0800
Subject: [PATCH] k230

---
 .../configs/k230_canmv_01studio_defconfig              |  9 +++++----
 .../package/canaan_k230_sdk/canaan_k230_post-image.sh  |  2 --
 general/package/canaan_k230_sdk/canaan_k230_sdk.mk     | 10 +++++-----
 general/package/canaan_k230_sdk/k230_env.env           |  1 -
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/br-ext-chip-canaan/configs/k230_canmv_01studio_defconfig b/br-ext-chip-canaan/configs/k230_canmv_01studio_defconfig
index b76a397e..98cccf35 100644
--- a/br-ext-chip-canaan/configs/k230_canmv_01studio_defconfig
+++ b/br-ext-chip-canaan/configs/k230_canmv_01studio_defconfig
@@ -5,7 +5,8 @@ BR2_RISCV_ISA_RVV=y
 # Toolchain
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="/opt/toolchain/Xuantie-900-gcc-linux-6.6.0-glibc-x86_64-V3.0.2/"
+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
@@ -29,12 +30,11 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_OPENIPC_SOC_VENDOR="canaan"
 BR2_OPENIPC_SOC_MODEL="k230"
 BR2_OPENIPC_SOC_FAMILY="k230"
-# BR2_PACKAGE_AWS_PRODUCER=y
-# BR2_PACKAGE_AWS_WEBRTC=y
 
 
 
-BR2_PACKAGE_CANAAN_K230_SDK=y
+
+
 
 # Packages
 BR2_PACKAGE_DROPBEAR_OPENIPC=y
@@ -56,3 +56,4 @@ BR2_PACKAGE_OPUS_OPENIPC=y
 #BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
 BR2_PACKAGE_VTUND_OPENIPC=y
 BR2_PACKAGE_YAML_CLI=y
+BR2_PACKAGE_CANAAN_K230_SDK=y
diff --git a/general/package/canaan_k230_sdk/canaan_k230_post-image.sh b/general/package/canaan_k230_sdk/canaan_k230_post-image.sh
index 060ecacd..66ec453c 100755
--- a/general/package/canaan_k230_sdk/canaan_k230_post-image.sh
+++ b/general/package/canaan_k230_sdk/canaan_k230_post-image.sh
@@ -21,8 +21,6 @@ k230_openipc_img_replace_rootfs()
 k230_openipc_img_env_replace()
 {
     cd ${BINARIES_DIR}
-    env;
-    mkenvimage -h;
     mkenvimage  -s 0x10000 -o env.env  ${BR2_EXTERNAL}/package/canaan_k230_sdk/k230_env.env
 
     dd if=env.env  of=sysimage-sdcard.img seek=3840 conv=notrunc
diff --git a/general/package/canaan_k230_sdk/canaan_k230_sdk.mk b/general/package/canaan_k230_sdk/canaan_k230_sdk.mk
index 624e0e42..b454a0c5 100644
--- a/general/package/canaan_k230_sdk/canaan_k230_sdk.mk
+++ b/general/package/canaan_k230_sdk/canaan_k230_sdk.mk
@@ -7,15 +7,15 @@ CANAAN_K230_SDK_SITE =
 CANAAN_K230_SDK_SOURCE =
 
 k230_download_url := $(shell \
-	if curl --output /dev/null --silent --head --fail https://ai.b-bug.org/~/wangjianxin/ ;then  \
-	echo "https://ai.b-bug.org/~/wangjianxin/"; \
+	if curl --output /dev/null --silent --head --fail https://ai.b-bug.org/k230/downloads/dl/openipc ;then  \
+	echo "https://ai.b-bug.org/k230/downloads/dl/openipc"; \
 	else \
-	echo "https://kendryte-download.canaan-creative.com/k230/downloads/kmodel";\
+	echo "https://kendryte-download.canaan-creative.com/k230/dl/openipc";\
 	fi ; )
 
 
-CANAAN_K230_SDK_EXTRA_DOWNLOADS := $(k230_download_url)/sysimage-sdcard.img.gz
-CANAAN_K230_SDK_EXTRA_DOWNLOADS += $(k230_download_url)/rootfs.tar.xz
+CANAAN_K230_SDK_EXTRA_DOWNLOADS := $(k230_download_url)/$(call qstrip ,$(BR2_PACKAGE_CANAAN_K230_SDK_CONF))/sysimage-sdcard.img.gz
+CANAAN_K230_SDK_EXTRA_DOWNLOADS += $(k230_download_url)/$(call qstrip ,$(BR2_PACKAGE_CANAAN_K230_SDK_CONF))/rootfs.tar.xz
 
 define CANAAN_K230_SDK_INSTALL_TARGET_CMDS
 	tar -xf $(CANAAN_K230_SDK_DL_DIR)/rootfs.tar.xz -C $(TARGET_DIR)
diff --git a/general/package/canaan_k230_sdk/k230_env.env b/general/package/canaan_k230_sdk/k230_env.env
index fc1992f6..577c4bb3 100644
--- a/general/package/canaan_k230_sdk/k230_env.env
+++ b/general/package/canaan_k230_sdk/k230_env.env
@@ -28,5 +28,4 @@ nuttex=nuttx-7000000-uart2.bin
 blinux=ext4load mmc ${mmc_boot_dev_num}:1 0x3000000 /fw_jump_add_uboot_head.bin && ext4load mmc ${mmc_boot_dev_num}:1 0x200000 /${k} && ext4load mmc ${mmc_boot_dev_num}:1 0x2200000 /k.dtb && bootm 0x3000000 - 0x2200000;
 blinuxilp32= setenv k Image_ilp32 && run blinux;
 bnuttx=ext4load mmc ${mmc_boot_dev_num}:1 0x7000000 /${nuttex} && boot_baremetal 0 0x${fileaddr} 0x${filesize};
-wjx=xxxx
 ethaddr=22:22:22:22:22:22