diff options
| author | Tom Rini <trini@konsulko.com> | 2022-09-27 15:53:51 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-09-27 15:53:51 +0300 |
| commit | 01c88e3dcd667281cf3aa6f6b47f90900177aff9 (patch) | |
| tree | 6bbb45f8380069622e4d67e55b7b90044d183a9f /board | |
| parent | 55ccdee3155c6cc30eeee846879d06aba6e3fabe (diff) | |
| parent | 762d410e0db94c41b8d7f1ec85e47f7474655ad8 (diff) | |
| download | u-boot-01c88e3dcd667281cf3aa6f6b47f90900177aff9.tar.xz | |
Merge tag 'u-boot-stm32-20220927' of https://source.denx.de/u-boot/custodians/u-boot-stm into next
- Increase SYS_MALLOC_F_LEN for STM32 MCU's board
- SPL fixes for STM32F7 MCUs
- Device tree alignement with kernelv6.0-rc4 for MCU's board
- Device tree alignement with kernelv6.0-rc3 for MPU's board
- Update DDR node for STM32MP15
- Cleanup config file for STM32MP1
- Update for cmd_stm32key command
- Fix compatible string to add partitions for STM32MP1
- Update for stm32programmer tool
Diffstat (limited to 'board')
| -rw-r--r-- | board/st/stm32mp1/stm32mp1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index 581a4df1cc..2d98ff41ab 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -898,8 +898,8 @@ int mmc_get_env_dev(void) int ft_board_setup(void *blob, struct bd_info *bd) { static const struct node_info nodes[] = { - { "st,stm32f469-qspi", MTD_DEV_TYPE_NOR, }, - { "st,stm32f469-qspi", MTD_DEV_TYPE_SPINAND}, + { "jedec,spi-nor", MTD_DEV_TYPE_NOR, }, + { "spi-nand", MTD_DEV_TYPE_SPINAND}, { "st,stm32mp15-fmc2", MTD_DEV_TYPE_NAND, }, { "st,stm32mp1-fmc2-nfc", MTD_DEV_TYPE_NAND, }, }; |