GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AGESA: Move config parameters for non-volatile S3 data 

These parameters are not specific to the southbridge device, but
the implementation of S3 storage defined by CPU code.

Change-Id: Ic341cc2b7669cf8e3e920c48473826ec03fc7d8d
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6081
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Kyösti Mälkki 2014-06-19 03:48:42 +03:00
parent 207880cd11
commit 4f7cb87df2
7 changed files with 24 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cpu/amd/agesa/Kconfig
View File

@ -66,6 +66,15 @@ config DCACHE_RAM_BASE
config DCACHE_RAM_SIZE config DCACHE_RAM_SIZE
hex hex
default 0x10000 default 0x10000
config S3_DATA_POS
hex
default 0xFFFF0000
config S3_DATA_SIZE
int
default 32768
endif # CPU_AMD_AGESA endif # CPU_AMD_AGESA
source src/cpu/amd/agesa/family10/Kconfig source src/cpu/amd/agesa/family10/Kconfig

15
src/cpu/amd/agesa/Makefile.inc
View File

@ -29,3 +29,18 @@ cpu_incs += $(src)/cpu/amd/agesa/cache_as_ram.inc
romstage-y += heapmanager.c romstage-y += heapmanager.c
ramstage-y += heapmanager.c ramstage-y += heapmanager.c
ifeq ($(CONFIG_HAVE_ACPI_RESUME), y)
$(obj)/coreboot_s3nv.rom: $(obj)/config.h
echo " S3 NVRAM $(CONFIG_S3_DATA_POS) (S3 storage area)"
# force C locale, so cygwin awk doesn't try to interpret the 0xff below as UTF-8 (or worse)
printf %d $(CONFIG_S3_DATA_SIZE) | LC_ALL=C awk '{for (i=0; i<$$1; i++) {printf "%c", 255}}' > $@.tmp
mv $@.tmp $@
cbfs-files-y += s3nv
s3nv-file := $(obj)/coreboot_s3nv.rom
s3nv-position := $(CONFIG_S3_DATA_POS)
s3nv-type := raw
endif # CONFIG_HAVE_ACPI_RESUME == y

17
src/southbridge/amd/Makefile.inc
View File

@ -16,20 +16,3 @@ subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800) += cimx
subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900) += cimx subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900) += cimx
subdirs-$(CONFIG_SOUTHBRIDGE_AMD_AGESA_HUDSON) += agesa subdirs-$(CONFIG_SOUTHBRIDGE_AMD_AGESA_HUDSON) += agesa
subdirs-$(CONFIG_SOUTHBRIDGE_AMD_AGESA_YANGTZE) += agesa subdirs-$(CONFIG_SOUTHBRIDGE_AMD_AGESA_YANGTZE) += agesa
ifeq ($(CONFIG_HAVE_ACPI_RESUME), y)
ifeq ($(CONFIG_CPU_AMD_AGESA), y)
$(obj)/coreboot_s3nv.rom: $(obj)/config.h
echo " S3 NVRAM $(CONFIG_S3_DATA_POS) (S3 storage area)"
# force C locale, so cygwin awk doesn't try to interpret the 0xff below as UTF-8 (or worse)
printf %d $(CONFIG_S3_DATA_SIZE) | LC_ALL=C awk '{for (i=0; i<$$1; i++) {printf "%c", 255}}' > $@.tmp
mv $@.tmp $@
cbfs-files-y += s3nv
s3nv-file := $(obj)/coreboot_s3nv.rom
s3nv-position := $(CONFIG_S3_DATA_POS)
s3nv-type := raw
endif # CONFIG_CPU_AMD_AGESA == y
endif # CONFIG_HAVE_ACPI_RESUME == y

16
src/southbridge/amd/agesa/hudson/Kconfig
View File

@ -215,22 +215,6 @@ config RAID_MISC_ROM_POSITION
The CONFIG_ROM_SIZE must larger than 0x100000. The CONFIG_ROM_SIZE must larger than 0x100000.
endif # HUDSON_SATA_RAID endif # HUDSON_SATA_RAID
config S3_DATA_POS
hex "S3 volatile storage position"
default 0xFFFF0000
depends on HAVE_ACPI_RESUME
help
For a system with S3 feature, the BIOS needs to save some data to
non-volatile storage at cold boot stage.
config S3_DATA_SIZE
int "S3 volatile storage size"
default 32768
depends on HAVE_ACPI_RESUME
help
For a system with S3 feature, the BIOS needs to save some data to
non-volatile storage at cold boot stage.
config HUDSON_LEGACY_FREE config HUDSON_LEGACY_FREE
bool "System is legacy free" bool "System is legacy free"
help help

16
src/southbridge/amd/cimx/sb700/Kconfig
View File

@ -67,21 +67,5 @@ config REDIRECT_SBCIMX_TRACE_TO_SERIAL
Warning: Only enable this option when debuging or tracing AMD CIMX code. Warning: Only enable this option when debuging or tracing AMD CIMX code.
config S3_DATA_POS
hex "S3 volatile storage position"
default 0xFFFF0000
depends on HAVE_ACPI_RESUME
help
For a system with S3 feature, the BIOS needs to save some data to
non-volatile storage at cold boot stage.
config S3_DATA_SIZE
int "S3 volatile storage size"
default 32768
depends on HAVE_ACPI_RESUME
help
For a system with S3 feature, the BIOS needs to save some data to
non-volatile storage at cold boot stage.
endif #SOUTHBRIDGE_AMD_CIMX_SB700 endif #SOUTHBRIDGE_AMD_CIMX_SB700

16
src/southbridge/amd/cimx/sb800/Kconfig
View File

@ -124,22 +124,6 @@ config RAID_MISC_ROM_POSITION
endif endif
config S3_DATA_POS
hex "S3 volatile storage position"
default 0xFFFF0000
depends on HAVE_ACPI_RESUME
help
For a system with S3 feature, the BIOS needs to save some data to
non-volatile storage at cold boot stage.
config S3_DATA_SIZE
int "S3 volatile storage size"
default 32768
depends on HAVE_ACPI_RESUME
help
For a system with S3 feature, the BIOS needs to save some data to
non-volatile storage at cold boot stage.
config SB800_IMC_FWM config SB800_IMC_FWM
bool "Add IMC firmware" bool "Add IMC firmware"
default n default n

16
src/southbridge/amd/cimx/sb900/Kconfig
View File

@ -54,21 +54,5 @@ config BOOTBLOCK_SOUTHBRIDGE_INIT
string string
default "southbridge/amd/cimx/sb900/bootblock.c" default "southbridge/amd/cimx/sb900/bootblock.c"
config S3_DATA_POS
hex "S3 volatile storage position"
default 0xFFFF0000
depends on HAVE_ACPI_RESUME
help
For a system with S3 feature, the BIOS needs to save some data to
non-volatile storage at cold boot stage.
config S3_DATA_SIZE
int "S3 volatile storage size"
default 32768
depends on HAVE_ACPI_RESUME
help
For a system with S3 feature, the BIOS needs to save some data to
non-volatile storage at cold boot stage.
endif #SOUTHBRIDGE_AMD_CIMX_SB900 endif #SOUTHBRIDGE_AMD_CIMX_SB900