summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorHung-Te Lin <hungte@chromium.org>2013-01-29 09:45:12 +0800
committerStefan Reinauer <stefan.reinauer@coreboot.org>2013-02-05 22:27:08 +0100
commitf56c73f1e1c2b13c7b2b989fc44358138394cc68 (patch)
treef0596bf829f52361e73dbd99efb6a58a8f743c6e /src/arch
parent215d1d7c9b8fdd94582bdec711e98111d1db5bb7 (diff)
downloadcoreboot-f56c73f1e1c2b13c7b2b989fc44358138394cc68.tar.xz
cbfstool: Use cbfs_image API for "create" command.
Usage Changes: To support platforms with different memory layout, "create" takes two extra optional parameters: "-b": base address (or offset) for bootblock. When omitted, put bootblock in end of ROM (x86 style). "-H": header offset. When omitted, put header right before bootblock, and update a top-aligned virtual address reference in end of ROM. Example: (can be found in ARM MAkefile): cbfstool coreboot.rom create -m armv7 -s 4096K -B bootblock.bin \ -a 64 -b 0x0000 -H 0x2040 -o 0x5000 Verified to boot on ARM (Snow) and X86 (QEMU). Change-Id: Ida2a9e32f9a459787b577db5e6581550d9d7017b Signed-off-by: Hung-Te Lin <hungte@chromium.org> Reviewed-on: http://review.coreboot.org/2214 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/armv7/Makefile.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/arch/armv7/Makefile.inc b/src/arch/armv7/Makefile.inc
index 715ce1ecbd..f2f4a4731c 100644
--- a/src/arch/armv7/Makefile.inc
+++ b/src/arch/armv7/Makefile.inc
@@ -45,9 +45,10 @@ prebuild-files = \
$(if $(call extract_nth,4,$(file)),-b $(call extract_nth,4,$(file))) &&)
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
+# TODO Change -b, -H, -o to Kconfig variables.
$(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL)
$(CBFSTOOL) $@.tmp create -m armv7 -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \
- -B $(objcbfs)/bootblock.bin -a 64
+ -B $(objcbfs)/bootblock.bin -a 64 -b 0x0000 -H 0x2040 -o 0x5000
$(prebuild-files) true
mv $@.tmp $@
else