Skip to contentSkip to conversation

Revert "serdev: simplify Makefile"

PATCH In review Johan Hovold 2 participants 3 messages Dec 18, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "serdev: simplify Makefile"

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

---
 drivers/tty/serdev/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serdev/Makefile +1 -1
index f71bb931735b..078417e5b068 100644
@@ -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
Signature · 1 line
2.24.1
#1 lore raw
Quoted 10 lines · 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

Quoted 5 lines
---
 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

#2 lore raw
Quoted 11 lines · Greg Kroah-Hartman
Quoted 10 lines · 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

Quoted 8 lines
Quoted 5 lines
---
 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. :)

Quoted 1 line

I'll go queue this up now, thanks.

Johan