diff --git a/rk1808/rk1808_compute_stick_tool/aarch64_release/config.ini b/rk1808/rk1808_compute_stick_tool/aarch64_release/config.ini new file mode 100644 index 0000000..9815329 --- /dev/null +++ b/rk1808/rk1808_compute_stick_tool/aarch64_release/config.ini @@ -0,0 +1,10 @@ +firmware=update.img +loader=loader.bin +parameter=parameter +misc= +boot=boot.img +kernel=kernel.img +system=system.img +recovery=recovery.img +rockusb_id= +msc_id= diff --git a/rk1808/rk1808_compute_stick_tool/aarch64_release/upgrade_tool b/rk1808/rk1808_compute_stick_tool/aarch64_release/upgrade_tool new file mode 100755 index 0000000..e8da5da Binary files /dev/null and b/rk1808/rk1808_compute_stick_tool/aarch64_release/upgrade_tool differ diff --git a/rk1808/rk1808_compute_stick_tool/npu_upgrade b/rk1808/rk1808_compute_stick_tool/npu_upgrade index 601894b..d1ed09d 100755 --- a/rk1808/rk1808_compute_stick_tool/npu_upgrade +++ b/rk1808/rk1808_compute_stick_tool/npu_upgrade @@ -8,12 +8,22 @@ if [ $# -ne 4 ]; then exit -1 fi -cat /proc/cpuinfo |grep Intel +cat /proc/cpuinfo |grep -E "Intel|AMD" if [ $? -ne 0 ]; then echo "use arm version" - UPGRADE_TOOL=$SCRIPT_ROOT/upgrade_tool_arm + LOG_DIR=~/.rockchip/upgrade_tool/aarch64/log + CONFIG_INI=$SCRIPT_ROOT/aarch64_release/config.ini + UPGRADE_TOOL=$SCRIPT_ROOT/aarch64_release/upgrade_tool else - UPGRADE_TOOL=$SCRIPT_ROOT/upgrade_tool_x86 + LOG_DIR=~/.rockchip/upgrade_tool/x64/log + CONFIG_INI=$SCRIPT_ROOT/x64_release/config.ini + UPGRADE_TOOL=$SCRIPT_ROOT/x64_release/upgrade_tool +fi + +mkdir -p $LOG_DIR +grep log_dir $CONFIG_INI > /dev/null +if [ $? -ne 0 ]; then + echo "log_dir=$(realpath $LOG_DIR)" >> $CONFIG_INI fi LOADER=$1 diff --git a/rk1808/rk1808_compute_stick_tool/upgrade_tool_arm b/rk1808/rk1808_compute_stick_tool/upgrade_tool_arm deleted file mode 100755 index a03e759..0000000 Binary files a/rk1808/rk1808_compute_stick_tool/upgrade_tool_arm and /dev/null differ diff --git a/rk1808/rk1808_compute_stick_tool/upgrade_tool_x86 b/rk1808/rk1808_compute_stick_tool/upgrade_tool_x86 deleted file mode 100755 index 34ab9b1..0000000 Binary files a/rk1808/rk1808_compute_stick_tool/upgrade_tool_x86 and /dev/null differ diff --git a/rk1808/rk1808_compute_stick_tool/x64_release/config.ini b/rk1808/rk1808_compute_stick_tool/x64_release/config.ini new file mode 100644 index 0000000..fdd6129 --- /dev/null +++ b/rk1808/rk1808_compute_stick_tool/x64_release/config.ini @@ -0,0 +1,10 @@ +firmware=update.img +loader=loader.bin +parameter=parameter +misc= +boot=boot.img +kernel=kernel.img +system=system.img +recovery=recovery.img +rockusb_id= +msc_id= diff --git a/rk1808/rk1808_compute_stick_tool/x64_release/upgrade_tool b/rk1808/rk1808_compute_stick_tool/x64_release/upgrade_tool new file mode 100755 index 0000000..8bd8e98 Binary files /dev/null and b/rk1808/rk1808_compute_stick_tool/x64_release/upgrade_tool differ