mx53-loco: provide the right header for serial downloader
Subsystems (3)
PATCH 1/2 mx53-loco: provide the right header for serial downloader
this patch allows barebox to run when loaded on the iMX53QSB using the serial downloader.
--- arch/arm/boards/freescale-mx53-loco/flash_header.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/boards/freescale-mx53-loco/flash_header.c +7 -0
@@ -34,10 +34,17 @@ struct imx_flash_header_v2 __flash_header_section flash_header = { .header.length = cpu_to_be16(32), .header.version =IVT_VERSION , +#ifdef CONFIG_ARCH_IMX_INTERNAL_BOOT_SERIAL + .entry =APP_DEST +0x400 , + .dcd_ptr = APP_DEST + offsetof(struct imx_flash_header_v2, dcd), + .boot_data_ptr = APP_DEST + offsetof(struct imx_flash_header_v2, boot_data), + .self = APP_DEST, +#else .entry =APP_DEST +0x1000 , .dcd_ptr = APP_DEST + 0x400 + offsetof(struct imx_flash_header_v2, dcd), .boot_data_ptr = APP_DEST + 0x400 + offsetof(struct imx_flash_header_v2, boot_data), .self = APP_DEST + 0x400, +#endif .boot_data.start =APP_DEST , .boot_data.size = DCD_BAREBOX_SIZE,
Signature · 7 lines
1.7.11.7 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 2/2 i.MX53: add serial downloader bootsource
--- arch/arm/mach-imx/boot.c | 70 +++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 33 deletions(-)
arch/arm/mach-imx/boot.c +37 -33
@@ -172,39 +172,43 @@ void imx53_boot_save_loc(void __iomem *src_base)int instance;uint32_t cfg1 =readl (src_base +IMX53_SRC_SBMR ); -switch ((cfg1 &0xff ) >>4 ) { -case 2 : - src =BOOTSOURCE_HD ; -break ; -case 3 : -if (cfg1 & (1 <<3 )) - src =BOOTSOURCE_SPI ; -else - src =BOOTSOURCE_I2C ; -break ; -case 4 : -case 5 : -case 6 : -case 7 : - src =BOOTSOURCE_MMC ; -break ; -default : -break ; - } - -if (cfg1 & (1 <<7 )) - src =BOOTSOURCE_NAND ; - - -switch (src) { -case BOOTSOURCE_MMC : -case BOOTSOURCE_SPI : -case BOOTSOURCE_I2C : - instance = (cfg1 >>21 ) &0x3 ; -break ; -default : - instance =0 ; -break ; +if ((cfg1 &0x03000000 ) >>24 ==0x3 ) + src =BOOTSOURCE_SERIAL ; +else { +switch ((cfg1 &0xff ) >>4 ) { +case 2 : + src =BOOTSOURCE_HD ; +break ; +case 3 : +if (cfg1 & (1 <<3 )) + src =BOOTSOURCE_SPI ; +else + src =BOOTSOURCE_I2C ; +break ; +case 4 : +case 5 : +case 6 : +case 7 : + src =BOOTSOURCE_MMC ; +break ; +default : +break ; + } + +if (cfg1 & (1 <<7 )) + src =BOOTSOURCE_NAND ; + + +switch (src) { +case BOOTSOURCE_MMC : +case BOOTSOURCE_SPI : +case BOOTSOURCE_I2C : + instance = (cfg1 >>21 ) &0x3 ; +break ; +default : + instance =0 ; +break ; + } }bootsource_set (src);
Signature · 7 lines
1.7.11.7 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Quoted 17 lines · Eric Bénard
this patch allows barebox to run when loaded on the iMX53QSB using the serial downloader.
Signed-off-by Eric Bénard <[email protected]>--- arch/arm/boards/freescale-mx53-loco/flash_header.c | 7 +++++++ 1 file changed, 7 insertions(+)arch/arm/boards/freescale-mx53-loco/flash_header.c +1
-0@@ -34,10 +34,17 @@ struct imx_flash_header_v2 __flash_header_section flash_header = { .header.length = cpu_to_be16(32), .header.version = IVT_VERSION, +#ifdef CONFIG_ARCH_IMX_INTERNAL_BOOT_SERIAL
arch/arm/boards/freescale-mx53-loco/flash_header.c struct imx_flash_header_v2 __flash_header_section flash_header = { · line 47
Quoted 10 lines
arch/arm/boards/freescale-mx53-loco/flash_header.c +6
-0+ .entry = APP_DEST + 0x400, + .dcd_ptr = APP_DEST + offsetof(struct imx_flash_header_v2, dcd), + .boot_data_ptr = APP_DEST + offsetof(struct imx_flash_header_v2, boot_data), + .self = APP_DEST, +#else .entry = APP_DEST + 0x1000, .dcd_ptr = APP_DEST + 0x400 + offsetof(struct imx_flash_header_v2, dcd), .boot_data_ptr = APP_DEST + 0x400 + offsetof(struct imx_flash_header_v2, boot_data), .self = APP_DEST + 0x400, +#endif
use a define to void duplication
Quoted 11 lines
arch/arm/boards/freescale-mx53-loco/flash_header.c +0
-0.boot_data.start = APP_DEST, .boot_data.size = DCD_BAREBOX_SIZE,Signature · 7 lines
1.7.11.7 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Sascha Hauer
maintainerHi Eric,
Quoted 2 lines · Eric Bénard
this patch allows barebox to run when loaded on the iMX53QSB using the serial downloader.
What serial downloader do you use? We have a serial downloader here:
git://git.pengutronix.de/git/tools/imx-usb-loader.git
This one works by parsing the flash headers from the images and executing them manually by doing register writes. It works with the currently generated images just fine.
I though about integrating this tool into barebox. Part of the reason for doing this is that this repository also contains a image generation tool which could replace the compiler/linker mechanism we currently use to generate i.MX images. Using a dedicated tool for this job seems more flexible.
Quoted 15 lines
Signed-off-by Eric Bénard <[email protected]>--- arch/arm/boards/freescale-mx53-loco/flash_header.c | 7 +++++++ 1 file changed, 7 insertions(+)arch/arm/boards/freescale-mx53-loco/flash_header.c +1
-0@@ -34,10 +34,17 @@ struct imx_flash_header_v2 __flash_header_section flash_header = { .header.length = cpu_to_be16(32), .header.version = IVT_VERSION, +#ifdef CONFIG_ARCH_IMX_INTERNAL_BOOT_SERIAL
arch/arm/boards/freescale-mx53-loco/flash_header.c struct imx_flash_header_v2 __flash_header_section flash_header = { · line 47
Quoted 10 lines
arch/arm/boards/freescale-mx53-loco/flash_header.c +6
-0+ .entry = APP_DEST + 0x400, + .dcd_ptr = APP_DEST + offsetof(struct imx_flash_header_v2, dcd), + .boot_data_ptr = APP_DEST + offsetof(struct imx_flash_header_v2, boot_data), + .self = APP_DEST, +#else .entry = APP_DEST + 0x1000, .dcd_ptr = APP_DEST + 0x400 + offsetof(struct imx_flash_header_v2, dcd), .boot_data_ptr = APP_DEST + 0x400 + offsetof(struct imx_flash_header_v2, boot_data), .self = APP_DEST + 0x400, +#endif
We already have a FLASH_HEADER_OFFSET define which seems to solve half of the problem. Extending the ifdefs already present int the header file should work better.
Sascha
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Hi Sascha,
Quoted 4 lines · Sascha Hauer
Quoted 2 lines · Eric Bénard
this patch allows barebox to run when loaded on the iMX53QSB using the serial downloader.
Quoted 8 lines
What serial downloader do you use? We have a serial downloader here:
git://git.pengutronix.de/git/tools/imx-usb-loader.gitThis one works by parsing the flash headers from the images and executing them manually by doing register writes. It works with the currently generated images just fine.
OK I'll give it a try here. I was using a home made tool which works fine on i.MX25/35/51 and that I just adapted to i.MX53 so the problem may be in my tool ;-)
Thanks
Eric
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox