Update Olimex-P103 to not use a bootloader
This BSP has very limited flash size, so makes more sense to switch to
single slot application; this way "slinky" can be run.
diff --git a/hw/bsp/olimex-p103/boot-olimex_p103.ld b/hw/bsp/olimex-p103/boot-olimex_p103.ld
deleted file mode 100644
index 1720a00..0000000
--- a/hw/bsp/olimex-p103/boot-olimex_p103.ld
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/* Linker script to configure memory regions. */
-MEMORY
-{
- FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 16K
- RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
-}
-
-/* The bootloader does not contain an image header */
-_imghdr_size = 0x0;
diff --git a/hw/bsp/olimex-p103/bsp.yml b/hw/bsp/olimex-p103/bsp.yml
index 317d913..f792978 100644
--- a/hw/bsp/olimex-p103/bsp.yml
+++ b/hw/bsp/olimex-p103/bsp.yml
@@ -25,9 +25,6 @@
bsp.linkerscript:
- "hw/bsp/olimex-p103/olimex_p103.ld"
- "@apache-mynewt-core/hw/mcu/stm/stm32f1xx/stm32f103.ld"
-bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- - "hw/bsp/olimex-p103/boot-olimex_p103.ld"
- - "@apache-mynewt-core/hw/mcu/stm/stm32f1xx/stm32f103.ld"
bsp.downloadscript: "hw/bsp/olimex-p103/olimex_p103_download.sh"
bsp.debugscript: "hw/bsp/olimex-p103/olimex_p103_debug.sh"
bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/olimex-p103/olimex_p103_download.cmd"
@@ -38,29 +35,29 @@
# System areas.
FLASH_AREA_BOOTLOADER:
device: 0
- offset: 0x08000000
- size: 16kB
+ offset: 0x08100000
+ size: 0kB
FLASH_AREA_IMAGE_0:
device: 0
- offset: 0x08008000
- size: 46kB
+ offset: 0x08000000
+ size: 112kB
FLASH_AREA_IMAGE_1:
device: 0
- offset: 0x08013800
- size: 46kB
+ offset: 0x08200000
+ size: 0kB
FLASH_AREA_IMAGE_SCRATCH:
device: 0
- offset: 0x0801f000
- size: 4kB
+ offset: 0x08300000
+ size: 0kB
# User areas.
FLASH_AREA_REBOOT_LOG:
user_id: 0
device: 0
- offset: 0x08004000
+ offset: 0x0801c000
size: 8kB
FLASH_AREA_NFFS:
user_id: 1
device: 0
- offset: 0x08006000
+ offset: 0x0801e000
size: 8kB
diff --git a/hw/bsp/olimex-p103/olimex_p103.ld b/hw/bsp/olimex-p103/olimex_p103.ld
index 5b93cc3..86374bf 100644
--- a/hw/bsp/olimex-p103/olimex_p103.ld
+++ b/hw/bsp/olimex-p103/olimex_p103.ld
@@ -22,9 +22,9 @@
/* Linker script to configure memory regions. */
MEMORY
{
- FLASH (rx) : ORIGIN = 0x08008000, LENGTH = 46K /* First image slot. */
+ FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 112K /* First image slot. */
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
}
-/* This linker script is used for images and thus contains an image header */
-_imghdr_size = 0x20;
+/* No bootloader */
+_imghdr_size = 0x0;
diff --git a/hw/bsp/olimex-p103/olimex_p103_download.sh b/hw/bsp/olimex-p103/olimex_p103_download.sh
index 8aab485..48eaff7 100755
--- a/hw/bsp/olimex-p103/olimex_p103_download.sh
+++ b/hw/bsp/olimex-p103/olimex_p103_download.sh
@@ -36,6 +36,8 @@
FLASH_OFFSET=0x08000000
fi
+BOOT_LOADER=1
+
common_file_to_load
openocd_load
openocd_reset_run
