From: Maxime Ripard <maxime.ripard@free-electrons.com> To: u-boot@lists.denx.de Subject: [U-Boot] [PATCH v3 02/12] scripts: Makefile.lib: Sanitize DTB names Date: Fri, 24 Jun 2016 16:27:47 +0200 [thread overview] Message-ID: <20160624142757.32735-3-maxime.ripard@free-electrons.com> (raw) In-Reply-To: <20160624142757.32735-1-maxime.ripard@free-electrons.com> Having dashes as a separator in the DTB name is a quite common practice. However, the current code to generate objects from DTBs assumes the separator is an underscore, leading to a compilation error when building a device tree with dashes. Replace all the dashes in the DTB name to generate the symbols name, which should solve this issue. Acked-by: Simon Glass <sjg@chromium.org> Acked-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- scripts/Makefile.lib | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index e720562623c9..45a0e1d486c0 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -275,11 +275,11 @@ cmd_dt_S_dtb= \ ( \ echo '.section .dtb.init.rodata,"a"'; \ echo '.balign 16'; \ - echo '.global __dtb_$(*F)_begin'; \ - echo '__dtb_$(*F)_begin:'; \ + echo '.global __dtb_$(subst -,_,$(*F))_begin'; \ + echo '__dtb_$(subst -,_,$(*F))_begin:'; \ echo '.incbin "$<" '; \ - echo '__dtb_$(*F)_end:'; \ - echo '.global __dtb_$(*F)_end'; \ + echo '__dtb_$(subst -,_,$(*F))_end:'; \ + echo '.global __dtb_$(subst -,_,$(*F))_end'; \ echo '.balign 16'; \ ) > $@ -- 2.9.0
WARNING: multiple messages have this Message-ID (diff)
From: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> To: Pantelis Antoniou <pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>, Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> Cc: "Boris Brezillon" <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>, "Alexander Kaplan" <alex-MflLfwwFzuz+yO7R74ARew@public.gmane.org>, "Thomas Petazzoni" <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>, devicetree-compiler-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, "Antoine Ténart" <antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>, "Hans de Goede" <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, "Tom Rini" <trini-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>, u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org, "Stefan Agner" <stefan-XLVq0VzYD2Y@public.gmane.org>, "Maxime Ripard" <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> Subject: [PATCH v3 02/12] scripts: Makefile.lib: Sanitize DTB names Date: Fri, 24 Jun 2016 16:27:47 +0200 [thread overview] Message-ID: <20160624142757.32735-3-maxime.ripard@free-electrons.com> (raw) In-Reply-To: <20160624142757.32735-1-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> Having dashes as a separator in the DTB name is a quite common practice. However, the current code to generate objects from DTBs assumes the separator is an underscore, leading to a compilation error when building a device tree with dashes. Replace all the dashes in the DTB name to generate the symbols name, which should solve this issue. Acked-by: Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> Acked-by: Pantelis Antoniou <pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org> Signed-off-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> --- scripts/Makefile.lib | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index e720562623c9..45a0e1d486c0 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -275,11 +275,11 @@ cmd_dt_S_dtb= \ ( \ echo '.section .dtb.init.rodata,"a"'; \ echo '.balign 16'; \ - echo '.global __dtb_$(*F)_begin'; \ - echo '__dtb_$(*F)_begin:'; \ + echo '.global __dtb_$(subst -,_,$(*F))_begin'; \ + echo '__dtb_$(subst -,_,$(*F))_begin:'; \ echo '.incbin "$<" '; \ - echo '__dtb_$(*F)_end:'; \ - echo '.global __dtb_$(*F)_end'; \ + echo '__dtb_$(subst -,_,$(*F))_end:'; \ + echo '.global __dtb_$(subst -,_,$(*F))_end'; \ echo '.balign 16'; \ ) > $@ -- 2.9.0
next prev parent reply other threads:[~2016-06-24 14:27 UTC|newest] Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-24 14:27 [U-Boot] [PATCH v3 00/12] cmd: fdt: Add device tree overlays support Maxime Ripard 2016-06-24 14:27 ` Maxime Ripard 2016-06-24 14:27 ` [U-Boot] [PATCH v3 01/12] cmd: fdt: Narrow the check for fdt addr Maxime Ripard 2016-06-24 14:27 ` Maxime Ripard 2016-06-24 14:27 ` Maxime Ripard [this message] 2016-06-24 14:27 ` [PATCH v3 02/12] scripts: Makefile.lib: Sanitize DTB names Maxime Ripard 2016-06-24 14:27 ` [U-Boot] [PATCH v3 03/12] vsprintf: Include stdarg for va_list Maxime Ripard 2016-06-24 14:27 ` Maxime Ripard 2016-06-24 14:27 ` [U-Boot] [PATCH v3 04/12] libfdt: Add new headers and defines Maxime Ripard 2016-06-24 14:27 ` Maxime Ripard 2016-06-26 2:53 ` [U-Boot] " Simon Glass 2016-06-26 2:53 ` Simon Glass 2016-06-26 15:39 ` [U-Boot] " David Gibson 2016-06-26 15:39 ` David Gibson 2016-06-27 7:25 ` [U-Boot] " Maxime Ripard 2016-06-27 7:25 ` Maxime Ripard 2016-06-28 3:02 ` [U-Boot] " David Gibson 2016-06-28 3:02 ` David Gibson 2016-06-24 14:27 ` [U-Boot] [PATCH v3 05/12] libfdt: Add iterator over properties Maxime Ripard 2016-06-24 14:27 ` Maxime Ripard 2016-06-26 2:53 ` [U-Boot] " Simon Glass 2016-06-26 2:53 ` Simon Glass 2016-06-24 14:27 ` [U-Boot] [PATCH v3 06/12] libfdt: Add max phandle retrieval function Maxime Ripard 2016-06-24 14:27 ` Maxime Ripard 2016-06-26 2:53 ` [U-Boot] " Simon Glass 2016-06-26 2:53 ` Simon Glass 2016-06-24 14:27 ` [U-Boot] [PATCH v3 07/12] libfdt: Add fdt_setprop_inplace_by_index Maxime Ripard 2016-06-24 14:27 ` Maxime Ripard 2016-06-26 2:53 ` [U-Boot] " Simon Glass 2016-06-26 2:53 ` Simon Glass 2016-06-26 8:09 ` [U-Boot] " Maxime Ripard 2016-06-26 8:09 ` Maxime Ripard 2016-06-26 15:45 ` [U-Boot] " David Gibson 2016-06-26 15:45 ` David Gibson 2016-06-27 9:16 ` [U-Boot] " Maxime Ripard 2016-06-27 9:16 ` Maxime Ripard 2016-06-28 3:05 ` [U-Boot] " David Gibson 2016-06-28 3:05 ` David Gibson 2016-06-24 14:27 ` [U-Boot] [PATCH v3 08/12] libfdt: Add fdt_path_offset_namelen Maxime Ripard 2016-06-24 14:27 ` Maxime Ripard 2016-06-26 2:53 ` [U-Boot] " Simon Glass 2016-06-26 2:53 ` Simon Glass 2016-06-26 8:10 ` [U-Boot] " Maxime Ripard 2016-06-26 8:10 ` Maxime Ripard 2016-06-29 3:27 ` [U-Boot] " Simon Glass 2016-06-29 3:27 ` Simon Glass 2016-06-26 15:47 ` [U-Boot] " David Gibson 2016-06-26 15:47 ` David Gibson 2016-06-24 14:27 ` [U-Boot] [PATCH v3 09/12] libfdt: Add fdt_getprop_namelen_w Maxime Ripard 2016-06-24 14:27 ` Maxime Ripard 2016-06-26 2:53 ` [U-Boot] " Simon Glass 2016-06-26 2:53 ` Simon Glass 2016-06-26 8:11 ` [U-Boot] " Maxime Ripard 2016-06-26 8:11 ` Maxime Ripard 2016-06-26 15:49 ` [U-Boot] " David Gibson 2016-06-26 15:49 ` David Gibson 2016-06-27 7:29 ` [U-Boot] " Maxime Ripard 2016-06-27 7:29 ` Maxime Ripard 2016-06-24 14:27 ` [U-Boot] [PATCH v3 10/12] libfdt: Add overlay application function Maxime Ripard 2016-06-24 14:27 ` Maxime Ripard 2016-06-26 2:53 ` [U-Boot] " Simon Glass 2016-06-26 2:53 ` Simon Glass 2016-06-27 7:13 ` [U-Boot] " Maxime Ripard 2016-06-27 7:13 ` Maxime Ripard 2016-06-27 5:26 ` [U-Boot] " David Gibson 2016-06-27 5:26 ` David Gibson 2016-06-27 11:40 ` [U-Boot] " Maxime Ripard 2016-06-27 11:40 ` Maxime Ripard 2016-06-28 3:12 ` [U-Boot] " David Gibson 2016-06-28 3:12 ` David Gibson 2016-06-30 2:34 ` [U-Boot] " Frank Rowand 2016-06-30 2:34 ` Frank Rowand 2016-06-30 5:08 ` [U-Boot] " David Gibson 2016-06-30 5:08 ` David Gibson 2016-06-24 14:27 ` [U-Boot] [PATCH v3 11/12] cmd: fdt: add fdt overlay application subcommand Maxime Ripard 2016-06-24 14:27 ` Maxime Ripard 2016-06-24 14:27 ` [U-Boot] [PATCH v3 12/12] tests: Introduce DT overlay tests Maxime Ripard 2016-06-24 14:27 ` Maxime Ripard 2016-06-27 5:26 ` [U-Boot] " David Gibson 2016-06-27 5:26 ` David Gibson 2016-06-27 6:30 ` [U-Boot] " Maxime Ripard 2016-06-27 6:30 ` Maxime Ripard 2016-06-27 6:47 ` [U-Boot] " David Gibson 2016-06-27 6:47 ` David Gibson 2016-06-26 15:37 ` [U-Boot] [PATCH v3 00/12] cmd: fdt: Add device tree overlays support David Gibson 2016-06-26 15:37 ` David Gibson 2016-06-27 6:29 ` [U-Boot] " Maxime Ripard 2016-06-27 6:29 ` Maxime Ripard 2016-06-29 3:28 ` [U-Boot] " Simon Glass 2016-06-29 3:28 ` Simon Glass
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20160624142757.32735-3-maxime.ripard@free-electrons.com \ --to=maxime.ripard@free-electrons.com \ --cc=u-boot@lists.denx.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.