Skip to content

Commit

Permalink
Merge pull request #229 from StratifyLabs/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
tyler-gilbert authored Aug 7, 2020
2 parents 4f5a25a + 2de3a6a commit 2dae875
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 39 deletions.
24 changes: 21 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ on:
branches: [ development ]

jobs:
build:

buildLinuxArm32:
runs-on: [self-hosted, linux, ARM]

steps:
- uses: actions/checkout@v2
with:
Expand All @@ -29,4 +27,24 @@ jobs:
- name: make
run: make -j3
working-directory: cmake_arm
buildMacOS:
runs-on: [self-hosted, macOS, X64]
steps:
- uses: actions/checkout@v2
with:
ref: 'development'
- name: prepare
run: mkdir cmake_link && mkdir cmake_arm
- name: configure-link
run: cmake -DSOS_SDK_PATH=/Applications/StratifyLabs-SDK ..
working-directory: cmake_link
- name: make-link
run: make -j3
working-directory: cmake_link
- name: configure
run: cmake -DSOS_SDK_PATH=/Applications/StratifyLabs-SDK ..
working-directory: cmake_arm
- name: make
run: make -j3
working-directory: cmake_arm

8 changes: 1 addition & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
*.a
*.d
*.o


*.user
<<<<<<< HEAD
/build_release_link/
=======
cmake_*

*.gch
>>>>>>> eefabcccff6c59ba4387d6756ffa955d1f9328ab
*.8-pre1
.vscode/
29 changes: 3 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,15 @@

![Build](https://github.com/StratifyLabs/StratifyOS/workflows/Build/badge.svg)

[Getting Started Guide](guides/Getting-Started.md)

Stratify OS is a fully featured microcontroller operating system designed specifically for the ARM Cortex M architecture. It features:

- [Decoupled System and Application Binaries](guides/Stratify-OS.md)
- [Deep integration with Cortex M hardware](guides/ARM-Cortex-M.md) such as the MPU, SysTick/PendSV, SVCall, Dual Stacks, NVIC, BPU, and Cache
- [POSIX Style Filesystems](guides/Filesystems.md)
- [Complete Hardware Abstraction](guides/Device-Drivers.md)

## Getting Started

Getting started on Stratify OS is easy with the Stratify Labs cloud/command line tool called `sl`.

**Install on Mac OS X**

```
mkdir -p /Applications/StratifyLabs-SDK/Tools/gcc/bin
curl -L -o /Applications/StratifyLabs-SDK/Tools/gcc/bin/sl 'https://stratifylabs.page.link/slmac'
chmod 755 /Applications/StratifyLabs-SDK/Tools/gcc/bin/sl
echo 'export PATH=/Applications/StratifyLabs-SDK/Tools/gcc/bin:$PATH' >> ~/.bash_profile
source ~/.bash_profile
```

**Install on Windows (Git Bash)**

```
mkdir -p /C/StratifyLabs-SDK/Tools/gcc/bin
curl -L -o /C/StratifyLabs-SDK/Tools/gcc/bin/sl.exe 'https://stratifylabs.page.link/slwin'
chmod 755 /C/StratifyLabs-SDK/Tools/gcc/bin/sl.exe
echo 'export PATH=/C/StratifyLabs-SDK/Tools/gcc/bin:$PATH' >> ~/.bash_profile
source ~/.bash_profile
```

Once you install `sl`, visit the [Stratify Labs web application](https://app.stratifylabs.co) to login and start the tutorials.
- [Threads](guides/Threads.md)

## License

Expand Down
2 changes: 1 addition & 1 deletion cmake/sos-toolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if( ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows" )
endif()


if(TOOLCHAIN_HOST) # <--- Use 'BOOST_DIR', not 'DEFINED ${BOOST_DIR}'
if(TOOLCHAIN_HOST)
MESSAGE(STATUS "User provided toolchain directory " ${TOOLCHAIN_HOST})
else()
set(TOOLCHAIN_HOST "arm-none-eabi" CACHE INTERNAL "TOOLCHAIN HOST ARM-NONE-EABI")
Expand Down
4 changes: 2 additions & 2 deletions guides/Getting-Started.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ chmod 777 -R $INSTALL_DIRECTORY # if needed to make public
mkdir -p $INSTALL_DIRECTORY/Tools/gcc/bin
curl -L -o $INSTALL_DIRECTORY/Tools/gcc/bin/sl $SL_LINK
chmod 755 $INSTALL_DIRECTORY/Tools/gcc/bin/sl
echo 'export PATH=$INSTALL_DIRECTORY/Tools/gcc/bin:$PATH' >> $PROFILE
echo 'export SOS_SDK_PATH=$INSTALL_DIRECTORY' >> $PROFILE
echo 'export PATH='$INSTALL_DIRECTORY'/Tools/gcc/bin:$PATH' >> $PROFILE
echo 'export SOS_SDK_PATH='$INSTALL_DIRECTORY >> $PROFILE
source $PROFILE
```

Expand Down
1 change: 1 addition & 0 deletions include/mcu/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ typedef struct {
* \endcode
*/
#define MCU_SYS_MEM __attribute__((section(".sysmem"))) MCU_ALIGN(4)
#define MCU_BACKUP_MEM __attribute__((section(".backup"))) MCU_ALIGN(4)

#ifdef __link
#define MCU_ROOT_CODE
Expand Down

0 comments on commit 2dae875

Please sign in to comment.