[PATCH] misc: Fix always compiling MISC even for SPL/TPL
We should only build support for misc if the appropriate SPL/TPL symbol is defined.
Fixes: aaba703fd0 ("spl: misc: Allow misc drivers in SPL and TPL") Signed-off-by: Sean Anderson sean.anderson@seco.com ---
drivers/misc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index f22eff601a..b7a8ef68ab 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -3,7 +3,7 @@ # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-obj-$(CONFIG_MISC) += misc-uclass.o +obj-$(CONFIG_$(SPL_TPL_)MISC) += misc-uclass.o
obj-$(CONFIG_$(SPL_TPL_)CROS_EC) += cros_ec.o obj-$(CONFIG_$(SPL_TPL_)CROS_EC_SANDBOX) += cros_ec_sandbox.o
On Tue, Apr 19, 2022 at 03:12:45PM -0400, Sean Anderson wrote:
We should only build support for misc if the appropriate SPL/TPL symbol is defined.
Fixes: aaba703fd0 ("spl: misc: Allow misc drivers in SPL and TPL") Signed-off-by: Sean Anderson sean.anderson@seco.com
drivers/misc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index f22eff601a..b7a8ef68ab 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -3,7 +3,7 @@ # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-obj-$(CONFIG_MISC) += misc-uclass.o +obj-$(CONFIG_$(SPL_TPL_)MISC) += misc-uclass.o
obj-$(CONFIG_$(SPL_TPL_)CROS_EC) += cros_ec.o obj-$(CONFIG_$(SPL_TPL_)CROS_EC_SANDBOX) += cros_ec_sandbox.o
So, I know we talked on IRC and I thought it was all good, but, this causes problems. Today, large chunks of drivers/misc/Kconfig have SPL options that don't depend on SPL_MISC (and TPL is the same story). It's I think a straight forward effort to audit them, but it's also more than I'm comfortable doing as a fixup during testing. I hit a problem starting with sandbox_spl_defconfig but given all of the other options in there, I think it's a fair number to fix the dependencies on. Making SPL_MISC/TPL_MISC "default MISC" should keep things from suddenly breaking, I think.
Hi Tom,
On 4/22/22 3:56 PM, Tom Rini wrote:
On Tue, Apr 19, 2022 at 03:12:45PM -0400, Sean Anderson wrote:
We should only build support for misc if the appropriate SPL/TPL symbol is defined.
Fixes: aaba703fd0 ("spl: misc: Allow misc drivers in SPL and TPL") Signed-off-by: Sean Anderson sean.anderson@seco.com
drivers/misc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index f22eff601a..b7a8ef68ab 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -3,7 +3,7 @@ # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-obj-$(CONFIG_MISC) += misc-uclass.o +obj-$(CONFIG_$(SPL_TPL_)MISC) += misc-uclass.o
obj-$(CONFIG_$(SPL_TPL_)CROS_EC) += cros_ec.o obj-$(CONFIG_$(SPL_TPL_)CROS_EC_SANDBOX) += cros_ec_sandbox.o
So, I know we talked on IRC and I thought it was all good, but, this causes problems. Today, large chunks of drivers/misc/Kconfig have SPL options that don't depend on SPL_MISC (and TPL is the same story). It's I think a straight forward effort to audit them, but it's also more than I'm comfortable doing as a fixup during testing. I hit a problem starting with sandbox_spl_defconfig but given all of the other options in there, I think it's a fair number to fix the dependencies on. Making SPL_MISC/TPL_MISC "default MISC" should keep things from suddenly breaking, I think.
OK, I'll send a v2 with that added.
--Sean
participants (2)
-
Sean Anderson -
Tom Rini