From efcee767deed9d10628764eb9143724dd206d5fa Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Mon, 10 Nov 2014 13:14:24 -0800 Subject: CBFS: Automate ROM image layout and remove hardcoded offsets Non-x86 boards currently need to hardcode the position of their CBFS master header in a Kconfig. This is very brittle because it is usually put in between the bootblock and the first CBFS entry, without any checks to guarantee that it won't overlap either of those. It is not fun to debug random failures that move and disappear with tiny alignment changes because someone decided to write "ORBC1112" over some part of your data section (in a way that is not visible in the symbolized .elf binaries, only in the final image). This patch seeks to prevent those issues and reduce the need for manual configuration by making the image layout a completely automated part of cbfstool. Since automated placement of the CBFS header means we can no longer hardcode its position into coreboot, this patch takes the existing x86 solution of placing a pointer to the header at the very end of the CBFS-managed section of the ROM and generalizes it to all architectures. This is now even possible with the read-only/read-write split in ChromeOS, since coreboot knows how large that section is from the CBFS_SIZE Kconfig (which is by default equal to ROM_SIZE, but can be changed on systems that place other data next to coreboot/CBFS in ROM). Also adds a feature to cbfstool that makes the -B (bootblock file name) argument on image creation optional, since we have recently found valid use cases for CBFS images that are not the first boot medium of the device (instead opened by an earlier bootloader that can already interpret CBFS) and therefore don't really need a bootblock. BRANCH=None BUG=None TEST=Built and booted on Veyron_Pinky, Nyan_Blaze and Falco. Change-Id: Ib715bb8db258e602991b34f994750a2d3e2d5adf Signed-off-by: Patrick Georgi Original-Commit-Id: e9879c0fbd57f105254c54bacb3e592acdcad35c Original-Change-Id: Ifcc755326832755cfbccd6f0a12104cba28a20af Original-Signed-off-by: Julius Werner Original-Reviewed-on: https://chromium-review.googlesource.com/229975 Reviewed-on: http://review.coreboot.org/9620 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/cpu/allwinner/a10/Kconfig | 16 ---------------- src/cpu/mips/Kconfig | 5 ----- src/cpu/ti/am335x/Kconfig | 14 -------------- 3 files changed, 35 deletions(-) (limited to 'src/cpu') diff --git a/src/cpu/allwinner/a10/Kconfig b/src/cpu/allwinner/a10/Kconfig index 191e45d54c..e481af0143 100644 --- a/src/cpu/allwinner/a10/Kconfig +++ b/src/cpu/allwinner/a10/Kconfig @@ -15,22 +15,6 @@ config CPU_SPECIFIC_OPTIONS select BOOTBLOCK_CONSOLE select CPU_HAS_BOOTBLOCK_INIT -config BOOTBLOCK_ROM_OFFSET - hex - default 0x00 - -config CBFS_HEADER_ROM_OFFSET - hex - default 0x10 - -# This is the maximum size bootblock that the BROM will load. If the bootblock -# gets larger, this will generate a build failure, rather than a silent -# "coreboot won't run" failure. -# Normally, we would place romstage at 0x5fe0, but we place it a little lower to -# satisfy the 64 byte alignment. -config CBFS_ROM_OFFSET - default 0x5fc0 - ## TODO Change this to some better address not overlapping bootblock when ## cbfstool supports creating header in arbitrary location. config CBFS_HEADER_ROM_OFFSET diff --git a/src/cpu/mips/Kconfig b/src/cpu/mips/Kconfig index 2230c14ce7..85410bbe72 100644 --- a/src/cpu/mips/Kconfig +++ b/src/cpu/mips/Kconfig @@ -25,8 +25,3 @@ config CPU_MIPS select ARCH_VERSTAGE_MIPS select ARCH_ROMSTAGE_MIPS select ARCH_RAMSTAGE_MIPS - -config BOOTBLOCK_ROM_OFFSET - hex - depends on CPU_MIPS - default 0x00 diff --git a/src/cpu/ti/am335x/Kconfig b/src/cpu/ti/am335x/Kconfig index 7fe2665135..0150e16837 100644 --- a/src/cpu/ti/am335x/Kconfig +++ b/src/cpu/ti/am335x/Kconfig @@ -10,17 +10,3 @@ config CPU_TI_AM335X select GENERIC_UDELAY bool default n - -if CPU_TI_AM335X - -config CBFS_ROM_OFFSET - # Calculated by BL1 + max bootblock size. - default 0x4c00 - -## TODO Change this to some better address not overlapping bootblock when -## cbfstool supports creating header in arbitrary location. -config CBFS_HEADER_ROM_OFFSET - hex "offset of master CBFS header in ROM" - default 0x40 - -endif -- cgit v1.2.3