s390: use obj-y to descend into drivers/s390/

The single build rule does not work with the drivers-y syntax. [1]

Use the standard obj-y syntax. It moves the objects from drivers/s390/
to slightly lower address, but fixes the reported issue.

[1]: https://lore.kernel.org/linux-kbuild/d57ba55f-20a3-b836-783d-b49c8a161b6e@kernel.org/T/#m27f781ab60acadfed8a9e9642f30d5414a5e2df3

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Tested-by: Jiri Slaby <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230721171358.3612099-1-masahiroy@kernel.org
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 5ed242897b0d221ddaca2fe84323552831c845fa..a53a36ee0731bb6d9ae016295ccf092e83e07223 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -119,7 +119,6 @@ export KBUILD_CFLAGS_DECOMPRESSOR
 OBJCOPYFLAGS   := -O binary
 
 libs-y         += arch/s390/lib/
-drivers-y      += drivers/s390/
 
 boot           := arch/s390/boot
 syscalls       := arch/s390/kernel/syscalls

diff --git a/drivers/Makefile b/drivers/Makefile
index 7241d80a7b293570fdd96aa321cb76d223af0bff..a7459e77df3736dd2c17d9ec8d8d8857a1b30619 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -195,3 +195,5 @@ obj-$(CONFIG_PECI)          += peci/
 obj-$(CONFIG_HTE)              += hte/
 obj-$(CONFIG_DRM_ACCEL)                += accel/
 obj-$(CONFIG_CDX_BUS)          += cdx/
+
+obj-$(CONFIG_S390)             += s390/