Replaced bin2sgl linux binary with a version statically linked with the libc, added missing wrap and flash commands for DM-1801
This commit is contained in:
parent
1f56018e52
commit
8accc3b8b6
30
meson.build
30
meson.build
|
|
@ -572,9 +572,8 @@ 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',
|
||||||
|
|
@ -587,13 +586,36 @@ endif
|
||||||
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
|
||||||
|
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Reference in New Issue