[PATCH] sh: Fix built-in DTB build with generic rule

[PATCH] sh: Fix built-in DTB build with generic rule

[Florian Fuchs]

Commit 21bcc49974c2 ("sh: Migrate to the generic rule for built-in DTB")
selected GENERIC_BUILTIN_DTB and renamed the Kconfig symbols, but left
arch/sh/boot/dts/Makefile using the old obj-y form. So convert them as
well, to fix the build error when using CONFIG_BUILTIN_DTB.

Fixes: 21bcc49974c2 ("sh: Migrate to the generic rule for built-in DTB")
Signed-off-by: Florian Fuchs <fuchsfl@gmail.com>
---
The fix is the same like at other places like openrisc or nios.
Without that, the build fails, when building with builtin device tree:
CONFIG_BUILTIN_DTB=y
CONFIG_BUILTIN_DTB_NAME="j2_mimas_v2"
with an error like:
.builtin-dtbs.S:6: Error: file not found: arch/sh/boot/dts/j2_mimas_v2.dtb
---
 arch/sh/boot/dts/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/sh/boot/dts/Makefile b/arch/sh/boot/dts/Makefile
index d109978a5eb9..16e281b859ae 100644
--- a/arch/sh/boot/dts/Makefile
+++ b/arch/sh/boot/dts/Makefile
@@ -1,2 +1,2 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_NAME))
+dtb-y += $(addsuffix .dtb, $(CONFIG_BUILTIN_DTB_NAME))
-- 
2.43.0

Re: [PATCH] sh: Fix built-in DTB build with generic rule

[John Paul Adrian Glaubitz]

Hi Florian,

On Sat, 2026-07-11 at 02:01 +0200, Florian Fuchs wrote:
> Commit 21bcc49974c2 ("sh: Migrate to the generic rule for built-in DTB")
> selected GENERIC_BUILTIN_DTB and renamed the Kconfig symbols, but left
> arch/sh/boot/dts/Makefile using the old obj-y form. So convert them as
> well, to fix the build error when using CONFIG_BUILTIN_DTB.
> 
> Fixes: 21bcc49974c2 ("sh: Migrate to the generic rule for built-in DTB")
> Signed-off-by: Florian Fuchs <fuchsfl@gmail.com>
> ---
> The fix is the same like at other places like openrisc or nios.
> Without that, the build fails, when building with builtin device tree:
> CONFIG_BUILTIN_DTB=y
> CONFIG_BUILTIN_DTB_NAME="j2_mimas_v2"
> with an error like:
> .builtin-dtbs.S:6: Error: file not found: arch/sh/boot/dts/j2_mimas_v2.dtb
> ---
>  arch/sh/boot/dts/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/sh/boot/dts/Makefile b/arch/sh/boot/dts/Makefile
> index d109978a5eb9..16e281b859ae 100644
> --- a/arch/sh/boot/dts/Makefile
> +++ b/arch/sh/boot/dts/Makefile
> @@ -1,2 +1,2 @@
>  # SPDX-License-Identifier: GPL-2.0-only
> -obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_NAME))
> +dtb-y += $(addsuffix .dtb, $(CONFIG_BUILTIN_DTB_NAME))

Good catch, thanks a lot!

Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer
`. `'   Physicist
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Re: [PATCH] sh: Fix built-in DTB build with generic rule

[John Paul Adrian Glaubitz]

On Sat, 2026-07-11 at 02:01 +0200, Florian Fuchs wrote:
> Commit 21bcc49974c2 ("sh: Migrate to the generic rule for built-in DTB")
> selected GENERIC_BUILTIN_DTB and renamed the Kconfig symbols, but left
> arch/sh/boot/dts/Makefile using the old obj-y form. So convert them as
> well, to fix the build error when using CONFIG_BUILTIN_DTB.
> 
> Fixes: 21bcc49974c2 ("sh: Migrate to the generic rule for built-in DTB")
> Signed-off-by: Florian Fuchs <fuchsfl@gmail.com>
> ---
> The fix is the same like at other places like openrisc or nios.
> Without that, the build fails, when building with builtin device tree:
> CONFIG_BUILTIN_DTB=y
> CONFIG_BUILTIN_DTB_NAME="j2_mimas_v2"
> with an error like:
> .builtin-dtbs.S:6: Error: file not found: arch/sh/boot/dts/j2_mimas_v2.dtb
> ---
>  arch/sh/boot/dts/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/sh/boot/dts/Makefile b/arch/sh/boot/dts/Makefile
> index d109978a5eb9..16e281b859ae 100644
> --- a/arch/sh/boot/dts/Makefile
> +++ b/arch/sh/boot/dts/Makefile
> @@ -1,2 +1,2 @@
>  # SPDX-License-Identifier: GPL-2.0-only
> -obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_NAME))
> +dtb-y += $(addsuffix .dtb, $(CONFIG_BUILTIN_DTB_NAME))

Merged into for-next for v7.4.

Thanks,
Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer
`. `'   Physicist
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913