diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-11-11 21:32:23 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-11-11 21:32:23 +0000 |
| commit | 6056b97fce79d3534363dcf508ab7b4a18a459d6 (patch) | |
| tree | 4d4e59ffb8bfb71499f78c26bbc54c92941e5483 /src/arch | |
| parent | c243639797dc480eea9d2b3253e1085096bb355a (diff) | |
Rework bootblock size handling:
- 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
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/i386/Kconfig | 7 | ||||
| -rw-r--r-- | src/arch/i386/Makefile.inc | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/arch/i386/Kconfig b/src/arch/i386/Kconfig index 860de86895..9c3ed9f41d 100644 --- a/src/arch/i386/Kconfig +++ b/src/arch/i386/Kconfig @@ -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 diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc index b43a8a8648..3142c95abe 100644 --- a/src/arch/i386/Makefile.inc +++ b/src/arch/i386/Makefile.inc @@ -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); \ |