summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2025-02-10 10:29:36 -0600
committerTom Rini <trini@konsulko.com>2025-02-10 10:29:36 -0600
commit530fc5c9e5670be62b3183cd54b42e5169d19fdf (patch)
tree76a6a83730c95d7ab361721efec551ad04e8ab20
parent5b280448bb4e188db27d159b196c1eab4c0f7628 (diff)
parentd700d04dd29789a4fe81471fb2b0724c42702d35 (diff)
Merge patch series "FIX: Re-enable MUX_MMIO on J721E/J7200"
Siddharth Vadapalli <s-vadapalli@ti.com> says: Hello, This series re-enables MUX_MMIO at U-Boot proper on J721E and J7200 SoCs. The commits which introduced support for Hyperflash boot on both of these SoCs disabled MUX_MMIO functionality at U-Boot proper, thereby introducing a regression. Series is based on commit 2b1c8d3b2d cmd: Fix Kconfig coding style of the master branch of U-Boot. Link: https://lore.kernel.org/r/20250201091809.1894892-1-s-vadapalli@ti.com
-rw-r--r--configs/j7200_evm_a72_defconfig1
-rw-r--r--configs/j721e_evm_a72_defconfig2
2 files changed, 2 insertions, 1 deletions
diff --git a/configs/j7200_evm_a72_defconfig b/configs/j7200_evm_a72_defconfig
index e1ef6e86d49..ac5b10ba149 100644
--- a/configs/j7200_evm_a72_defconfig
+++ b/configs/j7200_evm_a72_defconfig
@@ -144,6 +144,7 @@ CONFIG_SPI_FLASH_S28HX_T=y
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
CONFIG_SPI_FLASH_MTD=y
CONFIG_MULTIPLEXER=y
+CONFIG_MUX_MMIO=y
CONFIG_PHY_TI_DP83869=y
CONFIG_PHY_FIXED=y
CONFIG_TI_AM65_CPSW_NUSS=y
diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig
index 3928430f166..1ddb1965d8b 100644
--- a/configs/j721e_evm_a72_defconfig
+++ b/configs/j721e_evm_a72_defconfig
@@ -151,7 +151,7 @@ CONFIG_SPI_FLASH_MT35XU=y
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
CONFIG_SPI_FLASH_MTD=y
CONFIG_MULTIPLEXER=y
-CONFIG_SPL_MUX_MMIO=y
+CONFIG_MUX_MMIO=y
CONFIG_PHY_TI_DP83867=y
CONFIG_PHY_FIXED=y
CONFIG_TI_AM65_CPSW_NUSS=y