GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Peter Stuge 2009-04-14 19:48:32 +00:00
parent 483b7bbd77
commit 45ae92ff1a
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/cbfstool/Makefile
View File

@ -13,7 +13,7 @@ CFLAGS=-g -Wall # -W -Werror
DESTDIR ?= /usr/local/bin 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)) $(obj)/cbfstool: $(patsubst %,$(obj)/%,$(OBJ))
$(CC) -o $@ $(patsubst %,$(obj)/%,$(OBJ)) $(CC) -o $@ $(patsubst %,$(obj)/%,$(OBJ))
@ -26,11 +26,11 @@ include $(tsrc)/Makefile
$(obj)/%.o: %.c $(INC) $(obj)/%.o: %.c $(INC)
$(CC) $(CFLAGS) -c -o $@ $< $(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 -d $(DESTDIR)
@ install -m 0755 $(obj)/cbfstool $(DESTDIR)/cbfstool @ install -m 0755 $(obj)/cbfstool $(DESTDIR)/cbfstool
@ install -m 0755 $(obj)/tools/rom-mkstage $(DESTDIR)/rom-mkstage @ install -m 0755 $(obj)/tools/cbfs-mkstage $(DESTDIR)/cbfs-mkstage
@ install -m 0755 $(obj)/tools/rom-mkpayload $(DESTDIR)/rom-mkpayload @ install -m 0755 $(obj)/tools/cbfs-mkpayload $(DESTDIR)/cbfs-mkpayload
tags: tags:
ctags *.[ch] */*.[ch] ctags *.[ch] */*.[ch]

8
util/cbfstool/add.c
View File

@ -270,7 +270,7 @@ char *find_tool(char *tool)
return toolpath; return toolpath;
} }
/* Invoke the rom-mkpayload utility */ /* Invoke the cbfs-mkpayload utility */
int add_payload_handler(struct rom *rom, int argc, char **argv) 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 -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, argv[1], CBFS_COMPONENT_PAYLOAD, argc - 2,
argc > 2 ? &argv[2] : NULL); 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) 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 -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, argv[1], CBFS_COMPONENT_STAGE, argc - 2,
argc > 2 ? &argv[2] : NULL); argc > 2 ? &argv[2] : NULL);
} }

12
util/cbfstool/tools/Makefile
View File

@ -1,24 +1,24 @@
tobj ?= $(shell pwd) tobj ?= $(shell pwd)
tsrc ?= $(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 include $(tsrc)/lzma/Makefile
COMMON = common.o compress.o $(LZMA_OBJ) 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 $@ $^ $(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 $@ $^ $(CXX) $(CFLAGS) -o $@ $^
$(tobj)/%.o: %.c $(tobj)/%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $< $(CC) $(CFLAGS) -c -o $@ $<
tools-clean: tools-clean:
rm -f $(tobj)/rom-mkpayload.o $(tobj)/rom-mkstage.o $(patsubst %,$(tobj)/%,$(COMMON)) rm -f $(tobj)/cbfs-mkpayload.o $(tobj)/cbfs-mkstage.o $(patsubst %,$(tobj)/%,$(COMMON))
rm -f $(tobj)/rom-mkpayload $(tobj)/rom-mkstage rm -f $(tobj)/cbfs-mkpayload $(tobj)/cbfs-mkstage

2
util/cbfstool/tools/rom-mkpayload.c → util/cbfstool/tools/cbfs-mkpayload.c
View File

@ -1,5 +1,5 @@
/* /*
* rom-mkpayload * cbfs-mkpayload
* *
* Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net> * Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net>
* *

2
util/cbfstool/tools/rom-mkstage.c → util/cbfstool/tools/cbfs-mkstage.c
View File

@ -1,5 +1,5 @@
/* /*
* rom-mkstage * cbfs-mkstage
* *
* Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net> * Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net>
* *