sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework bootblock size handling:

Browse Source 
- don't pretend to create a bootblock as large
  as the ROM in Kconfig (it's 64k at most)
- don't pretend to accept a bootblocksize value
  in cbfstool create (it ignored it)
- patch up the build systems to keep it working

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4934 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi
2009-11-11 21:32:23 +00:00
parent c243639797
commit 6056b97fce
4 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/arch/i386/Kconfig
View File

@@ -20,12 +20,7 @@ config ARCH
config ROMBASE
hex
default 0xffc00000 if COREBOOT_ROMSIZE_KB_4096
default 0xffe00000 if COREBOOT_ROMSIZE_KB_2048
default 0xfff00000 if COREBOOT_ROMSIZE_KB_1024
default 0xfff80000 if COREBOOT_ROMSIZE_KB_512
default 0xfffc0000 if COREBOOT_ROMSIZE_KB_256
default 0xfffe0000 if COREBOOT_ROMSIZE_KB_128
default 0xffff0000
config ROM_IMAGE_SIZE
hex

3
src/arch/i386/Makefile.inc
View File

@@ -8,14 +8,13 @@ subdirs-y += smp
obj-$(CONFIG_HAVE_OPTION_TABLE) += ../../option_table.o
ifdef POST_EVALUATION
BOOTBLOCK_SIZE=65536
#######################################################################
# Build the final rom image
$(obj)/coreboot.rom: $(obj)/coreboot.bootblock $(obj)/coreboot_ram $(CBFSTOOL)
rm -f $@
$(CBFSTOOL) $@ create $(shell expr 1024 \* $(CONFIG_COREBOOT_ROMSIZE_KB)) $(BOOTBLOCK_SIZE) $(obj)/coreboot.bootblock
$(CBFSTOOL) $@ create $(shell expr 1024 \* $(CONFIG_COREBOOT_ROMSIZE_KB)) $(obj)/coreboot.bootblock
if [ -f fallback/coreboot_apc ]; \
then \
$(CBFSTOOL) $@ add-stage fallback/coreboot_apc fallback/coreboot_apc $(CBFS_COMPRESS_FLAG); \