From 537892065ac1428a48193d4b0fa7bf827e8d0d44 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 10 Jul 2021 21:14:37 -0600 Subject: [PATCH] Makefile: Move drivers/i2c/ into drivers/Makefile 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 --- Makefile | 1 - drivers/Makefile | 4 ---- 2 files changed, 5 deletions(-) diff --git a/Makefile b/Makefile index 4f386ed47b..b4ae66b201 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 2d4e30229b..56749278f4 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/ -- 2.39.5