diff options
author | Zheng Bao <fishbaozi@gmail.com> | 2013-02-18 16:56:09 +0800 |
---|---|---|
committer | Zheng Bao <zheng.bao@amd.com> | 2013-02-21 05:57:57 +0100 |
commit | 22ec9f9a72955d2364061db72520b85602077414 (patch) | |
tree | 1417afd15940f22f0e25abc5f340f36024110dff /src | |
parent | c8fadd9f465428cb2470d78c72b77766acb058d9 (diff) | |
download | coreboot-22ec9f9a72955d2364061db72520b85602077414.tar.gz coreboot-22ec9f9a72955d2364061db72520b85602077414.tar.bz2 coreboot-22ec9f9a72955d2364061db72520b85602077414.zip |
AMD S3: Introduce Kconfig variable 'S3_DATA_SIZE'
Currently the size of the volatile storage for S3 reserved in the
image is hardcoded to 32768 bytes. Make that configurable by
introducing the Kconfig 'S3_DATA_SIZE'.
As the storage space is needed for storing non-volatile, volatile and
MTRR data, add a check if the size is big enough.
Change-Id: I9152797cf0045c8da48109a9d760e417717686db
Signed-off-by: Zheng Bao <zheng.bao@amd.com>
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: http://review.coreboot.org/2383
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src')
-rw-r--r-- | src/cpu/amd/agesa/s3_resume.h | 4 | ||||
-rw-r--r-- | src/southbridge/amd/Makefile.inc | 2 | ||||
-rw-r--r-- | src/southbridge/amd/agesa/hudson/Kconfig | 8 | ||||
-rw-r--r-- | src/southbridge/amd/cimx/sb700/Kconfig | 8 | ||||
-rw-r--r-- | src/southbridge/amd/cimx/sb800/Kconfig | 8 | ||||
-rwxr-xr-x | src/southbridge/amd/cimx/sb900/Kconfig | 8 |
6 files changed, 37 insertions, 1 deletions
diff --git a/src/cpu/amd/agesa/s3_resume.h b/src/cpu/amd/agesa/s3_resume.h index 367cc3fbba75..af5b509adb00 100644 --- a/src/cpu/amd/agesa/s3_resume.h +++ b/src/cpu/amd/agesa/s3_resume.h @@ -28,6 +28,10 @@ #define S3_DATA_MTRR_POS (CONFIG_S3_DATA_POS + S3_DATA_VOLATILE_SIZE) #define S3_DATA_NONVOLATILE_POS (CONFIG_S3_DATA_POS + S3_DATA_VOLATILE_SIZE + S3_DATA_MTRR_SIZE) +#if (S3_DATA_VOLATILE_SIZE + S3_DATA_MTRR_SIZE + S3_DATA_NONVOLATILE_SIZE) > CONFIG_S3_DATA_SIZE +#error "Please increase the value of S3_DATA_SIZE" +#endif + typedef enum { S3DataTypeNonVolatile=0, ///< NonVolatile Data Type S3DataTypeVolatile ///< Volatile Data Type diff --git a/src/southbridge/amd/Makefile.inc b/src/southbridge/amd/Makefile.inc index 5f5431492c8f..cce4702058b2 100644 --- a/src/southbridge/amd/Makefile.inc +++ b/src/southbridge/amd/Makefile.inc @@ -22,7 +22,7 @@ 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) - LC_ALL=C awk 'BEGIN {for (i=0; i<32768; i++) {printf "%c", 255}}' > $@.tmp + 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 diff --git a/src/southbridge/amd/agesa/hudson/Kconfig b/src/southbridge/amd/agesa/hudson/Kconfig index a7436b50fc3f..f9013196f2d6 100644 --- a/src/southbridge/amd/agesa/hudson/Kconfig +++ b/src/southbridge/amd/agesa/hudson/Kconfig @@ -209,6 +209,14 @@ config S3_DATA_POS 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 bool "System is legacy free" help diff --git a/src/southbridge/amd/cimx/sb700/Kconfig b/src/southbridge/amd/cimx/sb700/Kconfig index 706309d3896d..37e9614ce599 100644 --- a/src/southbridge/amd/cimx/sb700/Kconfig +++ b/src/southbridge/amd/cimx/sb700/Kconfig @@ -68,5 +68,13 @@ config S3_DATA_POS 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 diff --git a/src/southbridge/amd/cimx/sb800/Kconfig b/src/southbridge/amd/cimx/sb800/Kconfig index f56e017d2d0f..2af0b32df6bf 100644 --- a/src/southbridge/amd/cimx/sb800/Kconfig +++ b/src/southbridge/amd/cimx/sb800/Kconfig @@ -130,6 +130,14 @@ config S3_DATA_POS 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 bool "Add IMC firmware" default n diff --git a/src/southbridge/amd/cimx/sb900/Kconfig b/src/southbridge/amd/cimx/sb900/Kconfig index 3cadba12938a..c886504e58a2 100755 --- a/src/southbridge/amd/cimx/sb900/Kconfig +++ b/src/southbridge/amd/cimx/sb900/Kconfig @@ -61,5 +61,13 @@ config S3_DATA_POS 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 |