tools/env: use lib/crc32.c directly

PATCH New Andreas Bießmann 3 participants 5 messages Aug 30, 2011 – Nov 22, 2011 Kbuild

Share & tools

Andreas Bießmann

author

2011-08-30 14:42 UTC #0 lore raw

PATCH 1/1 tools/env: use lib/crc32.c directly

Instead of linking the file into $(obj) tree use directly the source file. This also prevents littered source tree if building not out-of-tree.

Signed-off-by Andreas Bie?mann <[email protected]>

---
 tools/env/Makefile |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

tools/env/Makefile +2 -5

index 2f7a59c..28b73da 100644
@@ -23,7 +23,7 @@
 
 include $(TOPDIR)/config.mk
 
-HOSTSRCS := $(obj)crc32.c  fw_env.c  fw_env_main.c
+HOSTSRCS := $(SRCTREE)/lib/crc32.c  fw_env.c  fw_env_main.c
 HEADERS	:= fw_env.h
 
 # Compile for a hosted environment on the target

@@ -43,10 +43,7 @@ $(obj)fw_printenv:	$(HOSTSRCS) $(HEADERS)
 	$(HOSTCC) $(HOSTCFLAGS_NOPED) $(HOSTLDFLAGS) -o $@ $(HOSTSRCS)
 
 clean:
-	rm -f $(obj)fw_printenv $(obj)crc32.c
-
-$(obj)crc32.c:
-	ln -s $(src)../../lib/crc32.c $(obj)crc32.c
+	rm -f $(obj)fw_printenv
 
 #########################################################################

Signature · 1 line

1.7.5.4

Mike Frysinger

2011-08-30 15:08 UTC #1 lore raw

PATCH 1/1 tools/env: use lib/crc32.c directly

Quoted 2 lines · On Tuesday, August 30, 2011 10:42:29 Andreas Bie?mann wrote:

Instead of linking the file into $(obj) tree use directly the source file. This also prevents littered source tree if building not out-of-tree.

Acked-by Mike Frysinger <[email protected]>

-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110830/686b0bc1/attachment.pgp

Andreas Bießmann

author

2011-10-17 09:08 UTC #2 lore raw

PATCH 1/1 tools/env: use lib/crc32.c directly

In reply to Andreas Bießmann

Am 30.08.2011 16:42, schrieb Andreas Bie?mann:

Quoted 4 lines

Instead of linking the file into $(obj) tree use directly the source file. This also prevents littered source tree if building not out-of-tree.
Signed-off-by Andreas Bie?mann <[email protected]>

ping?

Andreas Bießmann

author

2011-10-18 08:11 UTC #3 lore raw

PATCH v2 1/1 tools/env: use lib/crc32.c directly

In reply to Andreas Bießmann

Instead of linking the file into $(obj) tree use directly the source file. This also prevents littered source tree if building not out-of-tree.

Signed-off-by Andreas Bie?mann <[email protected]>

Acked-by Mike Frysinger <[email protected]>

---
total: 0 errors, 0 warnings, 27 lines checked

0001-tools-env-use-lib-crc32.c-directly.patch has no obvious style problems and is ready for submission.

changes since v1:
- also remove deletion of $(obj)/tools/crc32.c from Makefile which is not longer necessary

 Makefile           |    2 +-
 tools/env/Makefile |    7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

Makefile +1 -1

index e9a153c..081e975 100644
@@ -973,7 +973,7 @@ clobber:	clean
 	@rm -f $(obj)u-boot.kwb
 	@rm -f $(obj)u-boot.imx
 	@rm -f $(obj)u-boot.ubl
-	@rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes}
+	@rm -f $(obj)tools/inca-swap-bytes
 	@rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c
 	@rm -fr $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
 	@rm -fr $(obj)include/generated

tools/env/Makefile +2 -5

index 2f7a59c..28b73da 100644
@@ -23,7 +23,7 @@
 
 include $(TOPDIR)/config.mk
 
-HOSTSRCS := $(obj)crc32.c  fw_env.c  fw_env_main.c
+HOSTSRCS := $(SRCTREE)/lib/crc32.c  fw_env.c  fw_env_main.c
 HEADERS	:= fw_env.h
 
 # Compile for a hosted environment on the target

@@ -43,10 +43,7 @@ $(obj)fw_printenv:	$(HOSTSRCS) $(HEADERS)
 	$(HOSTCC) $(HOSTCFLAGS_NOPED) $(HOSTLDFLAGS) -o $@ $(HOSTSRCS)
 
 clean:
-	rm -f $(obj)fw_printenv $(obj)crc32.c
-
-$(obj)crc32.c:
-	ln -s $(src)../../lib/crc32.c $(obj)crc32.c
+	rm -f $(obj)fw_printenv
 
 #########################################################################

Signature · 1 line

1.7.6.3

Stefano Babic

2011-11-22 08:54 UTC #4 lore raw

PATCH v2 1/1 tools/env: use lib/crc32.c directly

Quoted 6 lines · Andreas Bie?mann

Instead of linking the file into $(obj) tree use directly the source file. This also prevents littered source tree if building not out-of-tree.
Signed-off-by Andreas Bie?mann <[email protected]>
Acked-by Mike Frysinger <[email protected]>
---

Applied to u-boot-staging, sbabic at denx.de, (after rebasing on current tree), thanks.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================