Skip to contentSkip to conversation

Makefile: fix endless make when 'make barebox.s'

PATCH Applied [email protected] 2 participants 2 messages Dec 16, 2013 – Dec 19, 2013 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Makefile: fix endless make when 'make barebox.s'

From: Du Huanpeng <[email protected]>

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

---
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Makefile +2 -2
index 5e17a49..d7b5d23 100644
@@ -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
 
Signature · 7 lines
1.7.9.5


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Applied
#1 lore raw
Quoted 6 lines · On Mon, Dec 16, 2013 at 07:47:22PM +0800, [email protected] wrote:

From: Du Huanpeng <[email protected]>

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

Applied, thanks

Sascha

Quoted 35 lines
---
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Makefile +2 -2
index 5e17a49..d7b5d23 100644
@@ -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
 
Signature · 7 lines
1.7.9.5


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
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
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox