diff options
| author | Ha Thach <[email protected]> | 2022-01-17 12:36:39 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-01-17 12:36:39 +0700 |
| commit | efc29baead577185c577bf8e313f4c411f4eae9e (patch) | |
| tree | 1a081093d4196ae478d2bf8e3e8136d81c2dc77e /examples/device/dfu | |
| parent | 8d373b08879ac382c59dcbfb2d351d4af35e3d00 (diff) | |
| parent | 976405dea3bc421cd3631b3af93380bdb122af66 (diff) | |
Merge branch 'master' into port-ft90x
Diffstat (limited to 'examples/device/dfu')
| -rw-r--r-- | examples/device/dfu/.skip.MCU_TM4C123 | 4 | ||||
| -rw-r--r-- | examples/device/dfu/skip.txt | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/examples/device/dfu/.skip.MCU_TM4C123 b/examples/device/dfu/.skip.MCU_TM4C123 deleted file mode 100644 index 6260e6e25..000000000 --- a/examples/device/dfu/.skip.MCU_TM4C123 +++ /dev/null @@ -1,4 +0,0 @@ -LINK _build/ek-tm4c123gxl/dfu.elf -/home/runner/cache/toolchain/xpack-arm-none-eabi-gcc-10.2.1-1.1/bin/../lib/gcc/arm-none-eabi/10.2.1/../../../../arm-none-eabi/bin/ld: section .ARM.exidx.text._close LMA [0000000000002980,0000000000002987] overlaps section .data LMA [0000000000002980,0000000000002a03] -collect2: error: ld returned 1 exit status -make: *** [../../rules.mk:94: _build/ek-tm4c123gxl/dfu.elf] Error 1
\ No newline at end of file diff --git a/examples/device/dfu/skip.txt b/examples/device/dfu/skip.txt new file mode 100644 index 000000000..9ac346bad --- /dev/null +++ b/examples/device/dfu/skip.txt @@ -0,0 +1,2 @@ +mcu:TM4C123 +mcu:BCM2835 |