arm: config: xea: Update environment variables for XEA board (imx287)
PATCH 1/3 arm: config: xea: Update environment variables for XEA board (imx287)
As the XEA now supports fitImage, the default envs shall reflect this as well.
Moreover, some SPI-NOR layout re-organization has took place.
---
include/configs/xea.h | 45 ++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 20 deletions(-)
include/configs/xea.h +25 -20
@@ -33,17 +33,21 @@"bootsec=sf_swu\0" \"consdev=ttyAMA0\0" \"baudrate=115200\0" \ -"dtbaddr=0x44000000\0" \ -"dtbfile=imx28-xea.dtb\0" \"rootdev=/dev/mmcblk0p2\0" \"netdev=eth0\0" \ -"rdaddr=0x43000000\0" \ -"swufile=swupdate.img\0" \ -"sf_kernel_offset=0x100000\0" \ -"sf_kernel_size=0x400000\0" \ -"sf_swu_offset=0x500000\0" \ -"sf_swu_size=0x800000\0" \ -"rootpath=/opt/eldk-5.5/armv5te/rootfs-qte-sdk\0" \ +"swufile=swupdate-image-xea-upd.itb\0" \ +"sf_kernel_offset=0xA0000\0" \ +"sf_swu_size=0xF40000\0" \ +"ethact=FEC\0" \ +"arch=xea\0" \ +"serverip=10.8.217.79\0" \ +"nfs_serverip=10.8.218.113\0" \ +"gatewayip=10.8.209.250\0" \ +"lwe_env=" \ +"if dhcp ${loadaddr} ${hostname}/${lwe_uenv} ; then " \ +"source ${loadaddr}; " \ +"fi\0" \ +"lwe_uenv=env_uboot_xea.bin\0" \"do_update_mmc=" \"if mmc rescan ; then " \"mmc dev 0 ${update_mmc_part} ; " \
@@ -60,6 +64,12 @@"sf write ${loadaddr} ${update_offset} ${filesize} ; " \"fi ; " \"fi\0" \ +"factory_reset=" \ +"if sf probe ; then " \ +"run update_swu ; " \ +"setenv bootmode update ; " \ +"saveenv ; " \ +"fi\0" \"update_spl_filename=u-boot.sb\0" \"update_spl=" \"setenv update_filename ${update_spl_filename} ; " \
@@ -72,6 +82,8 @@"run do_update_sf ; " \"setenv update_mmc_part 1 ; " \"setenv update_offset 0 ; " \ +"run do_update_mmc ; " \ +"setenv update_mmc_part 2 ; " \"run do_update_mmc\0" \"update_kernel_filename=uImage\0" \"update_kernel=" \
@@ -82,13 +94,9 @@"setenv update_filename ${dtbfile} ; " \"setenv update_offset 0x400 ; " \"run do_update_mmc\0" \ -"update_sfkernel=" \ -"setenv update_filename fitImage ; " \ -"setenv update_offset ${sf_kernel_offset} ; " \ -"run do_update_sf\0" \"update_swu=" \"setenv update_filename ${swufile} ; " \ -"setenv update_offset ${sf_swu_offset} ; " \ +"setenv update_offset ${sf_kernel_offset} ; " \"run do_update_sf\0" \"addcons=" \"setenv bootargs ${bootargs} " \
@@ -108,9 +116,6 @@"netload=" \"dhcp ${loadaddr} ${hostname}/${bootfile} ; " \"tftp ${dtbaddr} ${hostname}/${dtbfile}\0" \ -"sfload=" \ -"sf probe ; " \ -"sf read ${loadaddr} ${sf_kernel_offset} ${sf_kernel_size}\0" \"usbload=" \"usb start ; " \"load usb 0:1 ${loadaddr} ${bootfile}\0" \
@@ -132,11 +137,11 @@"bootm ${loadaddr} - ${dtbaddr} ; " \"fi\0" \"sf_swu=" \ -"if run sfload ; then " \ -"sf read ${rdaddr} ${sf_swu_offset} ${sf_swu_size} ; " \ +"if sf probe ; then " \ +"sf read ${loadaddr} ${sf_kernel_offset} ${sf_swu_size} ; " \"setenv bootargs root=/dev/ram0 rw ; " \"run addargs ; " \ -"bootm ${loadaddr} ${rdaddr} ; " \ +"bootm ${loadaddr} ; " \"fi\0" \"net_mmc=" \"if run netload mmcargs addargs ; then " \
Signature · 1 line
2.39.2
PATCH 2/3 arm: config: Enable CRC8 support in SPL on imx287 XEA board
The boot0/1 feature uses simple CRC8 to check (in SPL) if SPI-NOR content is not corrupted, hence the need to enable it.
---
configs/imx28_xea_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/imx28_xea_defconfig +1 -0
@@ -123,4 +123,5 @@ CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MXS_SPI=y +CONFIG_SPL_CRC8=y # CONFIG_SPL_OF_LIBFDT is not set
Signature · 1 line
2.39.2
PATCH 3/3 arm: xea: Add support for boot image source descriptor in SPL
In reply to Lukasz MajewskiFrom: Anatolij Gustschin <[email protected]>
We load two boot image source descriptor structures from last two sectors in the SPI NOR flash and determine the boot source for loading the kernel/DTB images, then adjust the boot order for loading image from eMMC boot0 or boot1 partition.
---
board/liebherr/xea/boot_img_scr.h | 27 ++++++++++ board/liebherr/xea/xea.c | 85 +++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 board/liebherr/xea/boot_img_scr.h
board/liebherr/xea/boot_img_scr.h new file +27 -0
@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Struct for boot image source description for placing in last +* two SPI NOR flash sectors on legcom. +*/ + +struct boot_img_src { +u8 magic;/* Must be 'B' = 0x42 */ +u8 flags;/* flags to specify mmcblk[0|1] boot[0|1] */ +u8 crc8;/* CRC-8 over above two bytes */ +} __packed; + +/* +* Bit definition in boot_img_src.flags: +* Bit 0: mmcblk device 0 or 1 (1 - if this bit set) +* Bit 1: mmcblk boot partition 0 or 1. +* for eMMC: boot0 if this bit is cleared, boot1 - if set +* for SD-card the boot partition value will always be 0 +* (independent of the value of this bit) +* +*/ +#define BOOT_SRC_MMC1 BIT(0) +#define BOOT_SRC_PART1 BIT(1) + +/* Offset of the first boot image source descriptor in SPI NOR */ +#define SPI_FLASH_BOOT_SRC_OFFS 0xFE0000 +#define SPI_FLASH_SECTOR_SIZE 0x10000
board/liebherr/xea/xea.c +85 -0
103 lines not on this page · raw message
Signature · 1 line
2.39.2
Quoted 10 lines · Lukasz Majewski
As the XEA now supports fitImage, the default envs shall reflect this as well.
Moreover, some SPI-NOR layout re-organization has took place.
Signed-off-by Lukasz Majewski <[email protected]>---
include/configs/xea.h | 45 ++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 20 deletions(-)
Please migrate this to a plain text environment.
Signature · 1 line
Tom
Hi Tom,
Quoted 7 lines · Lukasz Majewski
Quoted 6 lines
As the XEA now supports fitImage, the default envs shall reflect this as well.
Moreover, some SPI-NOR layout re-organization has took place.
Quoted 9 lines
Quoted 6 lines
Signed-off-by Lukasz Majewski <[email protected]>---
include/configs/xea.h | 45++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 20 deletions(-)
Please migrate this to a plain text environment.
Ok, so I will prepare new patch especially for it.
(IMHO, patches 2/3 and 3/3 can be applied without this one).
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: [email protected]