diff mbox series

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

Message ID 20180926015218.GA14964@WindFlash (mailing list archive)
State Not Applicable
Headers show
Series Remove errors building drivers/DRIVERNAME | expand

Commit Message

Leonardo Brás Sept. 26, 2018, 1:52 a.m. UTC
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 <leobras.c@gmail.com>
---
 drivers/nubus/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Finn Thain Sept. 26, 2018, 6:45 a.m. UTC | #1
On Tue, 25 Sep 2018, Leonardo Bras wrote:

> 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 <leobras.c@gmail.com>
> ---
>  drivers/nubus/Makefile | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/nubus/Makefile b/drivers/nubus/Makefile
> index 6d063cde39d1..827301c4a84f 100644
> --- a/drivers/nubus/Makefile
> +++ b/drivers/nubus/Makefile
> @@ -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.

--
diff mbox series

Patch

diff --git a/drivers/nubus/Makefile b/drivers/nubus/Makefile
index 6d063cde39d1..827301c4a84f 100644
--- a/drivers/nubus/Makefile
+++ b/drivers/nubus/Makefile
@@ -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