diff options
| author | Tom Rini <[email protected]> | 2024-03-05 07:08:55 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-03-05 07:08:55 -0500 |
| commit | 485bfe1adbb3f6eb112424fc9e7cc399c16daef5 (patch) | |
| tree | f5ae70c57be275f23b0df7a6bfdabca260c9e0bb /configs | |
| parent | 46e3871aa66720a75da3a98a6389b56f6861ca6f (diff) | |
| parent | d61b485dbd766970816ae9da09004dc4b30f8395 (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-marvell
- net: mv88e6xxx: fix missing SMI address initialization (Marek)
- mvebu: turris_omnia: Enable networking via ethernet switch (Marek)
- mvebu: helios-4: add config fragment for spi booting et al (Josua)
- rng: Add Turris Mox rTWM RNG driver (Max)
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/helios4_defconfig | 1 | ||||
| -rw-r--r-- | configs/turris_omnia_defconfig | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig index f4f5db66cbc..72d1d771a78 100644 --- a/configs/helios4_defconfig +++ b/configs/helios4_defconfig @@ -43,7 +43,6 @@ CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig index f045dd74309..29148402a1a 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig @@ -95,7 +95,9 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_MTD=y CONFIG_PHY_MARVELL=y CONFIG_PHY_FIXED=y +CONFIG_DM_DSA=y CONFIG_PHY_GIGE=y +CONFIG_MV88E6XXX=y CONFIG_MVNETA=y CONFIG_MII=y CONFIG_MVMDIO=y |