Kexec Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH kexec-tools] arm: do not build iomem.o target with no soruce
@ 2016-12-09  9:12 Simon Horman
  2016-12-09 10:28 ` Pratyush Anand
  0 siblings, 1 reply; 3+ messages in thread
From: Simon Horman @ 2016-12-09  9:12 UTC (permalink / raw)
  To: kexec; +Cc: Simon Horman, Dave Young

Header files should be added to the distribution but not
used to derive targets for compilation. In this an attempt was
made to build iomem.o, but iomem.c does not exist so this fails.

Fixes: 1574ff1aae4f ("arm: include phys_to_virt.h and iomem.h in distribution")
Cc: Dave Young <dyoung@redhat.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 kexec/arch/arm/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kexec/arch/arm/Makefile b/kexec/arch/arm/Makefile
index 871979e0ae26..a1b730034de8 100644
--- a/kexec/arch/arm/Makefile
+++ b/kexec/arch/arm/Makefile
@@ -27,9 +27,9 @@ arm_KEXEC_SRCS += $(libfdt_SRCS)
 
 arm_UIMAGE = kexec/kexec-uImage.c
 arm_PHYS_TO_VIRT = kexec/arch/arm/phys_to_virt.c
-arm_PHYS_TO_VIRT += kexec/arch/arm/iomem.h
-arm_PHYS_TO_VIRT += kexec/arch/arm/phys_to_virt.h
+arm_PHYS_TO_VIRT_INCLUDE = kexec/arch/arm/iomem.h
+arm_PHYS_TO_VIRT_INCLUDE += kexec/arch/arm/phys_to_virt.h
 
 dist += kexec/arch/arm/Makefile $(arm_KEXEC_SRCS) $(arm_PHYS_TO_VIRT)	\
-	kexec/arch/arm/crashdump-arm.h kexec/arch/arm/kexec-arm.h	\
-	kexec/arch/arm/include/arch/options.h
+	$(arm_PHYS_TO_VIRT_INCLUDE) kexec/arch/arm/crashdump-arm.h \
+	kexec/arch/arm/kexec-arm.h kexec/arch/arm/include/arch/options.h
-- 
2.7.0.rc3.207.g0ac5344


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH kexec-tools] arm: do not build iomem.o target with no soruce
  2016-12-09  9:12 [PATCH kexec-tools] arm: do not build iomem.o target with no soruce Simon Horman
@ 2016-12-09 10:28 ` Pratyush Anand
  2016-12-09 10:58   ` Simon Horman
  0 siblings, 1 reply; 3+ messages in thread
From: Pratyush Anand @ 2016-12-09 10:28 UTC (permalink / raw)
  To: Simon Horman, kexec; +Cc: Dave Young



On Friday 09 December 2016 02:42 PM, Simon Horman wrote:
> Header files should be added to the distribution but not
> used to derive targets for compilation. In this an attempt was
> made to build iomem.o, but iomem.c does not exist so this fails.
>
> Fixes: 1574ff1aae4f ("arm: include phys_to_virt.h and iomem.h in distribution")
> Cc: Dave Young <dyoung@redhat.com>
> Signed-off-by: Simon Horman <horms@verge.net.au>
> ---
>  kexec/arch/arm/Makefile | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/kexec/arch/arm/Makefile b/kexec/arch/arm/Makefile
> index 871979e0ae26..a1b730034de8 100644
> --- a/kexec/arch/arm/Makefile
> +++ b/kexec/arch/arm/Makefile
> @@ -27,9 +27,9 @@ arm_KEXEC_SRCS += $(libfdt_SRCS)
>
>  arm_UIMAGE = kexec/kexec-uImage.c
>  arm_PHYS_TO_VIRT = kexec/arch/arm/phys_to_virt.c
> -arm_PHYS_TO_VIRT += kexec/arch/arm/iomem.h
> -arm_PHYS_TO_VIRT += kexec/arch/arm/phys_to_virt.h
> +arm_PHYS_TO_VIRT_INCLUDE = kexec/arch/arm/iomem.h
> +arm_PHYS_TO_VIRT_INCLUDE += kexec/arch/arm/phys_to_virt.h

Since they are needed only in dist definition, so probably we could have 
avoided to define arm_PHYS_TO_VIRT_INCLUDE  and could have added these 
files directly to dist. It will keep it similar like other makefiles 
(kexec/arch/x86_64/Makefile)

>
>  dist += kexec/arch/arm/Makefile $(arm_KEXEC_SRCS) $(arm_PHYS_TO_VIRT)	\
> -	kexec/arch/arm/crashdump-arm.h kexec/arch/arm/kexec-arm.h	\
> -	kexec/arch/arm/include/arch/options.h
> +	$(arm_PHYS_TO_VIRT_INCLUDE) kexec/arch/arm/crashdump-arm.h \
> +	kexec/arch/arm/kexec-arm.h kexec/arch/arm/include/arch/options.h
>

Otherwise, changes looks fine to me.


~Pratyush

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH kexec-tools] arm: do not build iomem.o target with no soruce
  2016-12-09 10:28 ` Pratyush Anand
