[PATCH] Revert "serdev: simplify Makefile"

[PATCH] Revert "serdev: simplify Makefile"

[Johan Hovold]

This reverts commit 54edb425346a4d5e17f7e54e8c97c0d0eac26315.

The offending commit caused serdev core to always be built-in, something
which breaks the build of dependent modules when serdev is being built
as a module:

ERROR: "__serdev_device_driver_register" [drivers/gnss/gnss-ubx.ko] undefined!
...
make[2]: *** [/home/johan/work/omicron/src/linux/scripts/Makefile.modpost:94: __modpost] Error 1

Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/tty/serdev/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/serdev/Makefile b/drivers/tty/serdev/Makefile
index f71bb931735b..078417e5b068 100644
--- a/drivers/tty/serdev/Makefile
+++ b/drivers/tty/serdev/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 serdev-objs := core.o
 
-obj-y += serdev.o
+obj-$(CONFIG_SERIAL_DEV_BUS) += serdev.o
 
 obj-$(CONFIG_SERIAL_DEV_CTRL_TTYPORT) += serdev-ttyport.o
-- 
2.24.1

Re: [PATCH] Revert "serdev: simplify Makefile"

[Greg Kroah-Hartman]

On Wed, Dec 18, 2019 at 02:11:54PM +0100, Johan Hovold wrote:
> This reverts commit 54edb425346a4d5e17f7e54e8c97c0d0eac26315.
> 
> The offending commit caused serdev core to always be built-in, something
> which breaks the build of dependent modules when serdev is being built
> as a module:
> 
> ERROR: "__serdev_device_driver_register" [drivers/gnss/gnss-ubx.ko] undefined!
> ...
> make[2]: *** [/home/johan/work/omicron/src/linux/scripts/Makefile.modpost:94: __modpost] Error 1
> 
> Reported-by: kbuild test robot <lkp@intel.com>
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---
>  drivers/tty/serdev/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Heh, give me a chance to catch up here, I would have reverted it on my
own :)

I'll go queue this up now, thanks.

greg k-h

Re: [PATCH] Revert "serdev: simplify Makefile"

[Johan Hovold]

On Wed, Dec 18, 2019 at 03:00:16PM +0100, Greg Kroah-Hartman wrote:
> On Wed, Dec 18, 2019 at 02:11:54PM +0100, Johan Hovold wrote:
> > This reverts commit 54edb425346a4d5e17f7e54e8c97c0d0eac26315.
> > 
> > The offending commit caused serdev core to always be built-in, something
> > which breaks the build of dependent modules when serdev is being built
> > as a module:
> > 
> > ERROR: "__serdev_device_driver_register" [drivers/gnss/gnss-ubx.ko] undefined!
> > ...
> > make[2]: *** [/home/johan/work/omicron/src/linux/scripts/Makefile.modpost:94: __modpost] Error 1
> > 
> > Reported-by: kbuild test robot <lkp@intel.com>
> > Signed-off-by: Johan Hovold <johan@kernel.org>
> > ---
> >  drivers/tty/serdev/Makefile | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Heh, give me a chance to catch up here, I would have reverted it on my
> own :)

Heh, good. :)

> I'll go queue this up now, thanks.

Johan