drivers: nubus: Avoids building driver if CONFIG_NUBUS is disabled

PATCH Superseded Leonardo Brás 2 participants 2 messages Sep 26, 2018

Subsystems (2)

s390 Nubus

lore

Share & tools

lore

Leonardo Brás

author

2018-09-26 01:52 UTC #0 lore raw

PATCH 2/7 drivers: nubus: Avoids building driver if CONFIG_NUBUS is disabled

Avoids building driver if 'make drivers/nubus/' is called and CONFIG_NUBUS is disabled.
Avoids building proc.o if CONFIG_PROC_FS is enabled but CONFIG_NUBUS is disabled.

Signed-off-by Leonardo Brás <[email protected]>

---
 drivers/nubus/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/nubus/Makefile +3 -3

index 6d063cde39d1..827301c4a84f 100644
@@ -2,6 +2,6 @@
 # Makefile for the nubus specific drivers.
 #
 
-obj-y := nubus.o bus.o
-
-obj-$(CONFIG_PROC_FS) += proc.o
+obj-$(CONFIG_NUBUS) := nubus.o
+nubus-y := bus.o
+nubus-$(CONFIG_PROC_FS) += proc.o

Signature · 1 line

2.19.0

Finn Thain

2018-09-26 06:44 UTC #1 lore raw

Quoted 16 lines · Leonardo Bras

Avoids building driver if 'make drivers/nubus/' is called and CONFIG_NUBUS is disabled.
Avoids building proc.o if CONFIG_PROC_FS is enabled but CONFIG_NUBUS is disabled.
Signed-off-by Leonardo Bras <[email protected]>
---
 drivers/nubus/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/nubus/Makefile +0 -0
index 6d063cde39d1..827301c4a84f 100644

drivers/nubus/Makefile line 7

Quoted 9 lines

drivers/nubus/Makefile +3 -3

@@ -2,6 +2,6 @@
 # Makefile for the nubus specific drivers.
 #
 
-obj-y := nubus.o bus.o
-
-obj-$(CONFIG_PROC_FS) += proc.o
+obj-$(CONFIG_NUBUS) := nubus.o
+nubus-y := bus.o
+nubus-$(CONFIG_PROC_FS) += proc.o

Did you build this for m68k? It doesn't link for me.

MODPOST vmlinux.o
drivers/nubus/bus.o: In function `nubus_device_release':
bus.c:(.text+0xd0): undefined reference to nubus_func_rsrcs' bus.c:(.text+0xe0): undefined reference to nubus_func_rsrcs' bus.c:(.text+0x118): undefined reference to nubus_func_rsrcs' bus.c:(.text+0xc2): undefined reference to nubus_func_rsrcs' drivers/nubus/proc.o: In function `nubus_devices_proc_show':
proc.c:(.text+0xa): undefined reference to nubus_first_rsrc_or_null' proc.c:(.text+0x1c): undefined reference to nubus_next_rsrc_or_null' drivers/nubus/proc.o: In function `nubus_proc_rsrc_show':
proc.c:(.text+0x190): undefined reference to nubus_seq_write_rsrc_mem' drivers/nubus/proc.o: In function nubus_proc_add_rsrc_mem':
proc.c:(.text+0x24c): undefined reference to `nubus_dirptr'

Patch 4/7 (drivers/zorro) also causes 'undefined reference' errors. I didn't test the others.