From: Tom Rini <trini@konsulko.com>
Date: Mon, 8 Jan 2024 18:39:00 +0000 (-0500)
Subject: Merge tag 'u-boot-imx-master-20240108' of https://gitlab.denx.de/u-boot/custodians... 
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=c5e461fbf7cc72f0c1c8a79226b6a5170e56cb4d;p=u-boot.git

Merge tag 'u-boot-imx-master-20240108' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

- Removed fdt_addr from verdin-imx8mm to fix booting via bootefi.
- Support Ethernet PHY autodection on Data Modul i.MX8M Mini/Plus eDM
  SBC
- Add i.MX93 binman support
- Add support for imx93-var-som
---

c5e461fbf7cc72f0c1c8a79226b6a5170e56cb4d
diff --cc arch/arm/mach-imx/imx9/Kconfig
index c51f80f311,28202dfe44..76c4129d79
--- a/arch/arm/mach-imx/imx9/Kconfig
+++ b/arch/arm/mach-imx/imx9/Kconfig
@@@ -29,8 -29,15 +29,15 @@@ choic
  
  config TARGET_IMX93_11X11_EVK
  	bool "imx93_11x11_evk"
 -        select BINMAN
++	select BINMAN
  	select IMX93
  
+ config TARGET_IMX93_VAR_SOM
+ 	bool "imx93_var_som"
 -        select BINMAN
++	select BINMAN
+ 	select IMX93
+ 	select IMX9_LPDDR4X
+ 
  endchoice
  
  source "board/freescale/imx93_evk/Kconfig"