sh: Fix built-in DTB build with generic rule
Subsystems (2)
PATCH 1/1 sh: Fix built-in DTB build with generic rule
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.
---
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=yCONFIG_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(-)
arch/sh/boot/dts/Makefile +1 -1
@@ -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))
Signature · 1 line
2.43.0
Hi Florian,
Quoted 23 lines · Florian Fuchs
Commit
21bcc49974c2("sh: Migrate to the generic rule for built-in DTB") selectedGENERIC_BUILTIN_DTBand renamed theKconfigsymbols, but leftarch/sh/boot/dts/Makefileusing the old obj-y form. So convert them as well, to fix the build error when usingCONFIG_BUILTIN_DTB.Fixes 21bcc49974c2 ("sh: Migrate to the generic rule for built-in DTB")Signed-off-by Florian Fuchs <[email protected]>---
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=yCONFIG_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(-)arch/sh/boot/dts/Makefile +0
-0
arch/sh/boot/dts/Makefile line 2
Quoted 3 lines
arch/sh/boot/dts/Makefile +1
-1@@ -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!
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Quoted 23 lines · Florian Fuchs
Commit
21bcc49974c2("sh: Migrate to the generic rule for built-in DTB") selectedGENERIC_BUILTIN_DTBand renamed theKconfigsymbols, but leftarch/sh/boot/dts/Makefileusing the old obj-y form. So convert them as well, to fix the build error when usingCONFIG_BUILTIN_DTB.Fixes 21bcc49974c2 ("sh: Migrate to the generic rule for built-in DTB")Signed-off-by Florian Fuchs <[email protected]>---
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=yCONFIG_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(-)arch/sh/boot/dts/Makefile +0
-0
arch/sh/boot/dts/Makefile line 2
Quoted 3 lines
arch/sh/boot/dts/Makefile +1
-1@@ -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
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913