xobs/simmel-bootloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

Browse Source
This commit is contained in:
hathach 2018-06-18 14:09:04 +07:00
parent 188af65201
commit 9ddcff92a7
3 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tinyusb

@ -1 +1 @@
Subproject commit 5692b84ddf3326a3cde48b09f7123cd5ec0e93cc Subproject commit 424735d44041fc478b572f973d997829b402153d

2
src/make_common.mk
View File

@ -18,7 +18,7 @@ SDK_PATH = ../../lib/sdk/components
SDK11_PATH = ../../lib/sdk11/components SDK11_PATH = ../../lib/sdk11/components
SRC_PATH = .. SRC_PATH = ..
TUSB_PATH = ../../lib/tinyusb/tinyusb TUSB_PATH = ../../lib/tinyusb/src
SD_NAME = s140 SD_NAME = s140
SD_VERSION = 6.0.0 SD_VERSION = 6.0.0

76
src/segger/nrf52840_bootloader.emProject
View File

@ -25,7 +25,7 @@
gcc_entry_point="Reset_Handler" gcc_entry_point="Reset_Handler"
linker_memory_map_file="$(ProjectDir)/nRF52840_xxAA_MemoryMap.xml" linker_memory_map_file="$(ProjectDir)/nRF52840_xxAA_MemoryMap.xml"
linker_section_placement_file="$(ProjectDir)/flash_placement.xml" linker_section_placement_file="$(ProjectDir)/flash_placement.xml"
macros="DeviceHeaderFile=$(PackagesDir)/nRF/CMSIS/Device/Include/nrf.h;DeviceLibraryIdentifier=M4lf;DeviceSystemFile=$(PackagesDir)/nRF/CMSIS/Device/Source/system_nrf52840.c;DeviceVectorsFile=$(PackagesDir)/nRF/Source/ses_nrf52840_Vectors.s;DeviceFamily=nRF;Target=nRF52840_xxAA;Placement=Flash;SdkDir=../../lib/sdk/components;Sdk11Dir=../../lib/sdk11/components;SdDir=../../lib/softdevice/6.0.0;TusbDir=../../lib/tinyusb/tinyusb" macros="DeviceHeaderFile=$(PackagesDir)/nRF/CMSIS/Device/Include/nrf.h;DeviceLibraryIdentifier=M4lf;DeviceSystemFile=$(PackagesDir)/nRF/CMSIS/Device/Source/system_nrf52840.c;DeviceVectorsFile=$(PackagesDir)/nRF/Source/ses_nrf52840_Vectors.s;DeviceFamily=nRF;Target=nRF52840_xxAA;Placement=Flash;SdkDir=../../lib/sdk/components;Sdk11Dir=../../lib/sdk11/components;SdDir=../../lib/softdevice/6.0.0;TusbDir=../../lib/tinyusb/src"
project_directory="" project_directory=""
project_type="Executable" project_type="Executable"
target_reset_script="Reset();" target_reset_script="Reset();"
@ -163,65 +163,63 @@
</folder> </folder>
<folder Name="tinyusb"> <folder Name="tinyusb">
<folder Name="tinyusb"> <folder Name="tinyusb">
<file file_name="../../lib/tinyusb/tinyusb/tusb.c" /> <file file_name="../../lib/tinyusb/src/tusb.c" />
<file file_name="../../lib/tinyusb/tinyusb/tusb.h" /> <file file_name="../../lib/tinyusb/src/tusb.h" />
<file file_name="../../lib/tinyusb/tinyusb/tusb_hal.h" /> <file file_name="../../lib/tinyusb/src/tusb_hal.h" />
<file file_name="../../lib/tinyusb/tinyusb/tusb_option.h" /> <file file_name="../../lib/tinyusb/src/tusb_option.h" />
<folder Name="class"> <folder Name="class">
<file file_name="../../lib/tinyusb/tinyusb/class/custom_class.h" />
<file file_name="../../lib/tinyusb/tinyusb/class/custom_class_host.c" />
<folder Name="cdc"> <folder Name="cdc">
<file file_name="../../lib/tinyusb/tinyusb/class/cdc/cdc.h" /> <file file_name="../../lib/tinyusb/src/class/cdc/cdc.h" />
<file file_name="../../lib/tinyusb/tinyusb/class/cdc/cdc_device.c" /> <file file_name="../../lib/tinyusb/src/class/cdc/cdc_device.c" />
<file file_name="../../lib/tinyusb/tinyusb/class/cdc/cdc_device.h" /> <file file_name="../../lib/tinyusb/src/class/cdc/cdc_device.h" />
</folder> </folder>
<folder Name="hid"> <folder Name="hid">
<file file_name="../../lib/tinyusb/tinyusb/class/hid/hid.h" /> <file file_name="../../lib/tinyusb/src/class/hid/hid.h" />
<file file_name="../../lib/tinyusb/tinyusb/class/hid/hid_device.c" /> <file file_name="../../lib/tinyusb/src/class/hid/hid_device.c" />
<file file_name="../../lib/tinyusb/tinyusb/class/hid/hid_device.h" /> <file file_name="../../lib/tinyusb/src/class/hid/hid_device.h" />
</folder> </folder>
<folder Name="msc"> <folder Name="msc">
<file file_name="../../lib/tinyusb/tinyusb/class/msc/msc.h" /> <file file_name="../../lib/tinyusb/src/class/msc/msc.h" />
<file file_name="../../lib/tinyusb/tinyusb/class/msc/msc_device.c" /> <file file_name="../../lib/tinyusb/src/class/msc/msc_device.c" />
<file file_name="../../lib/tinyusb/tinyusb/class/msc/msc_device.h" /> <file file_name="../../lib/tinyusb/src/class/msc/msc_device.h" />
</folder> </folder>
<folder Name="custom"> <folder Name="custom">
<file file_name="../../lib/tinyusb/tinyusb/class/custom/custom_device.c" /> <file file_name="../../lib/tinyusb/src/class/custom/custom_device.c" />
<file file_name="../../lib/tinyusb/tinyusb/class/custom/custom_device.h" /> <file file_name="../../lib/tinyusb/src/class/custom/custom_device.h" />
</folder> </folder>
</folder> </folder>
<folder Name="common"> <folder Name="common">
<file file_name="../../lib/tinyusb/tinyusb/common/binary.h" /> <file file_name="../../lib/tinyusb/src/common/binary.h" />
<file file_name="../../lib/tinyusb/tinyusb/common/timeout_timer.h" /> <file file_name="../../lib/tinyusb/src/common/timeout_timer.h" />
<file file_name="../../lib/tinyusb/tinyusb/common/tusb_common.h" /> <file file_name="../../lib/tinyusb/src/common/tusb_common.h" />
<file file_name="../../lib/tinyusb/tinyusb/common/tusb_compiler.h" /> <file file_name="../../lib/tinyusb/src/common/tusb_compiler.h" />
<file file_name="../../lib/tinyusb/tinyusb/common/tusb_error.h" /> <file file_name="../../lib/tinyusb/src/common/tusb_error.h" />
<file file_name="../../lib/tinyusb/tinyusb/common/tusb_fifo.c" /> <file file_name="../../lib/tinyusb/src/common/tusb_fifo.c" />
<file file_name="../../lib/tinyusb/tinyusb/common/tusb_fifo.h" /> <file file_name="../../lib/tinyusb/src/common/tusb_fifo.h" />
<file file_name="../../lib/tinyusb/tinyusb/common/tusb_types.h" /> <file file_name="../../lib/tinyusb/src/common/tusb_types.h" />
<file file_name="../../lib/tinyusb/tinyusb/common/tusb_verify.h" /> <file file_name="../../lib/tinyusb/src/common/tusb_verify.h" />
<folder Name="compiler"> <folder Name="compiler">
<file file_name="../../lib/tinyusb/tinyusb/common/compiler/tusb_compiler_gcc.h" /> <file file_name="../../lib/tinyusb/src/common/compiler/tusb_compiler_gcc.h" />
<file file_name="../../lib/tinyusb/tinyusb/common/compiler/tusb_compiler_iar.h" /> <file file_name="../../lib/tinyusb/src/common/compiler/tusb_compiler_iar.h" />
</folder> </folder>
</folder> </folder>
<folder Name="device"> <folder Name="device">
<file file_name="../../lib/tinyusb/tinyusb/device/dcd.h" /> <file file_name="../../lib/tinyusb/src/device/dcd.h" />
<file file_name="../../lib/tinyusb/tinyusb/device/usbd.c" /> <file file_name="../../lib/tinyusb/src/device/usbd.c" />
<file file_name="../../lib/tinyusb/tinyusb/device/usbd.h" /> <file file_name="../../lib/tinyusb/src/device/usbd.h" />
<file file_name="../../lib/tinyusb/tinyusb/device/usbd_pvt.h" /> <file file_name="../../lib/tinyusb/src/device/usbd_pvt.h" />
</folder> </folder>
<folder Name="osal"> <folder Name="osal">
<file file_name="../../lib/tinyusb/tinyusb/osal/osal.c" /> <file file_name="../../lib/tinyusb/src/osal/osal.c" />
<file file_name="../../lib/tinyusb/tinyusb/osal/osal.h" /> <file file_name="../../lib/tinyusb/src/osal/osal.h" />
<file file_name="../../lib/tinyusb/tinyusb/osal/osal_freeRTOS.h" /> <file file_name="../../lib/tinyusb/src/osal/osal_freeRTOS.h" />
<file file_name="../../lib/tinyusb/tinyusb/osal/osal_none.h" /> <file file_name="../../lib/tinyusb/src/osal/osal_none.h" />
</folder> </folder>
<folder Name="portable"> <folder Name="portable">
<folder Name="nordic"> <folder Name="nordic">
<folder Name="nrf5x"> <folder Name="nrf5x">
<file file_name="../../lib/tinyusb/tinyusb/portable/nordic/nrf5x/dcd_nrf5x.c" /> <file file_name="../../lib/tinyusb/src/portable/nordic/nrf5x/dcd_nrf5x.c" />
<file file_name="../../lib/tinyusb/tinyusb/portable/nordic/nrf5x/hal_nrf5x.c" /> <file file_name="../../lib/tinyusb/src/portable/nordic/nrf5x/hal_nrf5x.c" />
</folder> </folder>
</folder> </folder>
</folder> </folder>