From: Tom Rini <trini@konsulko.com>
Date: Fri, 7 Jun 2024 20:03:36 +0000 (-0600)
Subject: Merge patch series "*** phyCORE-AM62x: DDR detection / Inject DDR timing deltas ***"
X-Git-Tag: v2025.01-rc5-pxa1908~398^2~72
X-Git-Url: http://git.dujemihanovic.xyz/html/static/%7B%7B%20%24.Site.BaseURL%20%7D%7Dposts/index.xml?a=commitdiff_plain;h=0329779bfb911221c056e50710773731619b0310;p=u-boot.git

Merge patch series "*** phyCORE-AM62x: DDR detection / Inject DDR timing deltas ***"

Wadim Egorov <w.egorov@phytec.de> says:

Changes in v2:
  - Reabse to current next
  - Add Tested-by: John Ma <jma@phytec.com>
  - Add Kconfig option to select RAM size statically
  - Make board/phytec/common/k3 always compile for CONFIG_ARCH_K3

v1: https://lists.denx.de/pipermail/u-boot/2024-May/553057.html
---

0329779bfb911221c056e50710773731619b0310
diff --cc board/phytec/common/Kconfig
index 668afe2a53,56c8290f64..f394ace786
--- a/board/phytec/common/Kconfig
+++ b/board/phytec/common/Kconfig
@@@ -23,7 -16,7 +23,8 @@@ config PHYTEC_AM62_SOM_DETECTIO
  	bool "Support SoM detection for AM62x PHYTEC platforms"
  	depends on (TARGET_PHYCORE_AM62X_A53 || TARGET_PHYCORE_AM62X_R5) && \
  		   PHYTEC_SOM_DETECTION
 +	select PHYTEC_SOM_DETECTION_BLOCKS
+ 	depends on SPL_I2C && DM_I2C
  	default y
  	help
  	   Support of I2C EEPROM based SoM detection. Supported
@@@ -33,7 -26,7 +34,8 @@@ config PHYTEC_AM64_SOM_DETECTIO
  	bool "Support SoM detection for AM64x PHYTEC platforms"
  	depends on (TARGET_PHYCORE_AM64X_A53 || TARGET_PHYCORE_AM64X_R5) && \
  		   PHYTEC_SOM_DETECTION
 +	select PHYTEC_SOM_DETECTION_BLOCKS
+ 	depends on SPL_I2C && DM_I2C
  	default y
  	help
  	   Support of I2C EEPROM based SoM detection. Supported
diff --cc board/phytec/common/Makefile
index 446c481a6e,988c5742db..04469d0a92
--- a/board/phytec/common/Makefile
+++ b/board/phytec/common/Makefile
@@@ -5,10 -5,8 +5,8 @@@
  ifdef CONFIG_SPL_BUILD
  # necessary to create built-in.o
  obj- := __dummy__.o
- else
- obj-$(CONFIG_ARCH_K3) += k3/
  endif
  
 -obj-y += phytec_som_detection.o
 +obj-y += phytec_som_detection.o phytec_som_detection_blocks.o
- obj-$(CONFIG_ARCH_K3) += am6_som_detection.o
+ obj-$(CONFIG_ARCH_K3) += am6_som_detection.o k3/
  obj-$(CONFIG_ARCH_IMX8M) += imx8m_som_detection.o