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/[email protected]/T/#m27f781ab60acadfed8a9e9642f30d5414a5e2df3
Signed-off-by: Masahiro Yamada <[email protected]>
Tested-by: Jiri Slaby <[email protected]>
---
Changes in v2:
- rephase the commit log
arch/s390/Makefile | 1 -
drivers/Makefile | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 5ed242897b0d..a53a36ee0731 100644
--- 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 7241d80a7b29..a7459e77df37 100644
--- 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/
--
2.39.2
On Sat, Jul 22, 2023 at 02:13:58AM +0900, Masahiro Yamada wrote:
> 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/[email protected]/T/#m27f781ab60acadfed8a9e9642f30d5414a5e2df3
>
> Signed-off-by: Masahiro Yamada <[email protected]>
> Tested-by: Jiri Slaby <[email protected]>
> ---
>
> Changes in v2:
> - rephase the commit log
>
> arch/s390/Makefile | 1 -
> drivers/Makefile | 2 ++
> 2 files changed, 2 insertions(+), 1 deletion(-)
Applied, thanks!