aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2021-07-10 21:14:37 -0600
committerTom Rini <trini@konsulko.com>2021-07-26 13:33:46 -0400
commitae0f77a80aa85dbd7a4b85923e31001e2afae321 (patch)
tree87f1c124cdbfd8359ae00531b33ca8a10000a2ee
parent1d85c3aaa600588f7fa9344f2b8bf512985e63d3 (diff)
downloadu-boot-WIP/2021-07-26-build-improvements.zip
u-boot-WIP/2021-07-26-build-improvements.tar.gz
u-boot-WIP/2021-07-26-build-improvements.tar.bz2
Makefile: Move drivers/i2c/ into drivers/MakefileWIP/2021-07-26-build-improvements
This rule should not be in the top-level Makefile. Now that we have a consistent set of I2C Kconfigs for U-Boot proper, SPL and TPL, we can move it. Make use of the existing SPL/TPL rule in drivers/Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--Makefile1
-rw-r--r--drivers/Makefile4
2 files changed, 0 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index b632938..8220e02 100644
--- a/Makefile
+++ b/Makefile
@@ -815,7 +815,6 @@ libs-y += disk/
libs-y += drivers/
libs-y += drivers/dma/
libs-y += drivers/gpio/
-libs-y += drivers/i2c/
libs-y += drivers/net/
libs-y += drivers/net/phy/
libs-y += drivers/power/ \
diff --git a/drivers/Makefile b/drivers/Makefile
index 2d4e302..5674927 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -9,11 +9,7 @@ obj-$(CONFIG_$(SPL_TPL_)GPIO) += gpio/
obj-$(CONFIG_$(SPL_TPL_)DRIVERS_MISC) += misc/
obj-$(CONFIG_$(SPL_TPL_)SYSRESET) += sysreset/
obj-$(CONFIG_$(SPL_TPL_)FIRMWARE) +=firmware/
-
-# This is needed for now, until we drop the i2c/ rule in the top-level Makefile
-ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_$(SPL_TPL_)I2C) += i2c/
-endif
obj-$(CONFIG_$(SPL_TPL_)INPUT) += input/
obj-$(CONFIG_$(SPL_TPL_)LED) += led/
obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) += mmc/