]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge patch series "*** phyCORE-AM62x: DDR detection / Inject DDR timing deltas ***"
authorTom Rini <trini@konsulko.com>
Fri, 7 Jun 2024 20:03:36 +0000 (14:03 -0600)
committerTom Rini <trini@konsulko.com>
Fri, 7 Jun 2024 20:03:36 +0000 (14:03 -0600)
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

1  2 
board/phytec/common/Kconfig
board/phytec/common/Makefile
configs/phycore_am62x_a53_defconfig

index 668afe2a5341fc05a171ebd3071059df17ad3a12,56c8290f64164786e7484f6be3956abdb01f676b..f394ace786a1be2715f65b022d88e30c39fbdc1c
@@@ -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
index 446c481a6e6893cfe59d66d7e2af36c830990aea,988c5742db53711642fa9a01b4aacb7714b3cc32..04469d0a92482432ee9654a58bbce8b5ccaf3125
@@@ -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
Simple merge