mirror of
https://github.com/OpenRTX/OpenRTX
synced 2026-08-08 12:29:06 -04:00
build: rename "build_arm" file to "build_cm4"
In file cross_cm7.txt, the target cpu was wrongly identified as being Cortex M4. This does not affect compilation. Also, file cross_arm.txt was renamed cross_cm4.txt and folder build_arm was renamed to build_cm4. References to this were also updated.
This commit is contained in:
Morgan Diepart
Silvano Seva
parent
821b6cb288
commit
f070a477a6
7 changed files with 50 additions and 49 deletions
|
|
@ -15,5 +15,5 @@
|
|||
]
|
||||
}
|
||||
},
|
||||
"postCreateCommand": "meson setup --cross-file cross_arm.txt build_arm && meson setup --cross-file cross_cm7.txt build_cm7 && meson setup build_linux"
|
||||
"postCreateCommand": "meson setup --cross-file cross_cm4.txt build_cm4 && meson setup --cross-file cross_cm7.txt build_cm7 && meson setup build_linux"
|
||||
}
|
||||
|
|
|
|||
38
.github/workflows/main.yml
vendored
38
.github/workflows/main.yml
vendored
|
|
@ -20,37 +20,37 @@ jobs:
|
|||
with:
|
||||
runCmd: |
|
||||
meson setup build_linux &&
|
||||
meson setup --cross-file cross_arm.txt build_arm &&
|
||||
meson setup --cross-file cross_cm4.txt build_cm4 &&
|
||||
meson setup --cross-file cross_cm7.txt build_cm7 &&
|
||||
meson compile -C build_linux openrtx_linux &&
|
||||
meson compile -C build_linux openrtx_linux_smallscreen &&
|
||||
meson compile -C build_linux openrtx_linux_mod17 &&
|
||||
meson compile -C build_arm openrtx_cs7000_bin &&
|
||||
meson compile -C build_arm openrtx_cs7000_dfu &&
|
||||
meson compile -C build_arm openrtx_dm1701_wrap &&
|
||||
meson compile -C build_arm openrtx_dm1801_wrap &&
|
||||
meson compile -C build_arm openrtx_md3x0_wrap &&
|
||||
meson compile -C build_arm openrtx_md9600_wrap &&
|
||||
meson compile -C build_arm openrtx_mduv3x0_wrap &&
|
||||
meson compile -C build_arm openrtx_mod17_bin &&
|
||||
meson compile -C build_arm openrtx_gd77_wrap &&
|
||||
meson compile -C build_cm4 openrtx_cs7000_bin &&
|
||||
meson compile -C build_cm4 openrtx_cs7000_dfu &&
|
||||
meson compile -C build_cm4 openrtx_dm1701_wrap &&
|
||||
meson compile -C build_cm4 openrtx_dm1801_wrap &&
|
||||
meson compile -C build_cm4 openrtx_md3x0_wrap &&
|
||||
meson compile -C build_cm4 openrtx_md9600_wrap &&
|
||||
meson compile -C build_cm4 openrtx_mduv3x0_wrap &&
|
||||
meson compile -C build_cm4 openrtx_mod17_bin &&
|
||||
meson compile -C build_cm4 openrtx_gd77_wrap &&
|
||||
meson compile -C build_cm7 openrtx_cs7000p_wrap &&
|
||||
meson compile -C build_cm7 openrtx_cs7000p_dfu &&
|
||||
chmod -R 777 * &&
|
||||
ls build_cm7/ &&
|
||||
ls build_arm/ &&
|
||||
ls build_cm4/ &&
|
||||
ls build_linux/ &&
|
||||
mv build_cm7/openrtx_cs7000p_wrap openrtx_cs7000p_${{ env.BRANCH_NAME }}.bin &&
|
||||
mv build_cm7/openrtx_cs7000p_dfu openrtx_cs7000p_${{ env.BRANCH_NAME }}.dfu &&
|
||||
mv build_arm/openrtx_cs7000_bin openrtx_cs7000_${{ env.BRANCH_NAME }}.bin &&
|
||||
mv build_arm/openrtx_cs7000_dfu openrtx_cs7000_${{ env.BRANCH_NAME }}.dfu &&
|
||||
mv build_arm/openrtx_dm1701_wrap openrtx_dm1701_${{ env.BRANCH_NAME }}.bin &&
|
||||
mv build_arm/openrtx_dm1801_bin.sgl openrtx_dm1801_${{ env.BRANCH_NAME }}.sgl &&
|
||||
mv build_arm/openrtx_gd77_bin.sgl openrtx_gd77_${{ env.BRANCH_NAME }}.sgl &&
|
||||
mv build_cm4/openrtx_cs7000_bin openrtx_cs7000_${{ env.BRANCH_NAME }}.bin &&
|
||||
mv build_cm4/openrtx_cs7000_dfu openrtx_cs7000_${{ env.BRANCH_NAME }}.dfu &&
|
||||
mv build_cm4/openrtx_dm1701_wrap openrtx_dm1701_${{ env.BRANCH_NAME }}.bin &&
|
||||
mv build_cm4/openrtx_dm1801_bin.sgl openrtx_dm1801_${{ env.BRANCH_NAME }}.sgl &&
|
||||
mv build_cm4/openrtx_gd77_bin.sgl openrtx_gd77_${{ env.BRANCH_NAME }}.sgl &&
|
||||
mv build_linux/openrtx_linux openrtx_linux_${{ env.BRANCH_NAME }} &&
|
||||
mv build_arm/openrtx_md3x0_wrap openrtx_md3x0_${{ env.BRANCH_NAME }}.bin &&
|
||||
mv build_arm/openrtx_mduv3x0_wrap openrtx_mduv3x0_${{ env.BRANCH_NAME }}.bin &&
|
||||
mv build_arm/openrtx_mod17_bin openrtx_mod17_${{ env.BRANCH_NAME }}.bin
|
||||
mv build_cm4/openrtx_md3x0_wrap openrtx_md3x0_${{ env.BRANCH_NAME }}.bin &&
|
||||
mv build_cm4/openrtx_mduv3x0_wrap openrtx_mduv3x0_${{ env.BRANCH_NAME }}.bin &&
|
||||
mv build_cm4/openrtx_mod17_bin openrtx_mod17_${{ env.BRANCH_NAME }}.bin
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: release-bins
|
||||
|
|
|
|||
5
.vscode/settings.json
vendored
5
.vscode/settings.json
vendored
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
"C_Cpp.default.compileCommands": "/workspaces/OpenRTX/build_arm/compile_commands.json",
|
||||
"C_Cpp.default.configurationProvider": "mesonbuild.mesonbuild"
|
||||
"C_Cpp.default.compileCommands": "/workspaces/OpenRTX/build_cm4/compile_commands.json",
|
||||
"C_Cpp.default.configurationProvider": "mesonbuild.mesonbuild",
|
||||
"mesonbuild.buildFolder": "build_cm4",
|
||||
}
|
||||
38
.vscode/tasks.json
vendored
38
.vscode/tasks.json
vendored
|
|
@ -4,80 +4,80 @@
|
|||
"version": "2.0.0",
|
||||
"tasks": [
|
||||
{
|
||||
"label": "setup arm build",
|
||||
"label": "setup cm4 build",
|
||||
"type": "shell",
|
||||
"command": "meson setup --cross-file cross_arm.txt build_arm"
|
||||
"command": "meson setup --cross-file cross_cm4.txt build_cm4"
|
||||
},
|
||||
{
|
||||
"label": "build TYT MD-380, MD-390, Retevis RT3, Retevis RT8",
|
||||
"type": "shell",
|
||||
"command": "meson compile -C build_arm openrtx_md3x0",
|
||||
"command": "meson compile -C build_cm4 openrtx_md3x0",
|
||||
"dependsOrder": "sequence",
|
||||
"dependsOn": [
|
||||
"setup arm build",
|
||||
"setup cm4 build",
|
||||
]
|
||||
},
|
||||
{
|
||||
"label": "build TYT MD-UV380, MD-UV390, Retevis RT3s",
|
||||
"type": "shell",
|
||||
"command": "meson compile -C build_arm openrtx_mduv3x0",
|
||||
"command": "meson compile -C build_cm4 openrtx_mduv3x0",
|
||||
"dependsOrder": "sequence",
|
||||
"dependsOn": [
|
||||
"setup arm build",
|
||||
"setup cm4 build",
|
||||
]
|
||||
},
|
||||
{
|
||||
"label": "build TYT MD-9600",
|
||||
"type": "shell",
|
||||
"command": "meson compile -C build_arm openrtx_md9600",
|
||||
"command": "meson compile -C build_cm4 openrtx_md9600",
|
||||
"dependsOrder": "sequence",
|
||||
"dependsOn": [
|
||||
"setup arm build",
|
||||
"setup cm4 build",
|
||||
]
|
||||
},
|
||||
{
|
||||
"label": "build Radioddity GD-77",
|
||||
"type": "shell",
|
||||
"command": "meson compile -C build_arm openrtx_gd77",
|
||||
"command": "meson compile -C build_cm4 openrtx_gd77",
|
||||
"dependsOrder": "sequence",
|
||||
"dependsOn": [
|
||||
"setup arm build",
|
||||
"setup cm4 build",
|
||||
]
|
||||
},
|
||||
{
|
||||
"label": "build Baofeng DM1701",
|
||||
"type": "shell",
|
||||
"command": "meson compile -C build_arm openrtx_dm1701",
|
||||
"command": "meson compile -C build_cm4 openrtx_dm1701",
|
||||
"dependsOrder": "sequence",
|
||||
"dependsOn": [
|
||||
"setup arm build",
|
||||
"setup cm4 build",
|
||||
]
|
||||
},
|
||||
{
|
||||
"label": "build Baofeng DM1801",
|
||||
"type": "shell",
|
||||
"command": "meson compile -C build_arm openrtx_dm1801",
|
||||
"command": "meson compile -C build_cm4 openrtx_dm1801",
|
||||
"dependsOrder": "sequence",
|
||||
"dependsOn": [
|
||||
"setup arm build",
|
||||
"setup cm4 build",
|
||||
]
|
||||
},
|
||||
{
|
||||
"label": "build Module17",
|
||||
"type": "shell",
|
||||
"command": "meson compile -C build_arm openrtx_mod17",
|
||||
"command": "meson compile -C build_cm4 openrtx_mod17",
|
||||
"dependsOrder": "sequence",
|
||||
"dependsOn": [
|
||||
"setup arm build",
|
||||
"setup cm4 build",
|
||||
]
|
||||
},
|
||||
{
|
||||
"label": "build Connect Systems CS7000-M17",
|
||||
"type": "shell",
|
||||
"command": "meson compile -C build_arm openrtx_cs7000",
|
||||
"command": "meson compile -C build_cm4 openrtx_cs7000",
|
||||
"dependsOrder": "sequence",
|
||||
"dependsOn": [
|
||||
"setup arm build",
|
||||
"setup cm4 build",
|
||||
]
|
||||
},
|
||||
{
|
||||
|
|
@ -141,4 +141,4 @@
|
|||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ c_args = [
|
|||
'-Wall',
|
||||
'-Werror=return-type',
|
||||
'-g',
|
||||
'-mcpu=cortex-m7', # Cortex-M4 CPU
|
||||
'-mcpu=cortex-m7', # Cortex-M7 CPU
|
||||
'-mthumb', # ARM Thumb2 ISA
|
||||
'-mfloat-abi=hard', # Hard floating point support
|
||||
'-mfpu=fpv5-d16',
|
||||
|
|
@ -38,7 +38,7 @@ cpp_args = [
|
|||
'-fno-rtti',
|
||||
'-D__NO_EXCEPTIONS',
|
||||
'-std=c++14',
|
||||
'-mcpu=cortex-m7', # Cortex-M4 CPU
|
||||
'-mcpu=cortex-m7', # Cortex-M7 CPU
|
||||
'-mthumb', # ARM Thumb2 ISA
|
||||
'-mfloat-abi=hard', # Hard floating point support
|
||||
'-mfpu=fpv5-d16',
|
||||
|
|
@ -71,5 +71,5 @@ cpp_link_args = c_link_args
|
|||
[host_machine]
|
||||
system = 'none'
|
||||
cpu_family = 'arm'
|
||||
cpu = 'cortex-m4'
|
||||
cpu = 'cortex-m7'
|
||||
endian = 'little'
|
||||
|
|
|
|||
|
|
@ -65,25 +65,25 @@ TARGETS=(
|
|||
)
|
||||
|
||||
#Preparation
|
||||
rm -rf build_arm
|
||||
rm -rf build_cm4
|
||||
git reset --hard
|
||||
git clean -fd
|
||||
git pull
|
||||
|
||||
#Building
|
||||
|
||||
meson setup --cross-file cross_arm.txt build_arm
|
||||
meson setup --cross-file cross_cm4.txt build_cm4
|
||||
|
||||
for i in "${!TARGETS[@]}"; do
|
||||
meson compile -C build_arm "${TARGETS[$i]}"
|
||||
meson compile -C build_cm4 "${TARGETS[$i]}"
|
||||
if [ "$T" -eq "1" ]; then
|
||||
GIT_HASH=`git rev-parse --short HEAD`
|
||||
DATE=`date '+%Y%m%d'`
|
||||
mv build_arm/${TARGETS[$i]}* "build_arm/${TARGETS[$i]}-$DATE-$GIT_HASH-nightly.bin"
|
||||
mv build_cm4/${TARGETS[$i]}* "build_cm4/${TARGETS[$i]}-$DATE-$GIT_HASH-nightly.bin"
|
||||
fi
|
||||
done
|
||||
|
||||
cd build_arm
|
||||
cd build_cm4
|
||||
#Using command line option to upload to a scp server
|
||||
scp *_wrap* "${@: -1}"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue