mxs: mxsboot: Move sdcard BCB header to 4 sectors offset
PATCH 1/2 mxs: mxsboot: Move sdcard BCB header to 4 sectors offset
The MX23 Boot ROM does blindly load from 2048 offset while the MX28 does parse the BCB header to known where to load the image from. We move the BCB header to 4 sectors offset so same code can be used by both SoCs avoiding code duplication.
This idea was given by Marek Vasut <[email protected]>
--- tools/mxsboot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/mxsboot.c +4 -4
@@ -551,7 +551,7 @@ static int mx28_create_sd_image(int infd, int outfd) fsize =lseek (infd,0 ,SEEK_END );lseek (infd,0 ,SEEK_SET ); - size = fsize +512 ; + size = fsize +4 *512 ; buf =malloc (size);if (!buf) {
@@ -559,7 +559,7 @@ static int mx28_create_sd_image(int infd, int outfd) goto err0; } - ret =read (infd, (uint8_t *)buf +512 , fsize); + ret =read (infd, (uint8_t *)buf +4 *512 , fsize);if (ret != fsize) { ret =-1 ; goto err1;
@@ -574,8 +574,8 @@ static int mx28_create_sd_image(int infd, int outfd) cb->drv_info[0 ].chip_num =0x0 ; cb->drv_info[0 ].drive_type =0x0 ; cb->drv_info[0 ].tag =0x1 ; - cb->drv_info[0 ].first_sector_number = sd_sector +1 ; - cb->drv_info[0 ].sector_count = (size -1 ) /512 ; + cb->drv_info[0 ].first_sector_number = sd_sector +4 ; + cb->drv_info[0 ].sector_count = (size -4 ) /512 ; wr_size =write (outfd, buf, size);if (wr_size != size) {
Signature · 1 line
1.8.1
PATCH 2/2 mx53ard: Rework default environment to support FDT, MMC and netboot
This reworks the environment settings to be aligned with the other i.MX boards. The loadaddr has been changed to allow the Freescale kernel and mainline kernel to work without environment changes.
--- include/configs/mx53ard.h | 101 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 78 insertions(+), 23 deletions(-)
include/configs/mx53ard.h +78 -23
@@ -90,6 +90,7 @@#include <config_cmd_default.h> #undef CONFIG_CMD_IMLS +#define CONFIG_CMD_SETEXPR #define CONFIG_BOOTDELAY 3
@@ -100,45 +101,98 @@#define CONFIG_SMC911X_16_BIT #define CONFIG_SMC911X_BASE CS1_BASE_ADDR -#define CONFIG_LOADADDR 0x70800000/* loadaddr env var */ +#define CONFIG_LOADADDR 0x72000000/* loadaddr env var */ #define CONFIG_SYS_TEXT_BASE 0x77800000 +#define CONFIG_DEFAULT_FDT_FILE "imx53-ard.dtb" +#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "uimage=uImage\0" \ - "mmcdev=0\0" \ - "mmcpart=2\0" \ - "mmcroot=/dev/mmcblk0p3 rw\0" \ - "mmcrootfstype=ext3 rootwait\0" \ - "mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \ - "root=${mmcroot} " \ - "rootfstype=${mmcrootfstype}\0" \ + "console=ttymxc0\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ + "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "fdt_addr=0x71000000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ + "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ + "mmcpart=" __stringify(CONFIG_SYS_MMC_ENV_PART) "\0" \ + "mmcroot=/dev/mmcblk0p3 rootwait rw\0" \ + "update_sd_firmware_filename=u-boot.imx\0" \ + "update_sd_firmware=" \ + "if test ${ip_dyn} = yes; then " \ + "setenv get_cmd dhcp; " \ + "else " \ + "setenv get_cmd tftp; " \ + "fi; " \ + "if mmc dev ${mmcdev}; then " \ + "if ${get_cmd} ${update_sd_firmware_filename}; then " \ + "setexpr fw_sz ${filesize} / 0x200; " \ + "setexpr fw_sz ${fw_sz} + 1; " \ + "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ + "fi; " \ + "fi\0" \ + "mmcargs=setenv bootargs console=${console},${baudrate} " \ + "root=${mmcroot}\0" \ "loadbootscript=" \ "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ + "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ - "bootm\0" \ - "netargs=setenv bootargs console=ttymxc0,${baudrate} " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ + "if run loadfdt; then " \ + "bootm ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ + "bootm; " \ + "else " \ + "echo WARN: Cannot load the DT; " \ + "fi; " \ + "fi; " \ + "else " \ + "bootm; " \ + "fi;\0" \ + "netargs=setenv bootargs console=${console},${baudrate} " \ "root=/dev/nfs " \ - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ - "netboot=echo Booting from net ...; " \ + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ + "netboot=echo Booting from net ...; " \ "run netargs; " \ - "dhcp ${uimage}; bootm\0" \ - -#define CONFIG_BOOTCOMMAND \ - "mmc dev ${mmcdev}; if mmc rescan; then " \ - "if run loadbootscript; then " \ - "run bootscript; " \ + "if test ${ip_dyn} = yes; then " \ + "setenv get_cmd dhcp; " \ "else " \ - "if run loaduimage; then " \ - "run mmcboot; " \ - "else run netboot; " \ - "fi; " \ + "setenv get_cmd tftp; " \ "fi; " \ - "else run netboot; fi" + "${get_cmd} ${uimage}; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ + "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ + "bootm ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ + "bootm; " \ + "else " \ + "echo WARN: Cannot load the DT; " \ + "fi; " \ + "fi; " \ + "else " \ + "bootm; " \ + "fi;\0" + +#define CONFIG_BOOTCOMMAND \ + "mmc dev ${mmcdev}; if mmc rescan; then " \ + "if run loadbootscript; then " \ + "run bootscript; " \ + "else " \ + "if run loaduimage; then " \ + "run mmcboot; " \ + "else run netboot; " \ + "fi; " \ + "fi; " \ + "else run netboot; fi" +#define CONFIG_ARP_TIMEOUT 200UL/* Miscellaneous configurable options */
@@ -185,6 +239,7 @@#define CONFIG_ENV_SIZE (8 * 1024)#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_SYS_MMC_ENV_PART 2#define CONFIG_OF_LIBFDT
Signature · 1 line
1.8.1
Fabio Estevam
reviewerPATCH 2/2 mx53ard: Rework default environment to support FDT, MMC and netboot
Quoted 5 lines · Otavio Salvador
This reworks the environment settings to be aligned with the other i.MX boards. The loadaddr has been changed to allow the Freescale kernel and mainline kernel to work without environment changes.
Signed-off-by Otavio Salvador <[email protected]>
Looks good:
PATCH 2/2 mx53ard: Rework default environment to support FDT, MMC and netboot
In reply to Otavio SalvadorQuoted 6 lines · Otavio Salvador
This reworks the environment settings to be aligned with the other i.MX boards. The loadaddr has been changed to allow the Freescale kernel and mainline kernel to work without environment changes.
Signed-off-by Otavio Salvador <[email protected]>---
Applied to u-boot-imx, thanks.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 1/2 mxs: mxsboot: Move sdcard BCB header to 4 sectors offset
In reply to Otavio SalvadorDear Otavio Salvador,
Quoted 8 lines
The MX23 Boot ROM does blindly load from 2048 offset while the MX28 does parse the BCB header to known where to load the image from. We move the BCB header to 4 sectors offset so same code can be used by both SoCs avoiding code duplication.
This idea was given by Marek Vasut <[email protected]>
Signed-off-by Otavio Salvador <[email protected]>
What devices did you test this code on?
Best regards,
Marek Vasut
PATCH 1/2 mxs: mxsboot: Move sdcard BCB header to 4 sectors offset
Quoted 7 lines · Marek Vasut
Dear Otavio Salvador,
Quoted 5 lines
The MX23 Boot ROM does blindly load from 2048 offset while the MX28 does parse the BCB header to known where to load the image from. We move the BCB header to 4 sectors offset so same code can be used by both SoCs avoiding code duplication.
Quoted 5 lines
Quoted 3 lines
This idea was given by Marek Vasut <[email protected]>
Signed-off-by Otavio Salvador <[email protected]>What devices did you test this code on?
MX23EVK and MX28EVK
--
Otavio Salvador O.S. Systems
E-mail: otavio at ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Fabio Estevam
reviewerPATCH 1/2 mxs: mxsboot: Move sdcard BCB header to 4 sectors offset
In reply to Otavio SalvadorQuoted 8 lines · Otavio Salvador
The MX23 Boot ROM does blindly load from 2048 offset while the MX28 does parse the BCB header to known where to load the image from. We move the BCB header to 4 sectors offset so same code can be used by both SoCs avoiding code duplication.
This idea was given by Marek Vasut <[email protected]>
Signed-off-by Otavio Salvador <[email protected]>
On mx23evk/mx28evk:
PATCH 1/2 mxs: mxsboot: Move sdcard BCB header to 4 sectors offset
In reply to Otavio SalvadorDear Otavio Salvador,
Quoted 8 lines
The MX23 Boot ROM does blindly load from 2048 offset while the MX28 does parse the BCB header to known where to load the image from. We move the BCB header to 4 sectors offset so same code can be used by both SoCs avoiding code duplication.
This idea was given by Marek Vasut <[email protected]>
Signed-off-by Otavio Salvador <[email protected]>
On M28EVK
Best regards,
Marek Vasut
PATCH 1/2 mxs: mxsboot: Move sdcard BCB header to 4 sectors offset
Quoted 7 lines · Marek Vasut
Dear Otavio Salvador,
Quoted 5 lines
The MX23 Boot ROM does blindly load from 2048 offset while the MX28 does parse the BCB header to known where to load the image from. We move the BCB header to 4 sectors offset so same code can be used by both SoCs avoiding code duplication.
Quoted 7 lines
Quoted 3 lines
This idea was given by Marek Vasut <[email protected]>
Signed-off-by Otavio Salvador <[email protected]>On M28EVK
Tested-by Marek Vasut <[email protected]>
Ok, thanks, I push it to -master
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 1/2 mxs: mxsboot: Move sdcard BCB header to 4 sectors offset
In reply to Otavio SalvadorQuoted 9 lines · Otavio Salvador
The MX23 Boot ROM does blindly load from 2048 offset while the MX28 does parse the BCB header to known where to load the image from. We move the BCB header to 4 sectors offset so same code can be used by both SoCs avoiding code duplication.
This idea was given by Marek Vasut <[email protected]>
Signed-off-by Otavio Salvador <[email protected]>---
Applied to u-boot-imx, thanks.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================