From 276692e6df005a0816e70f828e1954d3e3f77418 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Wed, 7 Jan 2009 20:52:43 +0100
Subject: [PATCH] --- yaml --- r: 127189 b: refs/heads/master c:
 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6 h: refs/heads/master i:   127187:
 a913d2c4dd09561c6edbf333d97781c251da800a v: v3

---
 [refs]                                |  2 +-
 trunk/firmware/.gitignore             |  1 -
 trunk/firmware/Makefile               | 10 ++++------
 trunk/scripts/.gitignore              |  1 +
 trunk/scripts/Makefile                |  3 ++-
 trunk/{firmware => scripts}/ihex2fw.c |  0
 6 files changed, 8 insertions(+), 9 deletions(-)
 rename trunk/{firmware => scripts}/ihex2fw.c (100%)

diff --git a/[refs] b/[refs]
index da92e1a8c7a0..9baf9ea6242c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d1a0a13edecfdcb47fee3238ed4a2af2a2867f9
+refs/heads/master: 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
diff --git a/trunk/firmware/.gitignore b/trunk/firmware/.gitignore
index d9c69017bc9a..f89a21fffbf1 100644
--- a/trunk/firmware/.gitignore
+++ b/trunk/firmware/.gitignore
@@ -3,4 +3,3 @@
 *.bin
 *.csp
 *.dsp
-ihex2fw
diff --git a/trunk/firmware/Makefile b/trunk/firmware/Makefile
index d872b7942a30..55d3082ea13e 100644
--- a/trunk/firmware/Makefile
+++ b/trunk/firmware/Makefile
@@ -99,10 +99,10 @@ quiet_cmd_ihex  = IHEX    $@
       cmd_ihex  = $(OBJCOPY) -Iihex -Obinary $< $@
 
 quiet_cmd_ihex2fw  = IHEX2FW $@
-      cmd_ihex2fw  = $(objtree)/$(obj)/ihex2fw $< $@
+      cmd_ihex2fw  = $(objtree)/scripts/ihex2fw $< $@
 
 quiet_cmd_h16tofw  = H16TOFW $@
-      cmd_h16tofw  = $(objtree)/$(obj)/ihex2fw -w $< $@
+      cmd_h16tofw  = $(objtree)/scripts/ihex2fw -w $< $@
 
 quiet_cmd_fwbin = MK_FW   $@
       cmd_fwbin = FWNAME="$(patsubst firmware/%.gen.S,%,$@)";		     \
@@ -165,11 +165,11 @@ $(obj)/%: $(obj)/%.ihex | $(objtree)/$(obj)/$$(dir %)
 # is actually meaningful, because the firmware has to be loaded in a certain
 # order rather than as a single binary blob. Thus, we convert them into our
 # more compact binary representation of ihex records (<linux/ihex.h>)
-$(obj)/%.fw: $(obj)/%.HEX $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)
+$(obj)/%.fw: $(obj)/%.HEX  | $(objtree)/$(obj)/$$(dir %)
 	$(call cmd,ihex2fw)
 
 # .H16 is our own modified form of Intel HEX, with 16-bit length for records.
-$(obj)/%.fw: $(obj)/%.H16 $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)
+$(obj)/%.fw: $(obj)/%.H16 | $(objtree)/$(obj)/$$(dir %)
 	$(call cmd,h16tofw)
 
 $(firmware-dirs):
@@ -186,5 +186,3 @@ targets := $(fw-shipped-) $(patsubst $(obj)/%,%, \
 # Without this, built-in.o won't be created when it's empty, and the
 # final vmlinux link will fail.
 obj-n := dummy
-
-hostprogs-y := ihex2fw
diff --git a/trunk/scripts/.gitignore b/trunk/scripts/.gitignore
index b939fbd01195..09e2406f3b78 100644
--- a/trunk/scripts/.gitignore
+++ b/trunk/scripts/.gitignore
@@ -1,6 +1,7 @@
 #
 # Generated files
 #
+ihex2fw
 conmakehash
 kallsyms
 pnmtologo
diff --git a/trunk/scripts/Makefile b/trunk/scripts/Makefile
index aafdf064feef..035182e16afb 100644
--- a/trunk/scripts/Makefile
+++ b/trunk/scripts/Makefile
@@ -2,11 +2,12 @@
 # scripts contains sources for various helper programs used throughout
 # the kernel for the build process.
 # ---------------------------------------------------------------------------
+# ihex2fw:       Parser/loader for IHEX formatted data
 # kallsyms:      Find all symbols in vmlinux
 # pnmttologo:    Convert pnm files to logo files
-# conmakehash:   Create chartable
 # conmakehash:	 Create arrays for initializing the kernel console tables
 
+hostprogs-y                      := ihex2fw
 hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
 hostprogs-$(CONFIG_LOGO)         += pnmtologo
 hostprogs-$(CONFIG_VT)           += conmakehash
diff --git a/trunk/firmware/ihex2fw.c b/trunk/scripts/ihex2fw.c
similarity index 100%
rename from trunk/firmware/ihex2fw.c
rename to trunk/scripts/ihex2fw.c