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

AMD S3: Remove the hardcoded volatile position 

Change-Id: I4bcf3f3435f0ba487955d14ed1b010fd94b9f625
Signed-off-by: Zheng Bao <zheng.bao@amd.com>
Signed-off-by: zbao <fishbaozi@gmail.com>
Reviewed-on: http://review.coreboot.org/1408
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
This commit is contained in:
zbao 2012-08-05 11:46:23 +08:00 committed by Alexandru Gagniuc
parent 695cc769e6
commit f85398c3ab
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpu/amd/agesa/s3_resume.h
View File

@ -20,9 +20,9 @@
#ifndef S3_RESUME_H #ifndef S3_RESUME_H
#define S3_RESUME_H #define S3_RESUME_H
#define S3_DATA_NONVOLATILE_POS 0xFFFF7000 #define S3_DATA_NONVOLATILE_POS (CONFIG_S3_VOLATILE_POS + 0x7000)
#define S3_DATA_VOLATILE_POS 0xFFFF0000 #define S3_DATA_VOLATILE_POS CONFIG_S3_VOLATILE_POS
#define S3_DATA_MTRR_POS 0xFFFF6000 #define S3_DATA_MTRR_POS (CONFIG_S3_VOLATILE_POS + 0x6000)
typedef enum { typedef enum {
S3DataTypeNonVolatile=0, ///< NonVolatile Data Type S3DataTypeNonVolatile=0, ///< NonVolatile Data Type

5
src/southbridge/amd/Kconfig
View File

@ -14,3 +14,8 @@ source src/southbridge/amd/sb800/Kconfig
source src/southbridge/amd/cimx/Kconfig source src/southbridge/amd/cimx/Kconfig
source src/southbridge/amd/agesa/Kconfig source src/southbridge/amd/agesa/Kconfig
source src/southbridge/amd/sr5650/Kconfig source src/southbridge/amd/sr5650/Kconfig
# This can be overriden by mainboard/Kconfig
config S3_VOLATILE_POS
hex
default 0xFFFF0000

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

@ -20,14 +20,14 @@ ifeq ($(CONFIG_HAVE_ACPI_RESUME), y)
ifeq ($(CONFIG_CPU_AMD_AGESA), y) ifeq ($(CONFIG_CPU_AMD_AGESA), y)
$(obj)/s3.rom: $(obj)/s3.rom:
echo " S3 NVRAM 0xffff0000 (S3 storage area)" echo " S3 NVRAM $(CONFIG_S3_VOLATILE_POS) (S3 storage area)"
# force C locale, so cygwin awk doesn't try to interpret the 0xff below as UTF-8 (or worse) # 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 LC_ALL=C awk 'BEGIN {for (i=0; i<32768; i++) {printf "%c", 255}}' > $@.tmp
mv $@.tmp $@ mv $@.tmp $@
cbfs-files-y += s3nv cbfs-files-y += s3nv
s3nv-file := $(obj)/s3.rom s3nv-file := $(obj)/s3.rom
s3nv-position := 0xffff0000 s3nv-position := $(CONFIG_S3_VOLATILE_POS)
s3nv-type := raw s3nv-type := raw
endif # CONFIG_CPU_AMD_AGESA == y endif # CONFIG_CPU_AMD_AGESA == y