erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cbfs: Remove remnants of ext-win-*

Browse source 
Since commit 34a7e66faa ("util/cbfstool: Add a new mechanism to
provide a memory map") the ext-win-base and ext-win-size option has been
replaced with the "--mmap" option.

Signed-off-by: Maximilian Brune <maximilian.brune@9elements.com>
Change-Id: I33cfb59d9dbe88c4f618301ac1506e3281b1a483
Reviewed-on: https://review.coreboot.org/c/coreboot/+/85619
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Reviewed-by: Nicholas Chin <nic.c3.14@gmail.com>
This commit is contained in:
Maximilian Brune 2024-12-17 11:22:57 +01:00 • committed by Felix Singer
commit c52ffcede3
3 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Documentation/util/cbfstool/mmap_windows.md
View file

@ -36,9 +36,8 @@ The location of standard decode window is fixed in host address space
`(4G - 16M) to 4G`. However, the platform is free to choose where the `(4G - 16M) to 4G`. However, the platform is free to choose where the
extended window lives in the host address space. Since `cbfstool` extended window lives in the host address space. Since `cbfstool`
needs to know the exact location of the extended window, it allows the needs to know the exact location of the extended window, it allows the
platform to pass in two parameters `ext-win-base` and `ext-win-size` platform to pass in one parameter `mmap` that provide the base and the
that provide the base and the size of the extended window in host size of the extended window in host address space.
address space.
`cbfstool` creates two memory map windows using the knowledge about the `cbfstool` creates two memory map windows using the knowledge about the
standard decode window and the information passed in by the platform standard decode window and the information passed in by the platform

1
Makefile.mk
View file

@ -988,7 +988,6 @@ endif
# #
# CBFSTOOL_ADD_CMD_OPTIONS can be used by arch/SoC/mainboard to supply # CBFSTOOL_ADD_CMD_OPTIONS can be used by arch/SoC/mainboard to supply
# add commands with any additional arguments for cbfstool. # add commands with any additional arguments for cbfstool.
# Example: --ext-win-base <base> --ext-win-size <size>
define cbfs-add-cmd-for-region define cbfs-add-cmd-for-region
$(CBFSTOOL) $@.tmp \ $(CBFSTOOL) $@.tmp \
add$(if $(filter stage,$(call extract_nth,3,$(1))),-stage)$(if \ add$(if $(filter stage,$(call extract_nth,3,$(1))),-stage)$(if \

8
util/cbfstool/cbfstool.c
View file

@ -1968,16 +1968,12 @@ static void usage(char *name)
" -U Unprocessed; don't decompress or make ELF\n" " -U Unprocessed; don't decompress or make ELF\n"
" -v Provide verbose output (-v=INFO -vv=DEBUG output)\n" " -v Provide verbose output (-v=INFO -vv=DEBUG output)\n"
" -h Display this help message\n\n" " -h Display this help message\n\n"
" --ext-win-base Base of extended decode window in host address\n"
" space(x86 only)\n"
" --ext-win-size Size of extended decode window in host address\n"
" space(x86 only)\n"
"COMMANDs:\n" "COMMANDs:\n"
" add [-r image,regions] -f FILE -n NAME -t TYPE [-A hash] \\\n" " add [-r image,regions] -f FILE -n NAME -t TYPE [-A hash] \\\n"
" [-c compression] [-b base-address | -a alignment] \\\n" " [-c compression] [-b base-address | -a alignment] \\\n"
" [-p padding size] [-y|--xip if TYPE is FSP] \\\n" " [-p padding size] [-y|--xip if TYPE is FSP] \\\n"
" [-j topswap-size] (Intel CPUs only) [--ibb] \\\n" " [-j topswap-size] (Intel CPUs only) [--ibb] \\\n"
" [--ext-win-base win-base --ext-win-size win-size] " " [--mmio flash-base:mmio-base:size] "
"Add a component\n" "Add a component\n"
" " " "
" -j valid size: 0x10000 0x20000 0x40000 0x80000 0x100000 \n" " -j valid size: 0x10000 0x20000 0x40000 0x80000 0x100000 \n"
@ -1990,7 +1986,7 @@ static void usage(char *name)
" [-S comma-separated-section(s)-to-ignore] \\\n" " [-S comma-separated-section(s)-to-ignore] \\\n"
" [-a alignment] [-Q|--pow2page] \\\n" " [-a alignment] [-Q|--pow2page] \\\n"
" [-y|--xip] [--ibb] \\\n" " [-y|--xip] [--ibb] \\\n"
" [--ext-win-base win-base --ext-win-size win-size] " " [--mmio flash-base:mmio-base:size] "
"Add a stage to the ROM\n" "Add a stage to the ROM\n"
" add-flat-binary [-r image,regions] -f FILE -n NAME \\\n" " add-flat-binary [-r image,regions] -f FILE -n NAME \\\n"
" [-A hash] -l load-address -e entry-point \\\n" " [-A hash] -l load-address -e entry-point \\\n"