fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed target `mduv380` to `mduv3x0 to be consistent with `md3x0`

This commit is contained in:
Federico Amedeo Izzo 2021-03-21 18:26:53 +01:00
parent 75cd4417c7
commit fc65891a29
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@ -28,7 +28,7 @@ jobs:
cd ${{github.workspace}} cd ${{github.workspace}}
ninja -C build_linux openrtx_linux -j4 ninja -C build_linux openrtx_linux -j4
ninja -C build_arm openrtx_md3x0_wrap -j4 ninja -C build_arm openrtx_md3x0_wrap -j4
ninja -C build_arm openrtx_mduv380_wrap -j4 ninja -C build_arm openrtx_mduv3x0_wrap -j4
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: release-bins name: release-bins

26
meson.build
View File

@ -171,7 +171,7 @@ md3x0_def = def + stm32f405_def + {'PLATFORM_MD3x0': '',
'timegm': 'mktime'} 'timegm': 'mktime'}
## TYT MD-UV380 ## TYT MD-UV380
mduv380_src = src + stm32f405_src + ['platform/drivers/display/HX8353_MDx.cpp', mduv3x0_src = src + stm32f405_src + ['platform/drivers/display/HX8353_MDx.cpp',
'platform/drivers/keyboard/keyboard_MDx.c', 'platform/drivers/keyboard/keyboard_MDx.c',
'platform/drivers/NVM/W25Qx.c', 'platform/drivers/NVM/W25Qx.c',
'platform/drivers/NVM/spiFlash_MDx.c', 'platform/drivers/NVM/spiFlash_MDx.c',
@ -185,8 +185,8 @@ mduv380_src = src + stm32f405_src + ['platform/drivers/display/HX8353_MDx.cpp',
'platform/drivers/baseband/HR_C6000_UV3x0.c', 'platform/drivers/baseband/HR_C6000_UV3x0.c',
'platform/drivers/baseband/interfaces_UV3x0.c'] 'platform/drivers/baseband/interfaces_UV3x0.c']
mduv380_inc = inc + stm32f405_inc + ['platform/targets/MD-UV380'] mduv3x0_inc = inc + stm32f405_inc + ['platform/targets/MD-UV380']
mduv380_def = def + stm32f405_def + {'PLATFORM_MDUV380': ''} mduv3x0_def = def + stm32f405_def + {'PLATFORM_MDUV380': ''}
## TYT MD-9600 ## TYT MD-9600
@ -266,12 +266,12 @@ foreach k, v : md3x0_def
endif endif
endforeach endforeach
mduv380_args = [] mduv3x0_args = []
foreach k, v : mduv380_def foreach k, v : mduv3x0_def
if v == '' if v == ''
mduv380_args += '-D@0@'.format(k) mduv3x0_args += '-D@0@'.format(k)
else else
mduv380_args += '-D@0@=@1@'.format(k, v) mduv3x0_args += '-D@0@=@1@'.format(k, v)
endif endif
endforeach endforeach
@ -315,12 +315,12 @@ md3x0_opts = {'sources' : md3x0_src,
'-Wl,--print-memory-usage'], '-Wl,--print-memory-usage'],
'include_directories': md3x0_inc} 'include_directories': md3x0_inc}
mduv380_opts = {'sources': mduv380_src, mduv3x0_opts = {'sources': mduv3x0_src,
'c_args': mduv380_args, 'c_args': mduv3x0_args,
'cpp_args': mduv380_args, 'cpp_args': mduv3x0_args,
'link_args' : ['-Wl,-T../platform/mcu/STM32F4xx/linker_script.ld', 'link_args' : ['-Wl,-T../platform/mcu/STM32F4xx/linker_script.ld',
'-Wl,--print-memory-usage'], '-Wl,--print-memory-usage'],
'include_directories': mduv380_inc} 'include_directories': mduv3x0_inc}
gd77_opts = {'sources': gd77_src, gd77_opts = {'sources': gd77_src,
'c_args': gd77_args, 'c_args': gd77_args,
@ -358,8 +358,8 @@ targets = [
'wrap': 'MD380', 'wrap': 'MD380',
'load_addr': '0x0800C000'}, 'load_addr': '0x0800C000'},
{'name': 'mduv380', {'name': 'mduv3x0',
'opts': mduv380_opts, 'opts': mduv3x0_opts,
'flashable': true, 'flashable': true,
'wrap': 'UV3X0', 'wrap': 'UV3X0',
'load_addr': '0x0800C000'}, 'load_addr': '0x0800C000'},