util/cbfstool/tools/rom-mk*->cbfs-mk* rename

Signed-off-by: Peter Stuge <peter@stuge.se>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4114 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

5 files changed, 16 insertions, 16 deletions

diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile
index 71e0d3b7d7..919021d667 100644
--- a/util/cbfstool/Makefile
+++ b/util/cbfstool/Makefile
@@ -13,7 +13,7 @@ CFLAGS=-g -Wall # -W -Werror
 
 DESTDIR ?= /usr/local/bin
 
-all: $(obj)/cbfstool $(obj)/tools/rom-mkpayload $(obj)/tools/rom-mkstage
+all: $(obj)/cbfstool $(obj)/tools/cbfs-mkpayload $(obj)/tools/cbfs-mkstage
 
 $(obj)/cbfstool: $(patsubst %,$(obj)/%,$(OBJ))
 	$(CC) -o $@ $(patsubst %,$(obj)/%,$(OBJ))
@@ -26,11 +26,11 @@ include $(tsrc)/Makefile
 $(obj)/%.o: %.c $(INC)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-install: $(obj)/cbfstool $(obj)/tools/rom-mkpayload $(obj)/tools/rom-mkstage
+install: $(obj)/cbfstool $(obj)/tools/cbfs-mkpayload $(obj)/tools/cbfs-mkstage
 	@ install -d $(DESTDIR)
 	@ install -m 0755 $(obj)/cbfstool $(DESTDIR)/cbfstool
-	@ install -m 0755 $(obj)/tools/rom-mkstage $(DESTDIR)/rom-mkstage
-	@ install -m 0755 $(obj)/tools/rom-mkpayload $(DESTDIR)/rom-mkpayload
+	@ install -m 0755 $(obj)/tools/cbfs-mkstage $(DESTDIR)/cbfs-mkstage
+	@ install -m 0755 $(obj)/tools/cbfs-mkpayload $(DESTDIR)/cbfs-mkpayload
 
 tags: 
 	ctags *.[ch] */*.[ch]
diff --git a/util/cbfstool/add.c b/util/cbfstool/add.c
index 642d8ce519..aadb68d841 100644
--- a/util/cbfstool/add.c
+++ b/util/cbfstool/add.c
@@ -270,7 +270,7 @@ char *find_tool(char *tool)
 	return toolpath;
 }
 
-/* Invoke the rom-mkpayload utility */
+/* Invoke the cbfs-mkpayload utility */
 
 int add_payload_handler(struct rom *rom, int argc, char **argv)
 {
@@ -293,12 +293,12 @@ int add_payload_handler(struct rom *rom, int argc, char **argv)
 		return -1;
 	}
 
-	return fork_tool_and_add(rom, find_tool("rom-mkpayload"), argv[0],
+	return fork_tool_and_add(rom, find_tool("cbfs-mkpayload"), argv[0],
 				 argv[1], CBFS_COMPONENT_PAYLOAD, argc - 2,
 				 argc > 2 ? &argv[2] : NULL);
 }
 
-/* Invoke the rom-mkstage utility */
+/* Invoke the cbfs-mkstage utility */
 
 int add_stage_handler(struct rom *rom, int argc, char **argv)
 {
@@ -321,7 +321,7 @@ int add_stage_handler(struct rom *rom, int argc, char **argv)
 		return -1;
 	}
 
-	return fork_tool_and_add(rom, find_tool("rom-mkstage"), argv[0],
+	return fork_tool_and_add(rom, find_tool("cbfs-mkstage"), argv[0],
 				 argv[1], CBFS_COMPONENT_STAGE, argc - 2,
 				 argc > 2 ? &argv[2] : NULL);
 }
diff --git a/util/cbfstool/tools/Makefile b/util/cbfstool/tools/Makefile
index bcecf46636..f5b0e04bcc 100644
--- a/util/cbfstool/tools/Makefile
+++ b/util/cbfstool/tools/Makefile
@@ -1,24 +1,24 @@
 tobj ?= $(shell pwd)
 tsrc ?= $(shell pwd)
 
-TARGETS += $(tobj)/rom-mkstage $(tobj)/rom-mkpayload
+TARGETS += $(tobj)/cbfs-mkstage $(tobj)/cbfs-mkpayload
 
-tools: $(tobj)/rom-mkstage $(tobj)/rom-mkpayload
+tools: $(tobj)/cbfs-mkstage $(tobj)/cbfs-mkpayload
 
 include $(tsrc)/lzma/Makefile
 
 COMMON = common.o compress.o $(LZMA_OBJ)
 
-$(tobj)/rom-mkstage: $(tobj)/rom-mkstage.o $(patsubst %,$(tobj)/%,$(COMMON))
+$(tobj)/cbfs-mkstage: $(tobj)/cbfs-mkstage.o $(patsubst %,$(tobj)/%,$(COMMON))
 	$(CXX) $(CFLAGS) -o $@ $^
 
-$(tobj)/rom-mkpayload: $(tobj)/rom-mkpayload.o $(patsubst %,$(tobj)/%,$(COMMON))
+$(tobj)/cbfs-mkpayload: $(tobj)/cbfs-mkpayload.o $(patsubst %,$(tobj)/%,$(COMMON))
 	$(CXX) $(CFLAGS) -o $@ $^
 
 $(tobj)/%.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 tools-clean:
-	rm -f $(tobj)/rom-mkpayload.o $(tobj)/rom-mkstage.o $(patsubst %,$(tobj)/%,$(COMMON))
-	rm -f $(tobj)/rom-mkpayload $(tobj)/rom-mkstage
+	rm -f $(tobj)/cbfs-mkpayload.o $(tobj)/cbfs-mkstage.o $(patsubst %,$(tobj)/%,$(COMMON))
+	rm -f $(tobj)/cbfs-mkpayload $(tobj)/cbfs-mkstage
 
diff --git a/util/cbfstool/tools/rom-mkpayload.c b/util/cbfstool/tools/cbfs-mkpayload.c
index 4466cc1254..9b3946a926 100644
--- a/util/cbfstool/tools/rom-mkpayload.c
+++ b/util/cbfstool/tools/cbfs-mkpayload.c
@@ -1,5 +1,5 @@
 /*
- * rom-mkpayload
+ * cbfs-mkpayload
  *
  * Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net>
  *
diff --git a/util/cbfstool/tools/rom-mkstage.c b/util/cbfstool/tools/cbfs-mkstage.c
index ff43e774fc..0c472da517 100644
--- a/util/cbfstool/tools/rom-mkstage.c
+++ b/util/cbfstool/tools/cbfs-mkstage.c
@@ -1,5 +1,5 @@
 /*
- * rom-mkstage
+ * cbfs-mkstage
  *
  * Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net>
  *