Merge pull request #357 from JacobZang/master

Filter fan_setup.sh redundant printing and adjust rkbin link file

archives/filesystem/special/Edge2/usr/local/bin/fan_setup.sh

@@ -72,6 +72,7 @@ selected_mode=$(zenity --height=275 \
 				${LIST_MENU_VALUE[0]} ${LIST_MENU[0]} \
 				${LIST_MENU_VALUE[1]} ${LIST_MENU[1]})
 fi
+selected_mode=$(echo "$selected_mode" | grep -oE "off|low|mid|high|auto|manual")
 
 index=0
 for i in ${LIST_MENU[@]}
@@ -91,20 +92,20 @@ fi
 # Change FAN mode
 $FAN $selected_mode
 
-zenity  --question \
+echo $(zenity  --question \
 	--text 'Do you want to save this mode as default?' \
 	--title 'Warning' \
 	--window-icon /etc/fenix/icons/warning.png \
 	--width=300 \
 	--height=40 \
 	--ok-label='Yes, save it' \
-	--cancel-label="No, don't save"
+	--cancel-label="No, don't save")
 
-if [ $? -ne 0 ]; then
+if [ $? -eq 1 ]; then
 	exit
 fi
 
-password=$(zenity --password --title 'Password')
+password=$(echo "$(zenity --password --title 'Password')" | sed -E 's/^.*arm_release_ver.*//')
 
 if [ $? -ne 0 ]; then
 	exit

packages/rkbin/package.mk

@@ -14,9 +14,9 @@ PKG_NEED_BUILD="NO"
 make_host() {
 	# Fixup links
 	# For Edge2
-	ln -fs bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.17.bin rk3588_ddr.bin
-	ln -fs bin/rk35/rk3588_bl31_v1.46.elf rk3588_bl31.elf
-	ln -fs bin/rk35/rk3588_bl32_v1.16.bin rk3588_bl32.bin
+	ln -fs bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin rk3588_ddr.bin
+	ln -fs bin/rk35/rk3588_bl31_v1.47.elf rk3588_bl31.elf
+	ln -fs bin/rk35/rk3588_bl32_v1.17.bin rk3588_bl32.bin
 	ln -fs bin/rk35/rk3588_spl_v1.13.bin rk3588_spl.bin
 }