@ 2016-12-09 10:58   ` Simon Horman
  0 siblings, 0 replies; 3+ messages in thread
From: Simon Horman @ 2016-12-09 10:58 UTC (permalink / raw)
  To: Pratyush Anand; +Cc: Dave Young, kexec

On Fri, Dec 09, 2016 at 03:58:21PM +0530, Pratyush Anand wrote:
> 
> 
> On Friday 09 December 2016 02:42 PM, Simon Horman wrote:
> >Header files should be added to the distribution but not
> >used to derive targets for compilation. In this an attempt was
> >made to build iomem.o, but iomem.c does not exist so this fails.
> >
> >Fixes: 1574ff1aae4f ("arm: include phys_to_virt.h and iomem.h in distribution")
> >Cc: Dave Young <dyoung@redhat.com>
> >Signed-off-by: Simon Horman <horms@verge.net.au>
> >---
> > kexec/arch/arm/Makefile | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> >diff --git a/kexec/arch/arm/Makefile b/kexec/arch/arm/Makefile
> >index 871979e0ae26..a1b730034de8 100644
> >--- a/kexec/arch/arm/Makefile
> >+++ b/kexec/arch/arm/Makefile
> >@@ -27,9 +27,9 @@ arm_KEXEC_SRCS += $(libfdt_SRCS)
> >
> > arm_UIMAGE = kexec/kexec-uImage.c
> > arm_PHYS_TO_VIRT = kexec/arch/arm/phys_to_virt.c
> >-arm_PHYS_TO_VIRT += kexec/arch/arm/iomem.h
> >-arm_PHYS_TO_VIRT += kexec/arch/arm/phys_to_virt.h
> >+arm_PHYS_TO_VIRT_INCLUDE = kexec/arch/arm/iomem.h
> >+arm_PHYS_TO_VIRT_INCLUDE += kexec/arch/arm/phys_to_virt.h
> 
> Since they are needed only in dist definition, so probably we could have
> avoided to define arm_PHYS_TO_VIRT_INCLUDE  and could have added these files
> directly to dist. It will keep it similar like other makefiles
> (kexec/arch/x86_64/Makefile)
> 
> >
> > dist += kexec/arch/arm/Makefile $(arm_KEXEC_SRCS) $(arm_PHYS_TO_VIRT)	\
> >-	kexec/arch/arm/crashdump-arm.h kexec/arch/arm/kexec-arm.h	\
> >-	kexec/arch/arm/include/arch/options.h
> >+	$(arm_PHYS_TO_VIRT_INCLUDE) kexec/arch/arm/crashdump-arm.h \
> >+	kexec/arch/arm/kexec-arm.h kexec/arch/arm/include/arch/options.h
> >
> 
> Otherwise, changes looks fine to me.

Thanks, I will post a v2.

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-12-09 10:59 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-09  9:12 [PATCH kexec-tools] arm: do not build iomem.o target with no soruce Simon Horman
2016-12-09 10:28 ` Pratyush Anand
2016-12-09 10:58   ` Simon Horman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox