From: Tom Rini <trini@konsulko.com>
Date: Fri, 19 Sep 2025 14:06:22 +0000 (-0600)
Subject: Merge tag 'u-boot-stm32-20250919' of https://source.denx.de/u-boot/custodians/u-boot... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5de15f44d2d851a6f548fc0baa3273d350fb191;p=thirdparty%2Fu-boot.git

Merge tag 'u-boot-stm32-20250919' of https://source.denx.de/u-boot/custodians/u-boot-stm into next

CI:
  - https://source.denx.de/u-boot/custodians/u-boot-stm/-/pipelines/27668

STM32MP2:
  - Add SPI flashes support
  - Add RIFSC system bus driver fixes
---

a5de15f44d2d851a6f548fc0baa3273d350fb191
diff --cc drivers/memory/Kconfig
index 7c40f176987,e31c4532279..eaee739c6aa
--- a/drivers/memory/Kconfig
+++ b/drivers/memory/Kconfig
@@@ -37,6 -37,23 +37,23 @@@ config STM32_FMC2_EB
  	  devices (like SRAM, ethernet adapters, FPGAs, LCD displays, ...) on
  	  SOCs containing the FMC2 External Bus Interface.
  
+ config STM32_OMM
 -	tristate "STM32 Octo Memory Manager"
++	bool "STM32 Octo Memory Manager"
+ 	depends on ARCH_STM32MP
+ 	help
+ 	  This driver manages the muxing between the 2 OSPI busses and
+ 	  the 2 output ports. There are 4 possible muxing configurations:
+ 	  - direct mode (no multiplexing): OSPI1 output is on port 1 and OSPI2
+ 	       output is on port 2
+ 	  - OSPI1 and OSPI2 are multiplexed over the same output port 1
+ 	  - swapped mode (no multiplexing), OSPI1 output is on port 2,
+ 	       OSPI2 output is on port 1
+ 	  - OSPI1 and OSPI2 are multiplexed over the same output port 2
+ 	  It also manages :
+ 	    - the split of the memory area shared between the 2 OSPI instances.
+ 	    - chip select selection override.
+ 	    - the time between 2 transactions in multiplexed mode.
+ 
  config TI_AEMIF
  	tristate "Texas Instruments AEMIF driver"
  	depends on ARCH_KEYSTONE || ARCH_DAVINCI