summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/arch/arm/Makefile.inc4
-rw-r--r--src/arch/arm64/Makefile.inc4
-rw-r--r--src/arch/mips/Makefile.inc4
-rw-r--r--src/arch/riscv/Makefile.inc2
-rw-r--r--src/cpu/allwinner/a10/Kconfig16
-rw-r--r--src/cpu/mips/Kconfig5
-rw-r--r--src/cpu/ti/am335x/Kconfig14
-rw-r--r--src/include/cbfs_serialized.h7
-rw-r--r--src/lib/cbfs_core.c33
-rw-r--r--src/lib/cbfs_core.h7
-rw-r--r--src/mainboard/emulation/qemu-armv7/Kconfig12
-rw-r--r--src/mainboard/emulation/qemu-riscv/Kconfig12
-rw-r--r--src/soc/imgtec/pistachio/Kconfig9
-rw-r--r--src/soc/marvell/bg4cd/Kconfig12
-rw-r--r--src/soc/nvidia/tegra124/Kconfig12
-rw-r--r--src/soc/nvidia/tegra132/Kconfig12
-rw-r--r--src/soc/qualcomm/ipq806x/Kconfig12
-rw-r--r--src/soc/rockchip/rk3288/Kconfig18
-rw-r--r--src/soc/samsung/exynos5250/Kconfig25
-rw-r--r--src/soc/samsung/exynos5420/Kconfig25
20 files changed, 28 insertions, 217 deletions
diff --git a/src/arch/arm/Makefile.inc b/src/arch/arm/Makefile.inc
index cfdb5767c1..4e23f84470 100644
--- a/src/arch/arm/Makefile.inc
+++ b/src/arch/arm/Makefile.inc
@@ -31,9 +31,7 @@ subdirs-y += armv4/ armv7/
###############################################################################
ifeq ($(CONFIG_ARCH_ROMSTAGE_ARM),y)
-CBFSTOOL_PRE1_OPTS = -m arm -b $(CONFIG_BOOTBLOCK_ROM_OFFSET) \
- -H $(CONFIG_CBFS_HEADER_ROM_OFFSET) \
- -o $(CONFIG_CBFS_ROM_OFFSET) -s $(CONFIG_CBFS_SIZE)
+CBFSTOOL_PRE1_OPTS = -m arm -s $(CONFIG_CBFS_SIZE)
CBFSTOOL_PRE_OPTS = -b 0
endif
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 8e88d9c444..c9c93b17ea 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -34,9 +34,7 @@ subdirs-y += armv8/
################################################################################
ifeq ($(CONFIG_ARCH_ROMSTAGE_ARM64),y)
-CBFSTOOL_PRE1_OPTS = -m arm64 -b $(CONFIG_BOOTBLOCK_ROM_OFFSET) \
- -H $(CONFIG_CBFS_HEADER_ROM_OFFSET) \
- -o $(CONFIG_CBFS_ROM_OFFSET) -s $(CONFIG_CBFS_SIZE)
+CBFSTOOL_PRE1_OPTS = -m arm64 -s $(CONFIG_CBFS_SIZE)
endif
ifeq ($(CONFIG_ARCH_ARM64),y)
diff --git a/src/arch/mips/Makefile.inc b/src/arch/mips/Makefile.inc
index ee88adf732..1016f1f791 100644
--- a/src/arch/mips/Makefile.inc
+++ b/src/arch/mips/Makefile.inc
@@ -24,9 +24,7 @@
###############################################################################
ifeq ($(CONFIG_ARCH_ROMSTAGE_MIPS),y)
-CBFSTOOL_PRE1_OPTS = -m mips -b $(CONFIG_BOOTBLOCK_ROM_OFFSET) \
- -H $(CONFIG_CBFS_HEADER_ROM_OFFSET) \
- -o $(CONFIG_CBFS_ROM_OFFSET) -s $(CONFIG_CBFS_SIZE)
+CBFSTOOL_PRE1_OPTS = -m mips -s $(CONFIG_CBFS_SIZE)
endif
###############################################################################
diff --git a/src/arch/riscv/Makefile.inc b/src/arch/riscv/Makefile.inc
index 3bcb2eac2f..a0feb3d1ea 100644
--- a/src/arch/riscv/Makefile.inc
+++ b/src/arch/riscv/Makefile.inc
@@ -72,7 +72,7 @@ $(objcbfs)/romstage.debug: $$(romstage-objs)
romstage-c-ccopts += $(riscv_flags)
romstage-S-ccopts += $(riscv_asm_flags)
-CBFSTOOL_PRE1_OPTS = -v -m riscv -b $(CONFIG_BOOTBLOCK_ROM_OFFSET) -H $(CONFIG_CBFS_HEADER_ROM_OFFSET) -o $(CONFIG_CBFS_ROM_OFFSET) -s $(CONFIG_CBFS_SIZE)
+CBFSTOOL_PRE1_OPTS = -v -m riscv -s $(CONFIG_CBFS_SIZE)
CBFSTOOL_PRE_OPTS = -v
endif
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
diff --git a/src/include/cbfs_serialized.h b/src/include/cbfs_serialized.h
index 30b231495d..95dcb1a650 100644
--- a/src/include/cbfs_serialized.h
+++ b/src/include/cbfs_serialized.h
@@ -86,10 +86,9 @@
#define CBFS_HEADER_VERSION2 0x31313132
#define CBFS_HEADER_VERSION CBFS_HEADER_VERSION2
-/** this is the master cbfs header - it need to be located somewhere available
- to bootblock (to load romstage). Where it actually lives is up to coreboot.
- On x86, a pointer to this header will live at 0xFFFFFFFC.
- For other platforms, you need to define CONFIG_CBFS_HEADER_ROM_OFFSET */
+/* this is the master cbfs header - it must be located somewhere available
+ * to bootblock (to load romstage). The last 4 bytes in the image contain its
+ * relative offset from the end of the image (as a 32-bit signed integer). */
struct cbfs_header {
uint32_t magic;
diff --git a/src/lib/cbfs_core.c b/src/lib/cbfs_core.c
index acd434fb48..80d66ca3eb 100644
--- a/src/lib/cbfs_core.c
+++ b/src/lib/cbfs_core.c
@@ -34,10 +34,6 @@
* CBFS_CORE_WITH_LZMA (must be #define)
* if defined, ulzma() must exist for decompression of data streams
*
- * CBFS_HEADER_ROM_ADDRESS
- * ROM address (offset) of CBFS header. Underlying CBFS media may interpret
- * it in other way so we call this "address".
- *
* ERROR(x...)
* print an error message x (in printf format)
*
@@ -58,6 +54,7 @@
* on failure */
const struct cbfs_header *cbfs_get_header(struct cbfs_media *media)
{
+ size_t offset;
const struct cbfs_header *header;
struct cbfs_media default_media;
@@ -68,22 +65,34 @@ const struct cbfs_header *cbfs_get_header(struct cbfs_media *media)
return CBFS_HEADER_INVALID_ADDRESS;
}
}
-
media->open(media);
- DEBUG("CBFS_HEADER_ROM_ADDRESS: 0x%x/0x%x\n", CBFS_HEADER_ROM_ADDRESS,
- CONFIG_ROM_SIZE);
- header = media->map(media, CBFS_HEADER_ROM_ADDRESS, sizeof(*header));
+
+ /* TODO: allow negative offsets from the end of the CBFS image at media
+ * layer (like libpayload) so we can combine these two cases. */
+ if (IS_ENABLED(CONFIG_ARCH_X86)) {
+ offset = *(int32_t *)(uintptr_t)0xfffffffc;
+ header = media->map(media, offset, sizeof(*header));
+ } else {
+ int32_t rel_offset;
+ if (!media->read(media, &rel_offset, CONFIG_CBFS_SIZE -
+ sizeof(int32_t), sizeof(int32_t))) {
+ ERROR("Could not read CBFS master header offset!\n");
+ return CBFS_HEADER_INVALID_ADDRESS;
+ }
+ offset = CONFIG_CBFS_SIZE + rel_offset;
+ header = media->map(media, offset, sizeof(*header));
+ }
+ DEBUG("CBFS header offset: 0x%zx/0x%x\n", offset, CONFIG_ROM_SIZE);
media->close(media);
if (header == CBFS_MEDIA_INVALID_MAP_ADDRESS) {
- ERROR("Failed to load CBFS header from 0x%x\n",
- CBFS_HEADER_ROM_ADDRESS);
+ ERROR("Failed to load CBFS header from 0x%zx\n", offset);
return CBFS_HEADER_INVALID_ADDRESS;
}
if (CBFS_HEADER_MAGIC != ntohl(header->magic)) {
- ERROR("Could not find valid CBFS master header at %x: "
- "%x vs %x.\n", CBFS_HEADER_ROM_ADDRESS, CBFS_HEADER_MAGIC,
+ ERROR("Could not find valid CBFS master header at %#zx: "
+ "magic %#.8x vs %#.8x.\n", offset, CBFS_HEADER_MAGIC,
ntohl(header->magic));
if (header->magic == 0xffffffff) {
ERROR("Maybe ROM is not mapped properly?\n");
diff --git a/src/lib/cbfs_core.h b/src/lib/cbfs_core.h
index 221fe5d34d..c301c337a2 100644
--- a/src/lib/cbfs_core.h
+++ b/src/lib/cbfs_core.h
@@ -42,11 +42,4 @@
# endif
#endif
-#if defined(CONFIG_CBFS_HEADER_ROM_OFFSET) && (CONFIG_CBFS_HEADER_ROM_OFFSET)
-# define CBFS_HEADER_ROM_ADDRESS (CONFIG_CBFS_HEADER_ROM_OFFSET)
-#else
-// Indirect address: only works on 32bit top-aligned systems.
-# define CBFS_HEADER_ROM_ADDRESS (*(uint32_t *)0xfffffffc)
-#endif
-
#endif /* __LIB_CBFS_CORE */
diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig
index c0e7095464..58ddd4ed49 100644
--- a/src/mainboard/emulation/qemu-armv7/Kconfig
+++ b/src/mainboard/emulation/qemu-armv7/Kconfig
@@ -53,16 +53,4 @@ config DRAM_SIZE_MB
int
default 1024
-config BOOTBLOCK_ROM_OFFSET
- hex
- default 0x0
-
-config CBFS_HEADER_ROM_OFFSET
- hex
- default 0x0100000
-
-config CBFS_ROM_OFFSET
- hex
- default 0x0110000
-
endif # BOARD_EMULATION_QEMU_ARMV7
diff --git a/src/mainboard/emulation/qemu-riscv/Kconfig b/src/mainboard/emulation/qemu-riscv/Kconfig
index 5425ca5cb0..ab1e2820ba 100644
--- a/src/mainboard/emulation/qemu-riscv/Kconfig
+++ b/src/mainboard/emulation/qemu-riscv/Kconfig
@@ -54,18 +54,6 @@ config DRAM_SIZE_MB
# 0x0011_0000: CBFS data
# 0x0100_0000: reserved for ramstage
-config BOOTBLOCK_ROM_OFFSET
- hex
- default 0x0
-
-config CBFS_HEADER_ROM_OFFSET
- hex
- default 0x10000
-
-config CBFS_ROM_OFFSET
- hex
- default 0x10040
-
config RAMTOP
hex
default 0x1000000
diff --git a/src/soc/imgtec/pistachio/Kconfig b/src/soc/imgtec/pistachio/Kconfig
index 46714444a4..9eb001da49 100644
--- a/src/soc/imgtec/pistachio/Kconfig
+++ b/src/soc/imgtec/pistachio/Kconfig
@@ -35,13 +35,4 @@ config BOOTBLOCK_CPU_INIT
string
default "soc/imgtec/pistachio/bootblock.c"
-config CBFS_ROM_OFFSET
- hex
- default 0x8100
-
-config CBFS_HEADER_ROM_OFFSET
- # Effectively the maximum size of the bootblock
- hex
- default 0x8000
-
endif
diff --git a/src/soc/marvell/bg4cd/Kconfig b/src/soc/marvell/bg4cd/Kconfig
index 1d51ebd94c..d7f8327198 100644
--- a/src/soc/marvell/bg4cd/Kconfig
+++ b/src/soc/marvell/bg4cd/Kconfig
@@ -37,16 +37,4 @@ config BOOTBLOCK_CPU_INIT
string
default "soc/marvell/bg4cd/bootblock.c"
-config BOOTBLOCK_ROM_OFFSET
- hex
- default 0x0
-
-config CBFS_HEADER_ROM_OFFSET
- hex
- default 0x0008000
-
-config CBFS_ROM_OFFSET
- hex
- default 0x0018000
-
endif
diff --git a/src/soc/nvidia/tegra124/Kconfig b/src/soc/nvidia/tegra124/Kconfig
index 3ce368b95f..b934f4ea17 100644
--- a/src/soc/nvidia/tegra124/Kconfig
+++ b/src/soc/nvidia/tegra124/Kconfig
@@ -24,18 +24,6 @@ config BOOTBLOCK_CPU_INIT
bootblock must load microcode or copy data from ROM before
searching for the bootblock.
-config BOOTBLOCK_ROM_OFFSET
- hex
- default 0x0
-
-config CBFS_HEADER_ROM_OFFSET
- hex "offset of master CBFS header in ROM"
- default 0x18000
-
-config CBFS_ROM_OFFSET
- hex "offset of CBFS data in ROM"
- default 0x18080
-
config TEGRA124_MODEL_TD570D
bool "TD570D"
diff --git a/src/soc/nvidia/tegra132/Kconfig b/src/soc/nvidia/tegra132/Kconfig
index 0870c7e68c..4c927a8cb8 100644
--- a/src/soc/nvidia/tegra132/Kconfig
+++ b/src/soc/nvidia/tegra132/Kconfig
@@ -42,22 +42,10 @@ config BOOTBLOCK_CPU_INIT
bootblock must load microcode or copy data from ROM before
searching for the bootblock.
-config BOOTBLOCK_ROM_OFFSET
- hex
- default 0x0
-
config MAX_CPUS
int
default 2
-config CBFS_HEADER_ROM_OFFSET
- hex "offset of master CBFS header in ROM"
- default 0x40000
-
-config CBFS_ROM_OFFSET
- hex "offset of CBFS data in ROM"
- default 0x40080
-
config MTS_DIRECTORY
string "Directory where MTS microcode files are located"
default "3rdparty/cpu/nvidia/tegra132/current/prod"
diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig
index 0136a18ef6..bc658a059c 100644
--- a/src/soc/qualcomm/ipq806x/Kconfig
+++ b/src/soc/qualcomm/ipq806x/Kconfig
@@ -21,18 +21,6 @@ config CBFS_SIZE
coreboot blob elsewhere in the system. Make sure this config option
is fine tuned in the board config file.
-config BOOTBLOCK_ROM_OFFSET
- hex
- default 0x0
-
-config CBFS_HEADER_ROM_OFFSET
- hex "offset of master CBFS header in ROM"
- default 0x1b4000
-
-config CBFS_ROM_OFFSET
- hex "offset of CBFS data in ROM"
- default 0x1b4080
-
config MBN_ENCAPSULATION
depends on USE_BLOBS
bool "bootblock encapsulation for ipq8064"
diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig
index ada3d58138..95113f38cb 100644
--- a/src/soc/rockchip/rk3288/Kconfig
+++ b/src/soc/rockchip/rk3288/Kconfig
@@ -37,22 +37,4 @@ config BOOTBLOCK_CPU_INIT
string
default "soc/rockchip/rk3288/bootblock.c"
-# ROM image layout.
-#
-# 0x00000 Combined bootblock and ID Block
-# 0x08000 Master CBFS header.
-# 0x18000 Free for CBFS data.
-
-config BOOTBLOCK_ROM_OFFSET
- hex
- default 0x0
-
-config CBFS_HEADER_ROM_OFFSET
- hex
- default 0x0010000
-
-config CBFS_ROM_OFFSET
- hex
- default 0x0010100
-
endif
diff --git a/src/soc/samsung/exynos5250/Kconfig b/src/soc/samsung/exynos5250/Kconfig
index 7034e96201..ea63e9cda8 100644
--- a/src/soc/samsung/exynos5250/Kconfig
+++ b/src/soc/samsung/exynos5250/Kconfig
@@ -9,28 +9,3 @@ config CPU_SAMSUNG_EXYNOS5250
select HAVE_UART_SPECIAL
bool
default n
-
-if CPU_SAMSUNG_EXYNOS5250
-
-# ROM image layout.
-#
-# 0x0000: vendor-provided BL1 (8k).
-# 0x2000: bootblock
-# 0x9FFC-0xA000: BL2 checksum
-# 0xA000-0xA080: reserved for CBFS master header.
-# 0xA080: Free for CBFS data.
-
-config BOOTBLOCK_ROM_OFFSET
- hex
- default 0
-
-config CBFS_HEADER_ROM_OFFSET
- hex "offset of master CBFS header in ROM"
- default 0x9F80
-
-config CBFS_ROM_OFFSET
- # Calculated by BOOTBLOCK_ROM_OFFSET + max bootblock size.
- hex "offset of CBFS data in ROM"
- default 0x0A080
-
-endif
diff --git a/src/soc/samsung/exynos5420/Kconfig b/src/soc/samsung/exynos5420/Kconfig
index 072976a2ac..56ffed1940 100644
--- a/src/soc/samsung/exynos5420/Kconfig
+++ b/src/soc/samsung/exynos5420/Kconfig
@@ -10,28 +10,3 @@ config CPU_SAMSUNG_EXYNOS5420
select RELOCATABLE_MODULES
bool
default n
-
-if CPU_SAMSUNG_EXYNOS5420
-
-# ROM image layout.
-#
-# 0x0000: vendor-provided BL1 (8k).
-# 0x2000: variable length bootblock checksum header
-# 0x2010: bootblock
-# 0x9F80-0xA000: reserved for CBFS master header.
-# 0xA000: Free for CBFS data.
-
-config BOOTBLOCK_ROM_OFFSET
- hex
- default 0
-
-config CBFS_HEADER_ROM_OFFSET
- hex "offset of master CBFS header in ROM"
- default 0x9F80
-
-config CBFS_ROM_OFFSET
- # Calculated by BOOTBLOCK_ROM_OFFSET + max bootblock size.
- hex "offset of CBFS data in ROM"
- default 0x0A000
-
-endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 19:21:50 +0000