Remove OpenPilot bootloader support.
This can be added back at a later date if required if enough code-size savings can be found, for instance, the removal of the CLI.
This commit is contained in:
parent
8402f4512a
commit
0150abf1bc
|
@ -3,7 +3,6 @@ env:
|
|||
- PUBLISHMETA=True
|
||||
- PUBLISHDOCS=True
|
||||
- TARGET=CC3D
|
||||
- TARGET=CC3D OPBL=yes
|
||||
- TARGET=COLIBRI_RACE
|
||||
- TARGET=CHEBUZZF3
|
||||
- TARGET=CJMCU
|
||||
|
|
16
Makefile
16
Makefile
|
@ -20,9 +20,6 @@ TARGET ?= NAZE
|
|||
# Compile-time options
|
||||
OPTIONS ?=
|
||||
|
||||
# compile for OpenPilot BootLoader support
|
||||
OPBL ?=no
|
||||
|
||||
# Debugger optons, must be empty or GDB
|
||||
DEBUG ?=
|
||||
|
||||
|
@ -40,9 +37,6 @@ FORKNAME = cleanflight
|
|||
|
||||
VALID_TARGETS = ALIENWIIF1 ALIENWIIF3 CC3D CHEBUZZF3 CJMCU COLIBRI_RACE EUSTM32F103RC NAZE NAZE32PRO OLIMEXINO PORT103R RMDO SPARKY SPRACINGF3 STM32F3DISCOVERY
|
||||
|
||||
# Valid targets for OP BootLoader support
|
||||
OPBL_VALID_TARGETS = CC3D
|
||||
|
||||
# Configure default flash sizes for the targets
|
||||
ifeq ($(FLASH_SIZE),)
|
||||
ifeq ($(TARGET),$(filter $(TARGET),CJMCU))
|
||||
|
@ -405,16 +399,6 @@ OLIMEXINO_SRC = startup_stm32f10x_md_gcc.S \
|
|||
$(HIGHEND_SRC) \
|
||||
$(COMMON_SRC)
|
||||
|
||||
ifeq ($(OPBL),yes)
|
||||
ifneq ($(filter $(TARGET),$(OPBL_VALID_TARGETS)),)
|
||||
TARGET_FLAGS := -DOPBL $(TARGET_FLAGS)
|
||||
LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f103_$(FLASH_SIZE)k_opbl.ld
|
||||
.DEFAULT_GOAL := binary
|
||||
else
|
||||
$(error OPBL specified with a unsupported target)
|
||||
endif
|
||||
endif
|
||||
|
||||
CJMCU_SRC = \
|
||||
startup_stm32f10x_md_gcc.S \
|
||||
drivers/adc.c \
|
||||
|
|
|
@ -39,8 +39,6 @@ Current meter cannot be used in conjunction with Sonar.
|
|||
| ------------- | ------------- | ------------------- |
|
||||
| PB5 | PB0 | YES (3.3v input) |
|
||||
|
||||
Sonar support is not available when using the OpenPilot bootloader (OPBL).
|
||||
|
||||
#### Constraints
|
||||
|
||||
Sonar cannot be used in conjuction with SoftSerial or Parallel PWM.
|
||||
|
|
|
@ -105,9 +105,3 @@ git pull
|
|||
make clean TARGET=NAZE
|
||||
make TARGET=NAZE
|
||||
```
|
||||
|
||||
Or in the case of CC3D in need of a `obj/cleanflight_CC3D.bin`
|
||||
```
|
||||
make clean TARGET=CC3D
|
||||
make TARGET=CC3D OPBL=yes
|
||||
```
|
|
@ -3,7 +3,6 @@
|
|||
targets=("PUBLISHMETA=True" \
|
||||
"RUNTESTS=True" \
|
||||
"TARGET=CC3D" \
|
||||
"TARGET=CC3D OPBL=yes" \
|
||||
"TARGET=CHEBUZZF3" \
|
||||
"TARGET=CJMCU" \
|
||||
"TARGET=COLIBRI_RACE" \
|
||||
|
@ -26,7 +25,7 @@ export TRAVIS_REPO_SLUG=${TRAVIS_REPO_SLUG:=$USER/simulated}
|
|||
|
||||
for target in "${targets[@]}"
|
||||
do
|
||||
unset RUNTESTS PUBLISHMETA TARGET OPBL
|
||||
unset RUNTESTS PUBLISHMETA TARGET
|
||||
eval "export $target"
|
||||
make clean
|
||||
./.travis.sh
|
||||
|
|
|
@ -115,14 +115,6 @@
|
|||
#define USE_SERVOS
|
||||
#define USE_CLI
|
||||
|
||||
#if defined(OPBL)
|
||||
// disabled some features for OPBL build due to code size.
|
||||
#undef DISPLAY
|
||||
#undef SONAR
|
||||
#define SKIP_CLI_COMMAND_HELP
|
||||
#endif
|
||||
|
||||
|
||||
#define SPEKTRUM_BIND
|
||||
// USART3, PB11 (Flexport)
|
||||
#define BIND_PORT GPIOB
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
/*
|
||||
*****************************************************************************
|
||||
**
|
||||
** File : stm32_flash.ld
|
||||
**
|
||||
** Abstract : Linker script for STM32F103CB Device with
|
||||
** 128KByte FLASH, 20KByte RAM
|
||||
**
|
||||
*****************************************************************************
|
||||
*/
|
||||
|
||||
/* Specify the memory areas. */
|
||||
MEMORY
|
||||
{
|
||||
FLASH (rx) : ORIGIN = 0x08003000, LENGTH = 126K - 0x03000 /* last 2kb used for config storage first 12k for OP Bootloader*/
|
||||
|
||||
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 20K
|
||||
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
|
||||
}
|
||||
|
||||
INCLUDE "stm32_flash.ld"
|
Loading…
Reference in New Issue