diff --git a/tool/IPL/Flash_Bootloader_S4SK.ttl b/tool/IPL/Flash_Bootloader_S4SK.ttl index 133fcdb..78da509 100755 --- a/tool/IPL/Flash_Bootloader_S4SK.ttl +++ b/tool/IPL/Flash_Bootloader_S4SK.ttl @@ -34,16 +34,13 @@ endif ;--------------------------------------------------- ; Select CR52 OS ;--------------------------------------------------- -strdim LIST1 3 +strdim LIST1 2 LIST1[0] = '1: Trampoline' - LIST1[1] = '2: Trampoline(ether enable)' - LIST1[2] = '3: Zephyr' + LIST1[1] = '2: Zephyr' listbox '' 'Select Cortex-R52 OS' LIST1 if result = 0 then CR52 = 'Trampoline' elseif result = 1 then - CR52 = 'Trampoline(ether enable)' -elseif result = 2 then CR52 = 'Zephyr' else end @@ -52,47 +49,35 @@ endif ;--------------------------------------------------- ; Change load image parameter ;--------------------------------------------------- -strcompare CR52 'Trampoline(ether enable)' +strcompare G4MH 'Trampoline' if result = 0 then - strcompare G4MH 'Trampoline' + strcompare CR52 'Trampoline' if result = 0 then - IMGNM[4] = 'cr52_trampoline_deploy\cr52_eth.srec' - IMGNM[5] = 'g4mh_trampoline_deploy\g4mh.srec' - else - IMGNM[4] = 'cr52_trampoline_deploy\cr52_eth.srec' - IMGNM[5] = 'g4mh_safegauto_deploy\g4mh.srec' - endif -else - strcompare G4MH 'Trampoline' - if result = 0 then - strcompare CR52 'Trampoline' + strdim LIST2 2 + LIST2[0] = '1: CR52' + LIST2[1] = '2: G4MH' + listbox '' 'Select CAN' LIST2 if result = 0 then - strdim LIST2 2 - LIST2[0] = '1: CR52' - LIST2[1] = '2: G4MH' - listbox '' 'Select CAN' LIST2 - if result = 0 then - IMGNM[4] = 'cr52_trampoline_deploy\cr52.srec' - IMGNM[5] = 'g4mh_trampoline_deploy\g4mh_can_disable.srec' - elseif result = 1 then - IMGNM[4] = 'cr52_trampoline_deploy\cr52_can_disable.srec' - IMGNM[5] = 'g4mh_trampoline_deploy\g4mh.srec' - else - end - endif - else - IMGNM[4] = 'cr52_zephyr_deploy\cr52.srec' + IMGNM[4] = 'cr52_trampoline_deploy\cr52.srec' IMGNM[5] = 'g4mh_trampoline_deploy\g4mh_can_disable.srec' - endif - else - strcompare CR52 'Trampoline' - if result = 0 then + elseif result = 1 then IMGNM[4] = 'cr52_trampoline_deploy\cr52_can_disable.srec' - IMGNM[5] = 'g4mh_safegauto_deploy\g4mh.srec' + IMGNM[5] = 'g4mh_trampoline_deploy\g4mh.srec' else - IMGNM[4] = 'cr52_zephyr_deploy\cr52.srec' - IMGNM[5] = 'g4mh_safegauto_deploy\g4mh.srec' + end endif + else + IMGNM[4] = 'cr52_zephyr_deploy\cr52.srec' + IMGNM[5] = 'g4mh_trampoline_deploy\g4mh_can_disable.srec' + endif +else + strcompare CR52 'Trampoline' + if result = 0 then + IMGNM[4] = 'cr52_trampoline_deploy\cr52_can_disable.srec' + IMGNM[5] = 'g4mh_safegauto_deploy\g4mh.srec' + else + IMGNM[4] = 'cr52_zephyr_deploy\cr52.srec' + IMGNM[5] = 'g4mh_safegauto_deploy\g4mh.srec' endif endif diff --git a/tool/IPL/Flash_Bootloader_Spider.ttl b/tool/IPL/Flash_Bootloader_Spider.ttl index 9a8cc5d..09f23e3 100755 --- a/tool/IPL/Flash_Bootloader_Spider.ttl +++ b/tool/IPL/Flash_Bootloader_Spider.ttl @@ -34,16 +34,13 @@ endif ;--------------------------------------------------- ; Select CR52 OS ;--------------------------------------------------- -strdim LIST1 3 +strdim LIST1 2 LIST1[0] = '1: Trampoline' - LIST1[1] = '2: Trampoline(ether enable)' - LIST1[2] = '3: Zephyr' + LIST1[1] = '2: Zephyr' listbox '' 'Select Cortex-R52 OS' LIST1 if result = 0 then CR52 = 'Trampoline' elseif result = 1 then - CR52 = 'Trampoline(ether enable)' -elseif result = 2 then CR52 = 'Zephyr' else end @@ -52,36 +49,24 @@ endif ;--------------------------------------------------- ; Change load image parameter ;--------------------------------------------------- -strcompare CR52 'Trampoline(ether enable)' +strcompare G4MH 'Trampoline' if result = 0 then - strcompare G4MH 'Trampoline' + strcompare CR52 'Trampoline' if result = 0 then - IMGNM[4] = 'cr52_trampoline_deploy\cr52_eth.srec' + IMGNM[4] = 'cr52_trampoline_deploy\cr52.srec' IMGNM[5] = 'g4mh_trampoline_deploy\g4mh.srec' else - IMGNM[4] = 'cr52_trampoline_deploy\cr52_eth.srec' - IMGNM[5] = 'g4mh_safegauto_deploy\g4mh.srec' + IMGNM[4] = 'cr52_zephyr_deploy\cr52.srec' + IMGNM[5] = 'g4mh_trampoline_deploy\g4mh.srec' endif else - strcompare G4MH 'Trampoline' - if result = 0 then - strcompare CR52 'Trampoline' - if result = 0 then - IMGNM[4] = 'cr52_trampoline_deploy\cr52.srec' - IMGNM[5] = 'g4mh_trampoline_deploy\g4mh.srec' - else - IMGNM[4] = 'cr52_zephyr_deploy\cr52.srec' - IMGNM[5] = 'g4mh_trampoline_deploy\g4mh.srec' - endif + strcompare CR52 'Trampoline' + if result = 0 then + IMGNM[4] = 'cr52_trampoline_deploy\cr52.srec' + IMGNM[5] = 'g4mh_safegauto_deploy\g4mh.srec' else - strcompare CR52 'Trampoline' - if result = 0 then - IMGNM[4] = 'cr52_trampoline_deploy\cr52.srec' - IMGNM[5] = 'g4mh_safegauto_deploy\g4mh.srec' - else - IMGNM[4] = 'cr52_zephyr_deploy\cr52.srec' - IMGNM[5] = 'g4mh_safegauto_deploy\g4mh.srec' - endif + IMGNM[4] = 'cr52_zephyr_deploy\cr52.srec' + IMGNM[5] = 'g4mh_safegauto_deploy\g4mh.srec' endif endif diff --git a/tool/IPL/burn_s4.sh b/tool/IPL/burn_s4.sh index 116b3cb..e355c4b 100755 --- a/tool/IPL/burn_s4.sh +++ b/tool/IPL/burn_s4.sh @@ -21,7 +21,6 @@ WRITE_FLAG_G4MH=0 WRITE_FLAG_CR52=0 WRITE_FLAG_ALL=0 SELECT_CAN=0 -SELECT_ETHER=0 WRITE_PATTERN="" # Burn patterns: G4MH, CR52 @@ -48,7 +47,6 @@ Usage() { echo " all: All writes (default)" echo " g4mh: Write only G4MH" echo " cr52: Write only CR52" - echo " ether: Write only CR52 tranpoline with ethernet" echo " -g: G4MH with CAN" echo " -r: CR52 with CAN" @@ -95,8 +93,6 @@ do else SELECT_CAN=0; fi - elif [[ "$param" == "ether" ]]; then - SELECT_ETHER=1; else echo -e "\e[31mERROR: Unsupported option\e[m" Usage; exit @@ -151,11 +147,6 @@ else fi fi -if [ "$SELECT_ETHER" -eq 1 ]; then - cp ${CR52_TP_DIR}/cr52_eth.srec $CR52_NAME - WRITE_PATTERN="rtos" -fi - # Flash IPL python3 ipl_burning.py $1 $USB_PORT $MOT_PATH $IPL_PATH $WRITE_PATTERN