Skip to content

Commit

Permalink
Merge pull request #5 from RusPiRo/no_custom_target
Browse files Browse the repository at this point in the history
travis setup + interupt crate usage
  • Loading branch information
2ndTaleStudio authored Aug 7, 2019
2 parents 4f416d6 + 53d01f8 commit 1328368
Show file tree
Hide file tree
Showing 9 changed files with 246 additions and 141 deletions.
10 changes: 0 additions & 10 deletions .cargo/config

This file was deleted.

30 changes: 30 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# build only master branch on commit's
# all other branches build on PullRequest creation
branches:
only:
- master

language: rust

matrix:
fast_finish: true

include:
- rust: nightly

script: ./travis-build.sh

before_install:
# clone ruspiro-boot before build as it contains the linker script needed..
# the folder it will be cloned into is ./ruspiro-boot
- git clone https://github.com/RusPiRo/ruspiro-boot.git

install:
# install cross compiler toolchain
- sudo apt-get install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
# install cargo xbuild to proper cross compile
- cargo install cargo-xbuild
# add the build target used for Raspbarry Pi targeting builds
- rustup target add armv7-unknown-linux-gnueabihf
- rustup component add rust-src
- sudo chmod ugo+x ./travis-build.sh
119 changes: 81 additions & 38 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 16 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "ruspiro-kernel"
authors = ["André Borrmann <[email protected]>"]
version = "0.1.0" # remember to update html_root_url
description = "This crate showcases the usage of the different RusPiRo crates to build a baremetal kernel for Raspberry Pi 3"
version = "0.2.0" # remember to update html_root_url
description = "This crate showcases the usage of the different RusPiRo crates to build a bare metal kernel for Raspberry Pi 3"
license = "Apache-2.0"
repository = "https://github.com/RusPiRo/ruspiro-kernel/tree/v0.1.0"
documentation = "https://docs.rs/ruspiro-kernel/0.1.0"
repository = "https://github.com/RusPiRo/ruspiro-kernel/tree/v0.2.0"
documentation = "https://docs.rs/ruspiro-kernel/0.2.0"
readme = "README.md"
keywords = ["RusPiRo", "raspberrypi", "baremetal", "kernel", "32bit"]
categories = ["no-std", "embedded"]
Expand All @@ -20,8 +20,15 @@ name = "kernel7"
path = "src/kernel.rs"

[dependencies]
ruspiro-boot = { version = "0.0.3", features = ["with_panic", "with_exception"] }
ruspiro-gpio = "0.0.2"
ruspiro-mailbox = "0.0.2"
ruspiro-uart = "0.0.3"
ruspiro-console = { version = "0.0.2", features = ["with_allocator"] }
ruspiro-boot = { version = "0.1.0", features = ["with_panic", "with_exception"] }
ruspiro-gpio = "0.1.0"
ruspiro-register = "0.1.1"
ruspiro-uart = { version = "0.1.0" }
ruspiro-console = { version = "0.1.1", features = ["with_allocator"] }
ruspiro-mailbox = "0.1.0"
ruspiro-timer = "0.1.0"
ruspiro-interrupt = "0.1.0"

[features]
default = ["ruspiro_pi3"]
ruspiro_pi3 = ["ruspiro-gpio/ruspiro_pi3", "ruspiro-mailbox/ruspiro_pi3", "ruspiro-timer/ruspiro_pi3", "ruspiro-uart/ruspiro_pi3", "ruspiro-interrupt/ruspiro_pi3"]
Loading

0 comments on commit 1328368

Please sign in to comment.