arduino 101: make factory bootloader config the default

The Arduino 101 comes with a bootloader that supports DFU and flashing of all cores using the dfu-util package. This changes the memory layout of the image built for the Arduino 101 and remove previous work-arounds to allow booting, including the version-header section in the linker script. The bootloader expects the text section at +0x30 from the physical load address and thus requires special treatment in the linker script. Other changes by Andrew Boie: The flash size parameters were both wrong. X86 side has 192K of flash from 0x4003000 - 0x40060000, the entire span of sys_flash1. ARC side is now the span from 0x40010000 - 0x40030000, 128K. Change-Id: Iecfa5d2b84a3f522d9eca06268d6b8b71a094aaa Signed-off-by: Anas Nashif <[email protected]>
FantomJAC · Sep 17, 2016 · ecf96d2 · ecf96d2
1 parent 37d6551
commit ecf96d2
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 422 deletions.
diff --git a/boards/arduino_101/Kconfig.defconfig b/boards/arduino_101/Kconfig.defconfig
@@ -4,6 +4,18 @@ if BOARD_ARDUINO_101
 config BOARD
 	default "arduino_101"
 
+config TEXT_SECTION_OFFSET
+	default 0x30
+
+config SS_RESET_VECTOR
+	default 0x40034000
+
+config ROM_SIZE
+	default 192
+
+config PHYS_LOAD_ADDR
+	default 0x40010000
+
 if NBLE
 
 config GPIO

diff --git a/boards/arduino_101/Makefile b/boards/arduino_101/Makefile
@@ -4,4 +4,3 @@ ccflags-y += -I$(srctree)/drivers/pinmux
 asflags-y := ${ccflags-y}
 
 obj-$(CONFIG_PINMUX) += pinmux.o
-obj-y += board.o
diff --git a/boards/arduino_101/arduino_101_factory_defconfig b/boards/arduino_101/arduino_101_factory_defconfig
diff --git a/boards/arduino_101/board.c b/boards/arduino_101/board.c
diff --git a/boards/arduino_101/version_header.h b/boards/arduino_101/version_header.h
diff --git a/boards/arduino_101_sss/Kconfig.defconfig b/boards/arduino_101_sss/Kconfig.defconfig
@@ -4,4 +4,12 @@ if BOARD_ARDUINO_101_SSS
 config BOARD
 	default "arduino_101_sss"
 
+
+config FLASH_SIZE
+	default 128
+
+
+config FLASH_BASE_ADDRESS
+	default 0x40034000
+
 endif # BOARD_ARDUINO_101_SSS
diff --git a/boards/arduino_101_sss/Makefile b/boards/arduino_101_sss/Makefile
@@ -2,4 +2,4 @@ ccflags-y += -I$(srctree)/include/drivers
 ccflags-y += -I$(srctree)/drivers
 asflags-y := ${ccflags-y}
 
-obj-y += board.o
+obj- += dummy.o
diff --git a/boards/arduino_101_sss/arduino_101_sss_defconfig b/boards/arduino_101_sss/arduino_101_sss_defconfig
@@ -10,6 +10,7 @@ CONFIG_CPU_ARCEM4=y
 CONFIG_CPU_ARCV2=y
 CONFIG_ARCV2_INTERRUPT_UNIT=y
 CONFIG_ARCV2_TIMER=y
+CONFIG_SPI_DW_INTERRUPT_SEPARATED_LINES=y
 CONFIG_UART_QMSI=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y

diff --git a/boards/arduino_101_sss/arduino_101_sss_factory_defconfig b/boards/arduino_101_sss/arduino_101_sss_factory_defconfig
diff --git a/boards/arduino_101_sss/board.c b/boards/arduino_101_sss/board.c
diff --git a/boards/arduino_101_sss/version_header.h b/boards/arduino_101_sss/version_header.h
diff --git a/boards/em_starterkit/Makefile b/boards/em_starterkit/Makefile
@@ -2,4 +2,4 @@ ccflags-y += -I$(srctree)/include/drivers
 ccflags-y += -I$(srctree)/drivers
 asflags-y := ${ccflags-y}
 
-obj-y += board.o
+obj- += dummy.o
diff --git a/boards/em_starterkit/board.c b/boards/em_starterkit/board.c
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,3 @@ ccflags-y += -I$(srctree)/drivers/pinmux
		asflags-y := ${ccflags-y}

		obj-$(CONFIG_PINMUX) += pinmux.o
		obj-y += board.o