diff --git a/Makefile b/Makefile
index 4f386ed47b6..b4ae66b2014 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 2d4e30229b6..56749278f43 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/