From 77683adc2028da4e29a489068bbcc21f125a03dc Mon Sep 17 00:00:00 2001 From: Marti Bolivar Date: Thu, 16 Mar 2017 15:05:09 -0400 Subject: [PATCH 1/2] Move arduino_101.conf to boot/zephyr/. It's currently one level down, in boot/zephyr/targets, from the rest of the .conf files. Signed-off-by: Marti Bolivar --- boot/zephyr/{targets => }/arduino_101.conf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename boot/zephyr/{targets => }/arduino_101.conf (100%) diff --git a/boot/zephyr/targets/arduino_101.conf b/boot/zephyr/arduino_101.conf similarity index 100% rename from boot/zephyr/targets/arduino_101.conf rename to boot/zephyr/arduino_101.conf From 836768b2da939730a4602ea48a9248e114b55583 Mon Sep 17 00:00:00 2001 From: Marti Bolivar Date: Thu, 16 Mar 2017 15:14:21 -0400 Subject: [PATCH 2/2] zephyr: fix do_boot() warning on ARM Commit 7238f51 ("zephyr: add support for x86 booting method") introduced a backend-specific do_boot() function. On ARM, this casts to an undefined type 'struct vector_table*'. Fix this by using the 'struct arm_vector_table*' introduced in that patch. Signed-off-by: Marti Bolivar --- boot/zephyr/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c index 4e79f0a5..885f6672 100644 --- a/boot/zephyr/main.c +++ b/boot/zephyr/main.c @@ -49,8 +49,8 @@ static void do_boot(struct boot_rsp *rsp) * consecutively. Manually set the stack pointer and jump into the * reset vector */ - vt = (struct vector_table *)(rsp->br_image_addr + - rsp->br_hdr->ih_hdr_size); + vt = (struct arm_vector_table *)(rsp->br_image_addr + + rsp->br_hdr->ih_hdr_size); irq_lock(); _MspSet(vt->msp); ((void (*)(void))vt->reset)();