Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added optional tlsf definitions and switch to wio 0.6.0 #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added optional tlsf definitions and switch to wio 0.6.0 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 tests/main.cpp → tests/cosa/main.cpp
View file
Open in desktop
File renamed without changes.
0 native-tests/main.cpp → tests/native/main.cpp
View file
Open in desktop
File renamed without changes.
53 changes: 29 additions & 24 deletions wio.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ type: pkg

project:
name: wlib-malloc
version: 1.0.4
version: 1.0.5
description: Replacements for malloc and free
repository: https://github.com/wloop/wlib-malloc.git
author: Jeff Niu <[email protected]> (https://github.com/mogball)
Expand All @@ -13,21 +13,33 @@ project:
- memory
- embedded
- waterloop
definitions:
singleton: false
required:
private:
- WLIB_TLSF_ARCH
- WLIB_TLSF_LOG2_DIV
- WLIB_TLSF_LOG2_ALIGN
- WLIB_TLSF_LOG2_MAX
compile_options:
wio_version: 0.4.0
default_target: tests
wio_version: 0.6.0
default_target: cosa-tests
definitions:
required:
private:
- WLIB_TLSF_ARCH
- WLIB_TLSF_LOG2_DIV
- WLIB_TLSF_LOG2_ALIGN
- WLIB_TLSF_LOG2_MAX
optional:
- WLIB_TLSF_PRINTF
- WLIB_TLSF_ASSERT

targets:
tests:
src: tests
native-tests:
src: tests/native
platform: native
definitions:
package:
- WLIB_TLSF_ARCH=64
- WLIB_TLSF_LOG2_DIV=4
- WLIB_TLSF_LOG2_ALIGN=3
- WLIB_TLSF_LOG2_MAX=14
- WLIB_TLSF_PRINTF
cosa-tests:
src: tests/cosa
platform: avr
framework: cosa
board: mega2560
Expand All @@ -37,21 +49,14 @@ targets:
- WLIB_TLSF_LOG2_DIV=3
- WLIB_TLSF_LOG2_ALIGN=1
- WLIB_TLSF_LOG2_MAX=11
native-tests:
src: native-tests
platform: native
definitions:
package:
- WLIB_TLSF_ARCH=64
- WLIB_TLSF_LOG2_DIV=4
- WLIB_TLSF_LOG2_ALIGN=3
- WLIB_TLSF_LOG2_MAX=14

- WLIB_TLSF_ASSERT
dependencies:
wlib-tlsf:
version: 1.0.5
version: 1.0.6
definitions:
- $(WLIB_TLSF_ARCH)
- $(WLIB_TLSF_LOG2_DIV)
- $(WLIB_TLSF_LOG2_ALIGN)
- $(WLIB_TLSF_LOG2_MAX)
- $optional(WLIB_TLSF_PRINTF)
- $optional(WLIB_TLSF_ASSERT)