summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2026-06-24 10:02:34 -0600
committerTom Rini <[email protected]>2026-06-24 10:02:34 -0600
commit77a48fa272161df9b778ffc09af814eec11cddd2 (patch)
tree69ac4345f7f9696f0c7f79fdaddf81e3ef4577eb /drivers
parentfcda974e36033ad5331a9b4a4a551af4e141ad7d (diff)
parentb4fa246a1565aa63375de06b732c6d1eb1f82d27 (diff)
Merge tag 'mediatek-for-master-2026-06-24' of https://source.denx.de/u-boot/custodians/u-boot-mediatek
- Cherry-pick upstream devicetree fix for duplicate regulator names. - Fix regressions due to recent mach-wide cleanups accidentally changing gd->bd->bi_dram[0].size.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/Kconfig1
-rw-r--r--drivers/net/mtk_eth/Kconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 24bd16ad5f3..6c513328de2 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -858,6 +858,7 @@ config MMC_MTK
bool "MediaTek SD/MMC Card Interface support"
depends on ARCH_MEDIATEK || ARCH_MTMIPS || ARCH_AIROHA
depends on OF_CONTROL
+ imply LMB_LIMIT_DMA_BELOW_RAM_TOP
help
This selects the MediaTek(R) Secure digital and Multimedia card Interface.
If you have a machine with a integrated SD/MMC card reader, say Y here.
diff --git a/drivers/net/mtk_eth/Kconfig b/drivers/net/mtk_eth/Kconfig
index 5d4e54ab90e..7d58f542bde 100644
--- a/drivers/net/mtk_eth/Kconfig
+++ b/drivers/net/mtk_eth/Kconfig
@@ -5,6 +5,7 @@ config MEDIATEK_ETH
select PHYLIB
select DM_GPIO
select DM_RESET
+ select LMB_LIMIT_DMA_BELOW_RAM_TOP
help
This Driver support MediaTek Ethernet GMAC
Say Y to enable support for the MediaTek Ethernet GMAC.