diff mbox

hsi: Build hsi_boardinfo.c into hsi core if enabled

Message ID 57602D10.4080708@ti.com
State Not Applicable
Headers show

Commit Message

Andrew Davis June 14, 2016, 4:13 p.m. UTC
If the HSI core is built as a module hsi_boardinfo may still
be built-in as its Kconfig type is bool, which can cause build
issues. Fix this by building this code into the HSI core when
enabled.

Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
This build error seems to be due to Kconfig symbol CONFIG_HSI_BOARDINFO
being a bool but depending on a tristate (CONFIG_HSI). This is normally
okay when it is just a flag to enable a feature in source, but the
helper code file hsi_boardinfo.c is built as a separate entity when
enabled. This patch is probably how it was intended, and is more like
how others do this kind of thing.

This patch should be applied before the parent patch:

 drivers/hsi/Makefile              | 3 ++-
 drivers/hsi/{hsi.c => hsi_core.c} | 0
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename drivers/hsi/{hsi.c => hsi_core.c} (100%)

Comments

Sebastian Reichel June 15, 2016, 12:48 p.m. UTC | #1
Hi Andrew,

On Tue, Jun 14, 2016 at 11:13:04AM -0500, Andrew F. Davis wrote:
> If the HSI core is built as a module hsi_boardinfo may still
> be built-in as its Kconfig type is bool, which can cause build
> issues. Fix this by building this code into the HSI core when
> enabled.
> 
> Reported-by: kbuild test robot <lkp@intel.com>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> ---
> This build error seems to be due to Kconfig symbol CONFIG_HSI_BOARDINFO
> being a bool but depending on a tristate (CONFIG_HSI). This is normally
> okay when it is just a flag to enable a feature in source, but the
> helper code file hsi_boardinfo.c is built as a separate entity when
> enabled. This patch is probably how it was intended, and is more like
> how others do this kind of thing.
> 
> This patch should be applied before the parent patch:

Thanks, I applied both patches.

-- Sebastian
diff mbox

Patch

diff --git a/drivers/hsi/Makefile b/drivers/hsi/Makefile
index 360371e..9694478 100644
--- a/drivers/hsi/Makefile
+++ b/drivers/hsi/Makefile
@@ -1,7 +1,8 @@ 
 #
 # Makefile for HSI
 #
-obj-$(CONFIG_HSI_BOARDINFO)    += hsi_boardinfo.o
 obj-$(CONFIG_HSI)              += hsi.o
+hsi-objs                       := hsi_core.o
+hsi-$(CONFIG_HSI_BOARDINFO)    += hsi_boardinfo.o
 obj-y                          += controllers/
 obj-y                          += clients/
diff --git a/drivers/hsi/hsi.c b/drivers/hsi/hsi_core.c
similarity index 100%
rename from drivers/hsi/hsi.c
rename to drivers/hsi/hsi_core.c