dm: i2c: Allow muxes to be enabled for SPL separately

Since I2C muxes are seldom needed in SPL, and the code for this increases
the size somewhat, add a separate option to enable I2C muxes for SPL.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index 811ad9b72a0eb786ad656f9c47e9ef44c50edfb6..bbbc0dc59d6886c11e4575f0239168bd54c85ae5 100644 (file)
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -7,8 +7,8 @@
 obj-$(CONFIG_DM_I2C) += i2c-uclass.o
 obj-$(CONFIG_DM_I2C_COMPAT) += i2c-uclass-compat.o
 obj-$(CONFIG_DM_I2C_GPIO) += i2c-gpio.o
-obj-$(CONFIG_I2C_CROS_EC_TUNNEL) += cros_ec_tunnel.o
-obj-$(CONFIG_I2C_CROS_EC_LDO) += cros_ec_ldo.o
+obj-$(CONFIG_$(SPL_)I2C_CROS_EC_TUNNEL) += cros_ec_tunnel.o
+obj-$(CONFIG_$(SPL_)I2C_CROS_EC_LDO) += cros_ec_ldo.o
 
 obj-$(CONFIG_SYS_I2C_ADI) += adi_i2c.o
 obj-$(CONFIG_I2C_MV) += mv_i2c.o

diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
index 913093d53dfa415957e77aee0717b719fc878380..f959d9de9e8b0de2883f5174bd097aaf5576a544 100644 (file)
--- a/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@ -7,6 +7,15 @@ config I2C_MUX
          bus select is handled automatically when that bus is accessed,
          using a suitable I2C MUX driver.
 
+config SPL_I2C_MUX
+       bool "Support I2C multiplexers on SPL"
+       depends on I2C_MUX
+       help
+         This enables I2C buses to be multiplexed, so that you can select
+         one of several buses using some sort of control mechanism. The
+         bus select is handled automatically when that bus is accessed,
+         using a suitable I2C MUX driver.
+
 config I2C_ARB_GPIO_CHALLENGE
        bool "GPIO-based I2C arbitration"
        depends on I2C_MUX

diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile
index 612cc2706b00a28ee5954f1e3d74051bc19a4769..47c1240d7e9ef26b041450f994a4663201315fbc 100644 (file)
--- a/drivers/i2c/muxes/Makefile
+++ b/drivers/i2c/muxes/Makefile
@@ -4,4 +4,4 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 obj-$(CONFIG_I2C_ARB_GPIO_CHALLENGE) += i2c-arb-gpio-challenge.o
-obj-$(CONFIG_I2C_MUX) += i2c-mux-uclass.o
+obj-$(CONFIG_$(SPL_)I2C_MUX) += i2c-mux-uclass.o