Zephyr specific updates #5

rsalveti · 2017-01-19T13:31:56Z

Restructuring the Zephyr build system to make it easier to support new targets.

Also replacing printks with SYS_LOG, as it can be managed via configs (and disabled when needed).

Tested on 96boards Carbon and Nitrogen.

Move the board specific configurations into its own header file, which can now be created per board, once it gets tested and validated by the bootloader. Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>

Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>

rsalveti · 2017-01-19T13:39:17Z

@d3zd3z mind taking a look?

d3zd3z · 2017-01-19T20:43:15Z

boot/zephyr/main.c

 	printk("Bootloader chain: 0x%x\n", rsp.br_image_addr);
-	vt = (struct vector_table *)(rsp.br_image_addr +
-				     rsp.br_hdr->ih_hdr_size);
+	vt = (struct vector_table *)(rsp.br_image_addr + TEXT_SECTION_OFFSET);


I wouldn't expect this to work. The bootloader should be built with a TEXT_SECTION_OFFSET of 0. Only the programs booted should themselves have it set.

This really needs to be the value read out of the header, which will then work with however it got built. There isn't really a reason to code this value into the bootloader.

This is the vector table of the app itself, right? That offset will depend not on the header, but on CONFIG_TEXT_SECTION_OFFSET, used by the Zephyr app.

Not sure how to best align both things here, which is why I had it defined per device.

It only depends on the value in the header. I can't think of any reason to define this and not use the header. The header is part of the application.

Makes sense need to make sure the header then gets the right value, will revert this change.

d3zd3z · 2017-01-19T20:43:40Z

boot/zephyr/main.c

+	printk("Setting vector table to %p\n", vt);
+
 	/* Not all targets set the VTOR, so just set it. */
 	_scs_relocate_vector_table((void *) vt);


Perhaps this can be removed, now that we're going to be setting this properly in Zephyr.

d3zd3z · 2017-01-19T20:44:12Z

boot/zephyr/targets/frdm_k64f.h

 #define FLASH_AREA_IMAGE_SCRATCH_SIZE	0x20000
+
+/* Same offset as used by the Zephyr app (CONFIG_TEXT_SECTION_OFFSET) */
+#define TEXT_SECTION_OFFSET		0x100


Needs to be 0x200 for K64F

d3zd3z · 2017-01-19T20:45:37Z

boot/zephyr/targets/96b_nitrogen.h

+ */
+
+#define FLASH_DRIVER_NAME		"NRF5_FLASH"
+#define FLASH_ALIGN			1


Make sure this is really right. Having it too small can excessively wear the flash device.

Yeah, same value as used by mynewt, so fine to have that now.

d3zd3z · 2017-01-19T20:46:53Z

boot/zephyr/flash_map.c

 		.fa_id = FLASH_AREA_IMAGE_0,
-		.fa_off = 0x20000,
-		.fa_size = 0x20000,
+		.fa_off = FLASH_AREA_IMAGE_0_OFFSET,


I think this is good for now. It is likely that we will bring in the partition table code from mynewt into mcuboot, which will make all of this quite different, though.

Yeah, I just wanted to improve it a bit enough to remove the hardcoded values. The best to do here is parsing mynewt's partition table, to avoid duplicating info.

d3zd3z · 2017-01-19T21:36:18Z

boot/zephyr/main.c

 	printk("Bootloader chain: 0x%x\n", rsp.br_image_addr);
-	vt = (struct vector_table *)(rsp.br_image_addr +
-				     rsp.br_hdr->ih_hdr_size);
+	vt = (struct vector_table *)(rsp.br_image_addr + TEXT_SECTION_OFFSET);


It only depends on the value in the header. I can't think of any reason to define this and not use the header. The header is part of the application.

d3zd3z · 2017-01-19T21:37:22Z

boot/zephyr/prj.conf

 CONFIG_HEAP_MEM_POOL_SIZE=16384

 CONFIG_FLASH=y
-CONFIG_SOC_FLASH_STM32F4=y


Did you do something to Zephyr to make this work? When I did it, there were two flash devices defined for the target so Kconfig picked neither.

That's probably because of Linaro/zephyr@942edd4. I'm hoping the upstream version to be merged soon, then we will have the right fix at the right place.

Make it generic and let the SoC itself handle the FLASH driver support as part of the Zephyr build system. Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>

Bluetooth is enabled by default with some boards, so just make sure that it gets disabled here to avoid having a large bootloader firmware. Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>

Avoid warning when using memcmp. Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>

Easier to manage and can be easily disabled via config. Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>

d3zd3z · 2017-01-19T22:07:35Z

Looks good to me. I'd like to get a +1 from a mynewt person, because of the image_rsa change.

ccollins476ad · 2017-01-19T23:12:57Z

It looks good to me, too. Thanks Ricardo.

Merge remote-tracking branch 'rsalveti/zephyr-updates' * rsalveti/zephyr-updates: zephyr: use SYS_LOG instead of printk image_rsa: include missing string.h boot/zephyr/prj.conf: disable bluetooth support by default boot/zephyr/prj.conf: remove SOC_FLASH_STM32F4, make it generic zephyr: targets: add support for 96b_nitrogen zephyr: restructure the build process to use board config files

rsalveti added 2 commits January 19, 2017 10:26

zephyr: restructure the build process to use board config files

3a2c124

Move the board specific configurations into its own header file, which can now be created per board, once it gets tested and validated by the bootloader. Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>

zephyr: targets: add support for 96b_nitrogen

88303ff

Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>

d3zd3z requested changes Jan 19, 2017

View reviewed changes

d3zd3z reviewed Jan 19, 2017

View reviewed changes

rsalveti added 4 commits January 19, 2017 19:51

boot/zephyr/prj.conf: remove SOC_FLASH_STM32F4, make it generic

43fc2cd

Make it generic and let the SoC itself handle the FLASH driver support as part of the Zephyr build system. Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>

boot/zephyr/prj.conf: disable bluetooth support by default

3dbf222

Bluetooth is enabled by default with some boards, so just make sure that it gets disabled here to avoid having a large bootloader firmware. Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>

image_rsa: include missing string.h

a2d5b1a

Avoid warning when using memcmp. Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>

zephyr: use SYS_LOG instead of printk

7cf3d9e

Easier to manage and can be easily disabled via config. Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>

rsalveti force-pushed the zephyr-updates branch from 0f313dd to 7cf3d9e Compare January 19, 2017 21:52

ccollins476ad merged commit 7cf3d9e into mcu-tools:master Jan 20, 2017

gregshue mentioned this pull request Oct 13, 2022

zephyr: refactor zephyr port #1411

Closed

Zephyr specific updates #5

Zephyr specific updates #5

Uh oh!

Conversation

rsalveti commented Jan 19, 2017

Uh oh!

rsalveti commented Jan 19, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

d3zd3z commented Jan 19, 2017

Uh oh!

ccollins476ad commented Jan 19, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants