fixed the build script after merging Daniel's stuff and updated upstream
diff --git a/bbb_cape/src/flasher/0001-fixed-the-page-by-page-erase-logic.patch b/bbb_cape/src/flasher/0001-fixed-the-page-by-page-erase-logic.patch
deleted file mode 100644
index c119655..0000000
--- a/bbb_cape/src/flasher/0001-fixed-the-page-by-page-erase-logic.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3076652b98d4d33ac50eb546839a47980464c34d Mon Sep 17 00:00:00 2001
-From: Brian <brian@localhost>
-Date: Wed, 1 Jan 2014 16:21:50 -0800
-Subject: [PATCH] fixed the page-by-page erase logic
-
-Previously, it always started at page 0 and erased 1 more page than it
-was told to with bootloaders that support the extended erase command.
----
- stm32.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/stm32.c b/stm32.c
-index f724722..dee7959 100644
---- a/stm32.c
-+++ b/stm32.c
-@@ -430,14 +430,14 @@ char stm32_erase_memory(const stm32_t *stm, uint8_t spage, uint8_t pages) {
- uint8_t pg_byte;
- uint8_t cs = 0;
-
-- pg_byte = pages >> 8;
-- stm32_send_byte(stm, pg_byte); // Number of pages to be erased, two bytes, MSB first
-+ pg_byte = (pages - 1) >> 8;
-+ stm32_send_byte(stm, pg_byte); // Number of pages to be erased - 1, two bytes, MSB first
- cs ^= pg_byte;
-- pg_byte = pages & 0xFF;
-+ pg_byte = (pages - 1) & 0xFF;
- stm32_send_byte(stm, pg_byte);
- cs ^= pg_byte;
-
-- for (pg_num = 0; pg_num <= pages; pg_num++) {
-+ for (pg_num = spage; pg_num < spage + pages; pg_num++) {
- pg_byte = pg_num >> 8;
- cs ^= pg_byte;
- stm32_send_byte(stm, pg_byte);
---
-1.7.10.4
-
diff --git a/bbb_cape/src/flasher/build.sh b/bbb_cape/src/flasher/build.sh
index 3c26bc3..ed4937f 100755
--- a/bbb_cape/src/flasher/build.sh
+++ b/bbb_cape/src/flasher/build.sh
@@ -5,9 +5,6 @@
cd $(dirname $0)
[[ -d stm32flash ]] || ( git clone https://git.gitorious.org/stm32flash/stm32flash.git stm32flash &&
- cd stm32flash && git checkout 5b0e391c539e906df7b97f0b457875d90883ea8e && patch -p1 < ../0001-fixed-the-page-by-page-erase-logic.patch )
+ cd stm32flash && git checkout 8399fbe1baf2b7d097746786458021d92895d71b )
-# TODO(brians): This breaks the build of the main code. Figure out something
-# better for this stuff.
-
-../../../aos/build/build.sh atom flasher.gyp no "$@"
+../../../aos/build/build.sh linux flasher.gyp no flasher "$@"