diff options
| author | hathach <thach@tinyusb.org> | 2018-07-03 17:46:08 +0700 |
|---|---|---|
| committer | hathach <thach@tinyusb.org> | 2018-07-03 17:46:08 +0700 |
| commit | 46c453cf0a4d6f8cc1999acc0e98fc95d8b6c078 (patch) | |
| tree | 0ad18a6418bdaf1619a5f4dc710525f0522815f1 | |
| parent | b14b28067e287bde3021e85e42f97bee2468c087 (diff) | |
add tinyusb as submodule
| -rw-r--r-- | .gitmodules | 4 | ||||
| m--------- | lib/tinyusb | 0 | ||||
| -rw-r--r-- | ports/nrf/boards/bluefruit_nrf52840_s140_6.0.0.ld | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index d687c6cf3..32f30f761 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,3 +73,7 @@ [submodule "ports/nrf/nrfx"] path = ports/nrf/nrfx url = https://github.com/NordicSemiconductor/nrfx.git +[submodule "lib/tinyusb"] + path = lib/tinyusb + url = git@github.com:hathach/tinyusb.git + branch = develop diff --git a/lib/tinyusb b/lib/tinyusb new file mode 160000 +Subproject 1faf0a81e4ef7176f152165fe46ff65b598d09c diff --git a/ports/nrf/boards/bluefruit_nrf52840_s140_6.0.0.ld b/ports/nrf/boards/bluefruit_nrf52840_s140_6.0.0.ld index 186509285..fbc87801f 100644 --- a/ports/nrf/boards/bluefruit_nrf52840_s140_6.0.0.ld +++ b/ports/nrf/boards/bluefruit_nrf52840_s140_6.0.0.ld @@ -7,7 +7,7 @@ ---------- ---------- ------- ----------------------------------------- 0x000FF000..0x000FFFFF ( 4KB) Bootloader Settings 0x000FE000..0x000FEFFF ( 4KB) Master Boot Record Params - 0x000F4000..0x000FDFFF ( 40KB) Serial + OTA Bootloader + 0x000F4000..0x000FDFFF ( 40KB) Bootloader (UF2 + CDC + OTA) 0x000ED000..0x000F3FFF (28KB ) Private Config Data (Bonding, Keys, etc.) 0x000AD000..0x000ECFFF (256KB) User Filesystem |