diff options
| author | Tom Rini <[email protected]> | 2024-10-17 08:35:11 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-10-17 08:35:29 -0600 |
| commit | be708572c2a6eccd1fd899e71324b35b3d29dc0c (patch) | |
| tree | 2dbb4189edd4cda9f4bbc61d5450578f57cc723b /include | |
| parent | d17661a5ff394f7552ab7ebd186581e90ca552be (diff) | |
| parent | 4aa8b9ede9b9010de367af15eabbf4d5c06a754c (diff) | |
Merge tag 'u-boot-stm32-20241017' of https://source.denx.de/u-boot/custodians/u-boot-stm
CI: https://source.denx.de/u-boot/custodians/u-boot-stm/-/pipelines/22732
- stm32mp: fix boot issue with OP-TEE
- stm32mp: Add script to install U-Boot from SD/eMMC to SPI NOR on DH STM32MP15xx
- stm32mp: Switch to using upstream DT on DH STM32 DHSOM
- stm32mp: Generate u-boot.itb using binman on DH STM32 DHSOM
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/stm32mp13_common.h | 2 | ||||
| -rw-r--r-- | include/configs/stm32mp15_common.h | 4 | ||||
| -rw-r--r-- | include/configs/stm32mp15_dh_dhsom.h | 16 |
3 files changed, 13 insertions, 9 deletions
diff --git a/include/configs/stm32mp13_common.h b/include/configs/stm32mp13_common.h index 5b0658ced92..3e3f49abae0 100644 --- a/include/configs/stm32mp13_common.h +++ b/include/configs/stm32mp13_common.h @@ -21,8 +21,6 @@ */ #define CFG_SYS_BOOTMAPSZ SZ_256M -/* NAND support */ - /*****************************************************************************/ #ifdef CONFIG_DISTRO_DEFAULTS /*****************************************************************************/ diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h index af6dd4a8095..9cac31bcf47 100644 --- a/include/configs/stm32mp15_common.h +++ b/include/configs/stm32mp15_common.h @@ -21,10 +21,6 @@ */ #define CFG_SYS_BOOTMAPSZ SZ_256M -/* NAND support */ - -/* Ethernet need */ - #define STM32MP_FIP_IMAGE_GUID \ EFI_GUID(0x19d5df83, 0x11b0, 0x457b, 0xbe, 0x2c, \ 0x75, 0x59, 0xc1, 0x31, 0x42, 0xa5) diff --git a/include/configs/stm32mp15_dh_dhsom.h b/include/configs/stm32mp15_dh_dhsom.h index 0f466711cae..2797fc61d17 100644 --- a/include/configs/stm32mp15_dh_dhsom.h +++ b/include/configs/stm32mp15_dh_dhsom.h @@ -37,16 +37,26 @@ "setenv loadaddr1 && " \ "setenv sblkcnt && " \ "setenv ublkcnt\0" \ - "dh_update_sd_to_sf=" /* Erase SPI NOR and install U-Boot from SD */ \ + "dh_update_block_to_sf=" /* Erase SPI NOR and install U-Boot from block device */ \ "setexpr loadaddr1 ${loadaddr} + 0x1000000 && " \ - "load mmc 0:4 ${loadaddr1} /boot/u-boot-spl.stm32 && " \ + "load ${dh_update_iface} ${dh_update_dev} " \ + "${loadaddr1} /boot/u-boot-spl.stm32 && " \ "env set filesize1 ${filesize} && " \ - "load mmc 0:4 ${loadaddr} /boot/u-boot.itb && " \ + "load ${dh_update_iface} ${dh_update_dev} " \ + "${loadaddr} /boot/u-boot.itb && " \ "sf probe && sf erase 0 0x200000 && " \ "sf update ${loadaddr1} 0 ${filesize1} && " \ "sf update ${loadaddr1} 0x40000 ${filesize1} && " \ "sf update ${loadaddr} 0x80000 ${filesize} && " \ "env set filesize1 && env set loadaddr1\0" \ + "dh_update_sd_to_sf=" /* Erase SPI NOR and install U-Boot from SD */ \ + "setenv dh_update_iface mmc && " \ + "setenv dh_update_dev 0:4 && " \ + "run dh_update_block_to_sf\0" \ + "dh_update_emmc_to_sf=" /* Erase SPI NOR and install U-Boot from eMMC */ \ + "setenv dh_update_iface mmc && " \ + "setenv dh_update_dev 1:4 && " \ + "run dh_update_block_to_sf\0" \ "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0" \ |