mirror
/
OpenRTX
kopia lustrzana https://github.com/OpenRTX/OpenRTX
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Replaced bin2sgl linux binary with a version statically linked with the libc, added missing wrap and flash commands for DM-1801

pull/85/head
Silvano Seva 2022-06-17 12:44:38 +02:00
rodzic 1f56018e52
commit 8accc3b8b6
3 zmienionych plików z 55 dodań i 33 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

88
meson.build
Wyświetl plik

@ -556,60 +556,82 @@ dfu_util = find_program('dfu-util', required:false, d
foreach t : targets foreach t : targets
name = 'openrtx_'+t['name'] name = 'openrtx_'+t['name']
exe = executable(name, kwargs:t['opts']) exe = executable(name, kwargs:t['opts'])
if t['flashable'] if t['flashable']
bin = custom_target(name+'_bin', bin = custom_target(name+'_bin',
output : name+'_bin', output : name+'_bin',
input : exe, input : exe,
command : [objcopy, '-O', 'binary', '@INPUT@', '@OUTPUT@']) command : [objcopy, '-O', 'binary', '@INPUT@', '@OUTPUT@'])
# Handle GD77 custom wrapping and flashing tools # Handle GD77 custom wrapping and flashing tools
if name == 'openrtx_gd77' if name == 'openrtx_gd77'
if build_machine.system() == 'linux' if build_machine.system() == 'linux'
wrap = custom_target(name+'_wrap', wrap = custom_target(name+'_wrap',
output : name+'_wrap.sgl', output : name+'_wrap.sgl',
input : bin, input : bin,
command : [bin2sgl, command : [bin2sgl, '-f', '@INPUT@', '&&',
'-f', '@INPUT@', 'mv', '@INPUT@.sgl', '@OUTPUT@'])
'&&', 'mv', '@INPUT@.sgl', '@OUTPUT@']) elif build_machine.system() == 'windows'
elif build_machine.system() == 'windows' wrap = custom_target(name+'_wrap',
wrap = custom_target(name+'_wrap', output : name+'_bin.sgl',
output : name+'_bin.sgl', input : bin,
input : bin, command : [bin2sgl, '@INPUT@'])
command : [bin2sgl, '@INPUT@']) endif
endif
custom_target(name+'_flash', custom_target(name+'_flash',
input : wrap, input : wrap,
output : name+'_flash', output : name+'_flash',
command : [gd77_loader, '-f', '@INPUT@']) command : [gd77_loader, '-f', '@INPUT@'])
# Handle DM1801 custom wrapping and flashing tools
elif name == 'openrtx_dm1801'
if build_machine.system() == 'linux'
wrap = custom_target(name+'_wrap',
output : name+'_wrap.sgl',
input : bin,
command : [bin2sgl, '-f', '@INPUT@',
'-m', 'DM-1801', '&&', 'mv',
'@INPUT@.sgl', '@OUTPUT@'])
elif build_machine.system() == 'windows'
wrap = custom_target(name+'_wrap',
output : name+'_bin.sgl',
input : bin,
command : [bin2sgl, '@INPUT@', '-m DM-1801'])
endif
custom_target(name+'_flash',
input : wrap,
output : name+'_flash',
command : [gd77_loader, '-f', '@INPUT@', '-m', 'DM-1801',])
# Module17 also uses dfu-tool for flashing # Module17 also uses dfu-tool for flashing
elif name == 'openrtx_mod17' elif name == 'openrtx_mod17'
custom_target(name+'_flash', custom_target(name+'_flash',
input : bin, input : bin,
output : name+'_flash', output : name+'_flash',
command : [dfu_util, '-d', '0483:df11', '-a', '0', '-D', '@INPUT@', '-s', '0x08000000']) command : [dfu_util, '-d', '0483:df11', '-a', '0',
'-D', '@INPUT@', '-s', '0x08000000'])
else else
wrap = custom_target(name+'_wrap', wrap = custom_target(name+'_wrap',
output : name+'_wrap', output : name+'_wrap',
input : bin, input : bin,
command : [radio_tool, command : [radio_tool,
'--wrap', '--wrap',
'-o', '@OUTPUT@', '-o', '@OUTPUT@',
'-r', t['wrap'], '-r', t['wrap'],
'-s', t['load_addr']+':@INPUT@']) '-s', t['load_addr']+':@INPUT@'])
custom_target(name+'_flash', custom_target(name+'_flash',
input : wrap, input : wrap,
output : name+'_flash', output : name+'_flash',
command : [radio_tool, '-d', '0', '-f', '-i', '@INPUT@']) command : [radio_tool, '-d', '0', '-f', '-i', '@INPUT@'])
endif endif

BIN
scripts/bin2sgl.Linux.bin
Wyświetl plik

Plik binarny nie jest wyświetlany.

0
scripts/gd-77_firmware_loader.py 100644 → 100755
Wyświetl plik