Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-03-16 23:07:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes for 2023.10

Browse source 
-----------------
 
 CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/17831
 -----BEGIN PGP SIGNATURE-----
 
 iG0EABECAC0WIQS2TmnA27QKhpKSZe309WXkmmjvpgUCZQ8y/Q8cc2JhYmljQGRl
 bnguZGUACgkQ9PVl5Jpo76bRnwCeN/lFw2CmKAZLEc+DLpcnAyUiOfgAn2ezNdBX
 cHEPyB+vpft0OQGa/rg7
 =YCX0
 -----END PGP SIGNATURE-----

Merge tag 'u-boot-imx-20230923' of https://source.denx.de/u-boot/custodians/u-boot-imx

Fixes for 2023.10
-----------------

CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/17831
This commit is contained in:
Tom Rini 2023-09-24 17:15:31 -04:00
commit 15155ab0a3
10 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi
View file

@ -3,6 +3,8 @@
* Copyright 2020-2022 Toradex
*/
#include "imx7s-u-boot.dtsi"
&{/aliases} {
/* SDHCI instance order: eMMC, SD/MMC */
mmc0 = &usdhc3;

2
arch/arm/dts/imx7d-pico-pi-u-boot.dtsi
View file

@ -1,3 +1,5 @@
#include "imx7s-u-boot.dtsi"
/{
aliases {
mmc0 = &usdhc3;

2
arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi
View file

@ -3,6 +3,8 @@
* Copyright 2018 NXP
*/
#include "imx7s-u-boot.dtsi"
&qspi {
flash0: mx25l51245g@0 {
compatible = "jedec,spi-nor";

2
arch/arm/dts/imx7d-sdb-u-boot.dtsi
View file

@ -1,3 +1,5 @@
#include "imx7s-u-boot.dtsi"
&fec2 {
status = "disable";
};

3
arch/arm/dts/imx7d-smegw01-u-boot.dtsi Normal file
View file

@ -0,0 +1,3 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
#include "imx7s-u-boot.dtsi"

7
arch/arm/dts/imx7s-u-boot.dtsi Normal file
View file

@ -0,0 +1,7 @@
// SPDX-License-Identifier: GPL-2.0+ OR MIT
&crypto {
sec_jr0: jr@1000 {
status = "disabled";
};
};

1
arch/arm/mach-imx/Kconfig
View file

@ -32,6 +32,7 @@ config IMX_RDC
config IMX_BOOTAUX
bool "Support boot auxiliary core"
depends on ARCH_MX7 || ARCH_MX6 || ARCH_VF610 || ARCH_IMX8 || ARCH_IMX8M
select LIB_ELF
help
bootaux [addr] to boot auxiliary core.

8
arch/arm/mach-imx/hab.c
View file

@ -662,7 +662,7 @@ static int do_authenticate_image_or_failover(struct cmd_tbl *cmdtp, int flag,
{
int ret = CMD_RET_FAILURE;
if (argc != 4) {
if (argc < 3) {
ret = CMD_RET_USAGE;
goto error;
}
@ -703,7 +703,7 @@ U_BOOT_CMD(
"addr length ivt_offset\n"
"addr - image hex address\n"
"length - image hex length\n"
"ivt_offset - hex offset of IVT in the image"
"ivt_offset - hex offset of IVT in the image (optional)"
);
U_BOOT_CMD(
@ -715,11 +715,11 @@ U_BOOT_CMD(
U_BOOT_CMD(
hab_auth_img_or_fail, 4, 0,
do_authenticate_image_or_failover,
"authenticate image via HAB on failure drop to USB BootROM mode",
"authenticate image via HAB. Switch to USB BootROM mode on failure",
"addr length ivt_offset\n"
"addr - image hex address\n"
"length - image hex length\n"
"ivt_offset - hex offset of IVT in the image"
"ivt_offset - hex offset of IVT in the image (optional)"
);
U_BOOT_CMD(

14
board/storopack/smegw01/smegw01.env
View file

@ -48,13 +48,8 @@ commit_mmc=
saveenv;
fi;
console=ttymxc0
fdt_addr=0x83000000
fdtfile=imx7d-smegw01.dtb
fit_addr=0x88000000
image=fitImage
loadaddr=0x80800000
loadbootpart=mmc partconf 1 boot_part
loadimage=load mmc ${mmcdev}:${gpt_partition_entry} ${fit_addr} boot/${image}
loadimage=load mmc ${mmcdev}:${gpt_partition_entry}
loadpart=gpt setenv mmc ${mmcdev} rootfs-${mmcpart_committed}
mmcargs=
setenv bootargs console=${console},${baudrate} root=/dev/mmcblk${mmcdev}p${gpt_partition_entry} rootwait rw SM_ROOT_DEV=${mmcdev} SM_ROOT_PART=${gpt_partition_entry} SM_BOOT_PART=${boot_part}
@ -71,8 +66,13 @@ mmcboot=
else
run altbootcmd;
fi;
#ifdef CONFIG_SYS_BOOT_LOCKED
hab_auth_img ${fileaddr} ${filesize};
#else
hab_auth_img_or_fail ${fileaddr} ${filesize};
#endif
run mmcargs;
if bootm ${fit_addr}; then
if bootm; then
;
else
run altbootcmd;

3
configs/smegw01_defconfig
View file

@ -14,6 +14,7 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
CONFIG_IMX_RDC=y
CONFIG_IMX_BOOTAUX=y
CONFIG_IMX_HAB=y
CONFIG_SYS_LOAD_ADDR=0x88000000
CONFIG_SYS_MEMTEST_START=0x80000000
CONFIG_SYS_MEMTEST_END=0xa0000000
CONFIG_FIT=y
@ -54,6 +55,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_SYS_MMC_ENV_DEV=1
CONFIG_ENV_WRITEABLE_LIST=y
CONFIG_ENV_ACCESS_IGNORE_FORCE=y
CONFIG_USE_BOOTFILE=y
CONFIG_BOOTFILE="boot/fitImage"
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_BOUNCE_BUFFER=y
CONFIG_BOOTCOUNT_LIMIT=y