summaryrefslogtreecommitdiff
path: root/src/southbridge
diff options
context:
space:
mode:
authorzbao <fishbaozi@gmail.com>2012-08-05 11:46:23 +0800
committerAlexandru Gagniuc <mr.nuke.me@gmail.com>2012-08-05 06:34:15 +0200
commitf85398c3ab2073fe7c4abdaa74d1adc9945d2fd2 (patch)
tree930b344ddcdbf331264f3e35b17ff7a2cee0cc2a /src/southbridge
parent695cc769e6dfdabc4891342f0b949d948d42cf3c (diff)
downloadcoreboot-f85398c3ab2073fe7c4abdaa74d1adc9945d2fd2.tar.xz
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>
Diffstat (limited to 'src/southbridge')
-rw-r--r--src/southbridge/amd/Kconfig5
-rw-r--r--src/southbridge/amd/Makefile.inc4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/southbridge/amd/Kconfig b/src/southbridge/amd/Kconfig
index 867afcaf8b..23f6c066fd 100644
--- a/src/southbridge/amd/Kconfig
+++ b/src/southbridge/amd/Kconfig
@@ -14,3 +14,8 @@ source src/southbridge/amd/sb800/Kconfig
source src/southbridge/amd/cimx/Kconfig
source src/southbridge/amd/agesa/Kconfig
source src/southbridge/amd/sr5650/Kconfig
+
+# This can be overriden by mainboard/Kconfig
+config S3_VOLATILE_POS
+ hex
+ default 0xFFFF0000
diff --git a/src/southbridge/amd/Makefile.inc b/src/southbridge/amd/Makefile.inc
index 970971518a..d2b9b653e5 100644
--- a/src/southbridge/amd/Makefile.inc
+++ b/src/southbridge/amd/Makefile.inc
@@ -20,14 +20,14 @@ ifeq ($(CONFIG_HAVE_ACPI_RESUME), y)
ifeq ($(CONFIG_CPU_AMD_AGESA), y)
$(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)
LC_ALL=C awk 'BEGIN {for (i=0; i<32768; i++) {printf "%c", 255}}' > $@.tmp
mv $@.tmp $@
cbfs-files-y += s3nv
s3nv-file := $(obj)/s3.rom
-s3nv-position := 0xffff0000
+s3nv-position := $(CONFIG_S3_VOLATILE_POS)
s3nv-type := raw
endif # CONFIG_CPU_AMD_AGESA == y