[S] Change in coreboot[main]: cbfs: Remove remnants of ext-win-*

[Felix Singer (Code Review)]

Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/85619?usp=email )

Change subject: cbfs: Remove remnants of ext-win-*
......................................................................

cbfs: Remove remnants of ext-win-*

Since commit 34a7e66faa46 ("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 
Change-Id: I33cfb59d9dbe88c4f618301ac1506e3281b1a483
Reviewed-on: https://review.coreboot.org/c/coreboot/+/85619
Tested-by: build bot (Jenkins) 
Reviewed-by: Felix Singer 
Reviewed-by: Nicholas Chin 
---
M Documentation/util/cbfstool/mmap_windows.md
M Makefile.mk
M util/cbfstool/cbfstool.c
3 files changed, 4 insertions(+), 10 deletions(-)

Approvals:
  Felix Singer: Looks good to me, approved
  build bot (Jenkins): Verified
  Nicholas Chin: Looks good to me, approved

diff --git a/Documentation/util/cbfstool/mmap_windows.md b/Documentation/util/cbfstool/mmap_windows.md
index 66685f3..654653c 100644
--- a/Documentation/util/cbfstool/mmap_windows.md
+++ b/Documentation/util/cbfstool/mmap_windows.md
@@ -36,9 +36,8 @@
 `(4G - 16M) to 4G`. However, the platform is free to choose where the
 extended window lives in the host address space. Since `cbfstool`
 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`
-that provide the base and the size of the extended window in host
-address space.
+platform to pass in one parameter `mmap` that provide the base and the
+size of the extended window in host address space.

`cbfstool` creates two memory map windows using the knowledge about the
 standard decode window and the information passed in by the platform
diff --git a/Makefile.mk b/Makefile.mk
index ca79d05..bc547de 100644
--- a/Makefile.mk
+++ b/Makefile.mk
@@ -988,7 +988,6 @@
 #
 # CBFSTOOL_ADD_CMD_OPTIONS can be used by arch/SoC/mainboard to supply
 # add commands with any additional arguments for cbfstool.
-# Example: --ext-win-base <base> --ext-win-size <size>
 define cbfs-add-cmd-for-region
    $(CBFSTOOL) $@.tmp \
    add$(if $(filter stage,$(call extract_nth,3,$(1))),-stage)$(if \
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 25f4847..5eb6335 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -1968,16 +1968,12 @@
         "  -U               Unprocessed; don't decompress or make ELF\n"
         "  -v               Provide verbose output (-v=INFO -vv=DEBUG output)\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"
         " add [-r image,regions] -f FILE -n NAME -t TYPE [-A hash] \\n"
         "        [-c compression] [-b base-address | -a alignment] \\n"
         "        [-p padding size] [-y|--xip if TYPE is FSP]       \\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"
         "                                                         "
         "    -j valid size: 0x10000 0x20000 0x40000 0x80000 0x100000 \n"
@@ -1990,7 +1986,7 @@
         "        [-S comma-separated-section(s)-to-ignore] \\n"
         "        [-a alignment] [-Q|--pow2page] \\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-flat-binary [-r image,regions] -f FILE -n NAME \\n"
         "        [-A hash] -l load-address -e entry-point \\n"