Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
q3k
firmware
Commits
f9d79b1c
Commit
f9d79b1c
authored
5 years ago
by
rahix
Browse files
Options
Downloads
Plain Diff
Merge branch 'rahix/fix-meson' into 'master'
Fix build system again ... See merge request
card10/firmware!8
parents
50a00d95
8e903d88
No related branches found
Branches containing commit
No related tags found
Loading
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
card10-cross.ini
+2
-3
2 additions, 3 deletions
card10-cross.ini
pycardium/mphalport.c
+0
-19
0 additions, 19 deletions
pycardium/mphalport.c
with
2 additions
and
22 deletions
card10-cross.ini
+
2
−
3
View file @
f9d79b1c
...
...
@@ -4,9 +4,8 @@ ar = 'arm-none-eabi-ar'
strip
=
'arm-none-eabi-strip'
[properties]
# TODO: Switch to hard float
c_args
=
['-mthumb', '-mcpu=cortex-m4', '-mfloat-abi=hard', '-mfpu=fpv4-sp-d16', '-Wa,-mimplicit-it=thumb', '-ffunction-sections', '-fdata-sections', '-fsingle-precision-constant', '-fno-isolate-erroneous-paths-dereference']
c_link_args
=
['-mthumb', '-mcpu=cortex-m4', '-mfloat-abi=hard', '-mfpu=fpv4-sp-d16']
c_args
=
['-mthumb', '-mcpu=cortex-m4', '-mfloat-abi=hard', '-mfpu=fpv4-sp-d16', '-Wa,-mimplicit-it=thumb', '-ffunction-sections', '-fdata-sections', '-fsingle-precision-constant', '-fno-isolate-erroneous-paths-dereference', '-Wl,--start-group', '-lc', '-lnosys', '-Wl,--end-group']
c_link_args
=
['-mthumb', '-mcpu=cortex-m4', '-mfloat-abi=hard', '-mfpu=fpv4-sp-d16', '-Wl,--start-group', '-lc', '-lnosys', '-Wl,--end-group']
target_defs
=
['-DTARGET=32665', '-DTARGET_REV=0x4131', '-DBOARD_CARD10=1']
...
...
This diff is collapsed.
Click to expand it.
pycardium/mphalport.c
+
0
−
19
View file @
f9d79b1c
...
...
@@ -65,22 +65,3 @@ mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs)
return
mp_const_none
;
}
MP_DEFINE_CONST_FUN_OBJ_KW
(
mp_builtin_open_obj
,
1
,
mp_builtin_open
);
/******************************************************************************
* TODO: Remove
*/
int
_getpid
(
void
)
{
return
-
1
;
}
int
_kill
(
int
pid
,
int
f
)
{
return
-
1
;
}
void
_exit
(
int
r
)
{
;
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment