Martin Roth (martinroth@google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12570
-gerrit
commit 17a2aa428c4ee415581dff1028c240f43daf0db7 Author: Martin Roth martinroth@google.com Date: Sat Nov 28 16:32:25 2015 -0700
SeaBIOS/Kconfig: Remove SEABIOS_MALLOC_UPPERMEMORY option
This has been replaced by the PAYLOAD_CONFIGFILE option, allowing any SeaBIOS config option to be set by a platform.
Change-Id: I584c4c481266740840158baba76581d68e69b448 Signed-off-by: Martin Roth martinroth@google.com --- payloads/external/Makefile.inc | 3 +-- payloads/external/SeaBIOS/Kconfig | 12 ------------ payloads/external/SeaBIOS/Makefile.inc | 3 --- 3 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index b044a48..847eef1 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -54,8 +54,7 @@ seabios: CONFIG_SEABIOS_THREAD_OPTIONROMS=$(CONFIG_SEABIOS_THREAD_OPTIONROMS) \ CONFIG_SEABIOS_VGA_COREBOOT=$(CONFIG_SEABIOS_VGA_COREBOOT) \ CONFIG_CONSOLE_SERIAL=$(CONFIG_CONSOLE_SERIAL) \ - CONFIG_TTYS0_BASE=$(CONFIG_TTYS0_BASE) \ - CONFIG_SEABIOS_MALLOC_UPPERMEMORY=$(CONFIG_SEABIOS_MALLOC_UPPERMEMORY) + CONFIG_TTYS0_BASE=$(CONFIG_TTYS0_BASE)
filo: $(MAKE) -C payloads/external/FILO -f Makefile.inc \ diff --git a/payloads/external/SeaBIOS/Kconfig b/payloads/external/SeaBIOS/Kconfig index 468c689..4f4fb02 100644 --- a/payloads/external/SeaBIOS/Kconfig +++ b/payloads/external/SeaBIOS/Kconfig @@ -35,18 +35,6 @@ config SEABIOS_THREAD_OPTIONROMS variations during option ROM code execution. It is not known if all option ROMs will behave properly with this option.
-config SEABIOS_MALLOC_UPPERMEMORY - bool - default y - help - Use the "Upper Memory Block" area (0xc0000-0xf0000) for internal - "low memory" allocations. If this is not selected, the memory is - instead allocated from the "9-segment" (0x90000-0xa0000). - This is not typically needed, but may be required on some platforms - to allow USB and SATA buffers to be written correctly by the - hardware. In general, if this is desired, the option will be - set to 'N' by the chipset Kconfig. - config SEABIOS_VGA_COREBOOT prompt "Include generated option rom that implements legacy VGA BIOS compatibility" default n diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc index 21da35e..7754afb 100644 --- a/payloads/external/SeaBIOS/Makefile.inc +++ b/payloads/external/SeaBIOS/Makefile.inc @@ -31,9 +31,6 @@ ifeq ($(CONFIG_CONSOLE_SERIAL),y) else echo "# CONFIG_DEBUG_SERIAL is not set" >> seabios/.config endif -ifneq ($(CONFIG_SEABIOS_MALLOC_UPPERMEMORY),y) - echo "# CONFIG_MALLOC_UPPERMEMORY is not set" >> seabios/.config -endif ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y) echo "# CONFIG_THREAD_OPTIONROMS is not set" >> seabios/.config endif