mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
Merge patch series "Update SoM detection related code and configs"
Wadim Egorov <w.egorov@phytec.de> says: Update Kconfig options for phyCORE-AM62Ax to align with other boards and prepare common board code for the upcoming phyCORE-AM62L which has the SoM EEPROM connected on a different bus. Link: https://lore.kernel.org/r/20250815111051.2277173-1-w.egorov@phytec.de
This commit is contained in:
@@ -42,7 +42,7 @@ config PHYTEC_AM62A_SOM_DETECTION
|
||||
bool "Support SoM detection for AM62Ax PHYTEC platforms"
|
||||
depends on (TARGET_PHYCORE_AM62AX_A53 || TARGET_PHYCORE_AM62AX_R5) && \
|
||||
PHYTEC_SOM_DETECTION
|
||||
select SUPPORT_EXTENSION_SCAN
|
||||
select PHYTEC_SOM_DETECTION_BLOCKS
|
||||
depends on SPL_I2C && DM_I2C
|
||||
default y
|
||||
help
|
||||
@@ -59,3 +59,9 @@ config PHYTEC_AM64_SOM_DETECTION
|
||||
help
|
||||
Support of I2C EEPROM based SoM detection. Supported
|
||||
for PHYTEC AM64x boards.
|
||||
|
||||
config PHYTEC_EEPROM_BUS
|
||||
int "Board EEPROM's I2C bus number"
|
||||
range 0 8
|
||||
default 0
|
||||
depends on PHYTEC_SOM_DETECTION
|
||||
|
||||
@@ -183,7 +183,7 @@ static void setup_mac_from_eeprom(void)
|
||||
struct phytec_eeprom_data data;
|
||||
int ret;
|
||||
|
||||
ret = phytec_eeprom_data_setup(&data, 0, EEPROM_ADDR);
|
||||
ret = phytec_eeprom_data_setup(&data, CONFIG_PHYTEC_EEPROM_BUS, EEPROM_ADDR);
|
||||
if (ret || !data.valid)
|
||||
return;
|
||||
|
||||
@@ -248,7 +248,7 @@ static void fdt_apply_som_overlays(void *blob)
|
||||
|
||||
memcpy(fdt_copy, blob, fdt_size);
|
||||
|
||||
err = phytec_eeprom_data_setup(&data, 0, EEPROM_ADDR);
|
||||
err = phytec_eeprom_data_setup(&data, CONFIG_PHYTEC_EEPROM_BUS, EEPROM_ADDR);
|
||||
if (err)
|
||||
goto fixup_error;
|
||||
|
||||
@@ -295,7 +295,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
|
||||
fdt_apply_som_overlays(blob);
|
||||
fdt_copy_fixed_partitions(blob);
|
||||
|
||||
ret = phytec_eeprom_data_setup(&data, 0, EEPROM_ADDR);
|
||||
ret = phytec_eeprom_data_setup(&data, CONFIG_PHYTEC_EEPROM_BUS, EEPROM_ADDR);
|
||||
if (ret || !data.valid)
|
||||
return 0;
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
||||
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
||||
CONFIG_SOC_K3_AM62A7=y
|
||||
CONFIG_PHYTEC_SOM_DETECTION=y
|
||||
CONFIG_PHYTEC_SOM_DETECTION_BLOCKS=y
|
||||
CONFIG_TARGET_PHYCORE_AM62AX_A53=y
|
||||
CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
|
||||
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80480000
|
||||
|
||||
Reference in New Issue
Block a user