Skip to content

Commit 51a4f45

Browse files
committed
bouffalolab_release_bl_iot_sdk_1.6.40-2000-gb17d51bc3
1 parent 07ac148 commit 51a4f45

File tree

6 files changed

+20
-81
lines changed

6 files changed

+20
-81
lines changed

Diff for: components

Submodule components updated 686 files

Diff for: customer_app

Submodule customer_app updated 228 files

Diff for: docs

Submodule docs updated 162 files

Diff for: make_scripts_riscv/project.mk

+8-8
Original file line numberDiff line numberDiff line change
@@ -270,14 +270,6 @@ EXTRA_CPPFLAGS ?=
270270
CPPFLAGS += -D BL_CHIP_NAME=\"$(BL_CHIP_NAME)\" -MMD -MP $(EXTRA_CPPFLAGS)
271271
CPPFLAGS += -DARCH_RISCV
272272

273-
ifeq ("$(CONFIG_CHIP_NAME)", "BL702L")
274-
ifneq ($(CONFIG_GEN_ROM),1)
275-
ifneq ($(CONFIG_BUILD_ROM_CODE),1)
276-
CPPFLAGS += -DCFG_USE_ROM_CODE
277-
endif
278-
endif
279-
endif
280-
281273
# Warnings-related flags relevant both for C and C++
282274
COMMON_WARNING_FLAGS = -Wall -Werror=all \
283275
-Wno-error=unused-function \
@@ -424,6 +416,14 @@ CXXFLAGS := $(strip \
424416
endif
425417
export CFLAGS CPPFLAGS CXXFLAGS ASMFLAGS
426418

419+
# Include common chip configuration
420+
ifeq ("$(CONFIG_CHIP_NAME)", "BL702")
421+
include $(BL60X_SDK_PATH)/components/platform/soc/bl702/bl702/bl702.mk
422+
endif
423+
ifeq ("$(CONFIG_CHIP_NAME)", "BL702L")
424+
include $(BL60X_SDK_PATH)/components/platform/soc/bl702l/bl702l/bl702l.mk
425+
endif
426+
427427
# Set default values that were not previously defined
428428
CC ?= gcc
429429
LD ?= ld

Diff for: scripts/setup.sh

+3-64
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,5 @@
11
#!/usr/bin/env bash
22

3-
set -x
4-
CURRENT_DIR=$(
5-
cd "$(dirname "$0")"
6-
pwd
7-
)
8-
9-
SDK_ROOT=/opt/bouffalolab_sdk
10-
# Currently, only setup toolchain under $SDK_ROOT
11-
TOOLCHAIN_SETUP_ROOT=$SDK_ROOT/toolchain
12-
13-
TOOLCHAIN_SYMBOLIC_LINK_PATH=""
14-
git -C . rev-parse 2>/dev/null
15-
if [[ "$?" == "0" ]]; then
16-
# Examples in Bouffalo Lab IOT SDK repo expect toolchain under repo,
17-
# let's create a symbolic link to Bouffalo Lab toolchain,
18-
# if this script runs under repo
19-
TOOLCHAIN_SYMBOLIC_LINK_PATH=$CURRENT_DIR/../toolchain
20-
fi
21-
22-
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
23-
toolchains_url=(
24-
"riscv/Thead_riscv/Linux_x86_64" "https://dev.bouffalolab.com/media/upload/download/toolchain_riscv_thead_linux64.zip" "toolchain_riscv_thead_linux_x86_64"
25-
"riscv/Linux" "https://dev.bouffalolab.com/media/upload/download/toolchain_riscv_sifive_linux64.zip" "toolchain_riscv_sifive_linux"
26-
)
27-
elif [[ "$OSTYPE" == "darwin"* ]]; then
28-
toolchains_url=(
29-
"riscv/Darwin" "https://dev.bouffalolab.com/media/upload/download/toolchain_riscv_sifive_macos.zip" "toolchain_riscv_sifive_macos"
30-
)
31-
else
32-
echo "Not support for ""$OSTYPE"
33-
fi
34-
35-
if [ ! -d "$TOOLCHAIN_SETUP_ROOT" ]; then
36-
mkdir -p "$TOOLCHAIN_SETUP_ROOT"
37-
fi
38-
rm -rf "$TOOLCHAIN_SETUP_ROOT"/*.zip
39-
40-
for ((i = 0; i < ${#toolchains_url[@]}; i += 3)); do
41-
path=${toolchains_url[i]}
42-
url=${toolchains_url[i + 1]}
43-
output=${toolchains_url[i + 2]}
44-
45-
wget -P "$TOOLCHAIN_SETUP_ROOT"/ "$url"
46-
toolchain_zip=$(basename "$url")
47-
if [ ! -f "$TOOLCHAIN_SETUP_ROOT/$toolchain_zip" ]; then
48-
exit 1
49-
fi
50-
rm -rf "$TOOLCHAIN_SETUP_ROOT/$path"
51-
mkdir -p "$TOOLCHAIN_SETUP_ROOT/$path"
52-
unzip "$TOOLCHAIN_SETUP_ROOT/$toolchain_zip" -d "$TOOLCHAIN_SETUP_ROOT/$path"
53-
mv "$TOOLCHAIN_SETUP_ROOT/$path/$output"/* "$TOOLCHAIN_SETUP_ROOT/$path"
54-
rm -rf "$TOOLCHAIN_SETUP_ROOT/$toolchain_zip"
55-
56-
if [ -f "$TOOLCHAIN_SETUP_ROOT/$path"/chmod755.sh ]; then
57-
cd "$TOOLCHAIN_SETUP_ROOT/$path"/
58-
bash chmod755.sh
59-
cd "$CURRENT_DIR"
60-
fi
61-
done
62-
63-
if [[ "$TOOLCHAIN_SYMBOLIC_LINK_PATH" != "" ]]; then
64-
rm -rf "$TOOLCHAIN_SYMBOLIC_LINK_PATH"
65-
ln -s "$TOOLCHAIN_SETUP_ROOT" "$TOOLCHAIN_SYMBOLIC_LINK_PATH"
66-
fi
3+
echo "This script was used to install and update toolchain before."
4+
echo "Now, it is going to stop maintanance."
5+
echo "Please try third_party/bouffalolab/env-setup.sh to install/update toolchain under your matter repo."

Diff for: version.mk

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
EXTRA_CPPFLAGS ?=
22
ifeq ("$(CONFIG_CHIP_NAME)", "BL602")
3-
EXTRA_CPPFLAGS += -D BL_SDK_VER=\"release_bl_iot_sdk_1.6.40-1605-g2706c9d81\"
3+
EXTRA_CPPFLAGS += -D BL_SDK_VER=\"release_bl_iot_sdk_1.6.40-2000-gb17d51bc3\"
44
EXTRA_CPPFLAGS += -D BL_SDK_PHY_VER=\"a0_final-106-g24fc0eb\"
55
EXTRA_CPPFLAGS += -D BL_SDK_RF_VER=\"f6ed2e9\"
66
EXTRA_CPPFLAGS += -D BL_SDK_STDDRV_VER=\"6de1feb\"
77
endif
88
ifeq ("$(CONFIG_CHIP_NAME)", "BL702")
9-
EXTRA_CPPFLAGS += -D BL_SDK_VER=\"release_bl_iot_sdk_1.6.40-1605-g2706c9d81\"
10-
EXTRA_CPPFLAGS += -D BL_SDK_STDDRV_VER=\"f52e35a\"
9+
EXTRA_CPPFLAGS += -D BL_SDK_VER=\"release_bl_iot_sdk_1.6.40-2000-gb17d51bc3\"
10+
EXTRA_CPPFLAGS += -D BL_SDK_STDDRV_VER=\"55fe28a\"
1111
EXTRA_CPPFLAGS += -D BL_SDK_STDCOM_VER=\"9fe1995\"
1212
EXTRA_CPPFLAGS += -D BL_SDK_RF_VER=\"e203dee\"
1313
endif
1414
ifeq ("$(CONFIG_CHIP_NAME)", "BL702L")
15-
EXTRA_CPPFLAGS += -D BL_SDK_VER=\"release_bl_iot_sdk_1.6.40-1605-g2706c9d81\"
16-
EXTRA_CPPFLAGS += -D BL_SDK_STDDRV_VER=\"3441183\"
15+
EXTRA_CPPFLAGS += -D BL_SDK_VER=\"release_bl_iot_sdk_1.6.40-2000-gb17d51bc3\"
16+
EXTRA_CPPFLAGS += -D BL_SDK_STDDRV_VER=\"54b9bcc\"
1717
EXTRA_CPPFLAGS += -D BL_SDK_STDCOM_VER=\"88edf7b\"
18-
EXTRA_CPPFLAGS += -D BL_SDK_RF_VER=\"3ab03d7\"
18+
EXTRA_CPPFLAGS += -D BL_SDK_RF_VER=\"v1.0.0-4-ga218216\"
1919
endif

0 commit comments

Comments
 (0)