From 0150abf1bc64848ab5ac4443a32ca2a3ea214b73 Mon Sep 17 00:00:00 2001
From: Dominic Clifton <me@dominicclifton.name>
Date: Mon, 12 Oct 2015 20:44:33 +0100
Subject: [PATCH] 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.
---
 .travis.yml                                   |  1 -
 Makefile                                      | 16 --------------
 docs/Sonar.md                                 |  2 --
 docs/development/Building in Mac OS X.md      |  6 ------
 fake_travis_build.sh                          |  3 +--
 src/main/target/CC3D/target.h                 |  8 -------
 src/main/target/stm32_flash_f103_128k_opbl.ld | 21 -------------------
 7 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 src/main/target/stm32_flash_f103_128k_opbl.ld

diff --git a/.travis.yml b/.travis.yml
index 754a436b8..0380f72fe 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ env:
   - PUBLISHMETA=True
   - PUBLISHDOCS=True
   - TARGET=CC3D
-  - TARGET=CC3D OPBL=yes
   - TARGET=COLIBRI_RACE
   - TARGET=CHEBUZZF3
   - TARGET=CJMCU
diff --git a/Makefile b/Makefile
index 1397ce956..e9634ec94 100755
--- a/Makefile
+++ b/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 \
diff --git a/docs/Sonar.md b/docs/Sonar.md
index 02dbb8a5f..f42fdc935 100644
--- a/docs/Sonar.md
+++ b/docs/Sonar.md
@@ -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.
diff --git a/docs/development/Building in Mac OS X.md b/docs/development/Building in Mac OS X.md
index 5aadf0c6f..ddad2e706 100755
--- a/docs/development/Building in Mac OS X.md	
+++ b/docs/development/Building in Mac OS X.md	
@@ -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
-```
\ No newline at end of file
diff --git a/fake_travis_build.sh b/fake_travis_build.sh
index f6c510c21..e3a696618 100755
--- a/fake_travis_build.sh
+++ b/fake_travis_build.sh
@@ -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
diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h
index 5744a5c1d..16f7080a1 100644
--- a/src/main/target/CC3D/target.h
+++ b/src/main/target/CC3D/target.h
@@ -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
diff --git a/src/main/target/stm32_flash_f103_128k_opbl.ld b/src/main/target/stm32_flash_f103_128k_opbl.ld
deleted file mode 100644
index a8fad3a5f..000000000
--- a/src/main/target/stm32_flash_f103_128k_opbl.ld
+++ /dev/null
@@ -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"