summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald G. Minnich <rminnich@gmail.com>2013-01-04 22:17:38 +0100
committerStefan Reinauer <stefan.reinauer@coreboot.org>2013-01-04 23:11:27 +0100
commitfa60de996d7c9676cf219c90e3cff602e148468d (patch)
treed99a4aed4ac06e05bf7f525584eb84000c62088b
parent853f4698a8ef9366178b83b0c42a3f662dc45c95 (diff)
downloadcoreboot-fa60de996d7c9676cf219c90e3cff602e148468d.tar.xz
Revert "armv7: pass bootblock offset from Kconfig into cbfstool"
This reverts commit ec8d35fe911ab35a5f40fd5b452f5463857b244a We are almost certain that this is not necessary. Change-Id: I70e94f883be95655da00a0b127ed9ffd7c81c63b Reviewed-on: http://review.coreboot.org/2104 Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-by: David Hendricks <dhendrix@chromium.org> Tested-by: build bot (Jenkins)
-rw-r--r--src/arch/armv7/Makefile.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/arch/armv7/Makefile.inc b/src/arch/armv7/Makefile.inc
index 9bca71c1fd..f75e5a7481 100644
--- a/src/arch/armv7/Makefile.inc
+++ b/src/arch/armv7/Makefile.inc
@@ -49,7 +49,7 @@ prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
$(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 \
- -o $(CONFIG_BOOTBLOCK_OFFSET)
+ -o $$(( $(CONFIG_ROM_SIZE) - $(CONFIG_CBFS_SIZE) ))
$(prebuild-files) true
mv $@.tmp $@
else