mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] Makefile: fix endless make when 'make barebox.s'
@ 2013-12-16 11:47 u74147
  2013-12-19  8:10 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: u74147 @ 2013-12-16 11:47 UTC (permalink / raw)
  To: barebox

From: Du Huanpeng <u74147@gmail.com>

add the same target barebox.s (with a lowercase 's')
to make both work with barebox.S and barebox.s.

Signed-off-by: Du Huanpeng <u74147@gmail.com>
---
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 5e17a49..d7b5d23 100644
--- a/Makefile
+++ b/Makefile
@@ -701,7 +701,7 @@ barebox.uimage: $(KBUILD_BINARY) FORCE
 	$(call if_changed,barebox_mkimage)
 
 ifdef CONFIG_X86
-barebox.S: barebox
+barebox.S barebox.s: barebox
 ifdef CONFIG_X86_HDBOOT
 	@echo "-------------------------------------------------" > barebox.S
 	@echo " * MBR content" >> barebox.S
@@ -723,7 +723,7 @@ endif
 	@echo " * Init Calls content" >> barebox.S
 	$(Q)$(OBJDUMP) -j .barebox_initcalls -d barebox >> barebox.S
 else
-barebox.S: barebox FORCE
+barebox.S barebox.s: barebox FORCE
 	$(call if_changed,disasm)
 endif
 
-- 
1.7.9.5


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

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

* Re: [PATCH] Makefile: fix endless make when 'make barebox.s'
  2013-12-16 11:47 [PATCH] Makefile: fix endless make when 'make barebox.s' u74147
@ 2013-12-19  8:10 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2013-12-19  8:10 UTC (permalink / raw)
  To: u74147; +Cc: barebox

On Mon, Dec 16, 2013 at 07:47:22PM +0800, u74147@gmail.com wrote:
> From: Du Huanpeng <u74147@gmail.com>
> 
> add the same target barebox.s (with a lowercase 's')
> to make both work with barebox.S and barebox.s.
> 
> Signed-off-by: Du Huanpeng <u74147@gmail.com>

Applied, thanks

Sascha

> ---
>  Makefile |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 5e17a49..d7b5d23 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -701,7 +701,7 @@ barebox.uimage: $(KBUILD_BINARY) FORCE
>  	$(call if_changed,barebox_mkimage)
>  
>  ifdef CONFIG_X86
> -barebox.S: barebox
> +barebox.S barebox.s: barebox
>  ifdef CONFIG_X86_HDBOOT
>  	@echo "-------------------------------------------------" > barebox.S
>  	@echo " * MBR content" >> barebox.S
> @@ -723,7 +723,7 @@ endif
>  	@echo " * Init Calls content" >> barebox.S
>  	$(Q)$(OBJDUMP) -j .barebox_initcalls -d barebox >> barebox.S
>  else
> -barebox.S: barebox FORCE
> +barebox.S barebox.s: barebox FORCE
>  	$(call if_changed,disasm)
>  endif
>  
> -- 
> 1.7.9.5
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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

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

end of thread, other threads:[~2013-12-19  8:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-12-16 11:47 [PATCH] Makefile: fix endless make when 'make barebox.s' u74147
2013-12-19  8:10 ` Sascha Hauer

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