AMD: Move RAMBASE and RAMTOP

There are no reasons to not load ramstage @ 0x100000.

Boards with HAVE_ACPI_RESUME enabled have performance penalty in using
excessive RAMTOP. For these boards, this change releases 11 MiB of RAM from CBMEM allocation to OS.

Change-Id: Ib71995aba5e9332d0ec1626b3eb3b4ef6a506d1c
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7094
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>

54 files changed, 28 insertions, 536 deletions

diff --git a/src/Kconfig b/src/Kconfig
index cb29a2529a..ee0b78edd1 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -316,6 +316,11 @@ config TPM
 
 	  If unsure, say N.
 
+config RAMTOP
+	hex
+	default 0x200000
+	depends on ARCH_X86
+
 config HEAP_SIZE
 	hex
 	default 0x4000
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index c2e062424d..56d8f88dd6 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -30,10 +30,6 @@ config RAMBASE
 	hex
 	default 0x100000
 
-config RAMTOP
-	hex
-	default 0x200000
-
 config STACK_SIZE
 	hex
 	default 0x1000
diff --git a/src/mainboard/advansus/a785e-i/Kconfig b/src/mainboard/advansus/a785e-i/Kconfig
index b3427a2d46..ef7faf42a5 100644
--- a/src/mainboard/advansus/a785e-i/Kconfig
+++ b/src/mainboard/advansus/a785e-i/Kconfig
@@ -73,18 +73,6 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_010000b6.h"
 
-config RAMTOP
-	hex
-	default 0x2000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config VGA_BIOS_ID
         string
         default "1002,9712"
diff --git a/src/mainboard/amd/bimini_fam10/Kconfig b/src/mainboard/amd/bimini_fam10/Kconfig
index 3ebd3b277d..52f45e4827 100644
--- a/src/mainboard/amd/bimini_fam10/Kconfig
+++ b/src/mainboard/amd/bimini_fam10/Kconfig
@@ -73,16 +73,4 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_010000b6.h"
 
-config RAMTOP
-	hex
-	default 0x2000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 endif #BOARD_AMD_BIMINI_FAM10
diff --git a/src/mainboard/amd/dinar/Kconfig b/src/mainboard/amd/dinar/Kconfig
index b71c5a570e..a8093fb4bc 100644
--- a/src/mainboard/amd/dinar/Kconfig
+++ b/src/mainboard/amd/dinar/Kconfig
@@ -61,18 +61,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config DRIVERS_PS2_KEYBOARD
 	bool
 	default y
diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig
index 279c7eff62..d8ce909d41 100644
--- a/src/mainboard/amd/inagua/Kconfig
+++ b/src/mainboard/amd/inagua/Kconfig
@@ -57,18 +57,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config DRIVERS_PS2_KEYBOARD
 	bool
 	default y
diff --git a/src/mainboard/amd/mahogany_fam10/Kconfig b/src/mainboard/amd/mahogany_fam10/Kconfig
index 688badbcb7..8250580b52 100644
--- a/src/mainboard/amd/mahogany_fam10/Kconfig
+++ b/src/mainboard/amd/mahogany_fam10/Kconfig
@@ -61,18 +61,6 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_01000095.h"
 
-config RAMTOP
-	hex
-	default 0x2000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config VGA_BIOS_ID
 	string
 	default "1002,9615"
diff --git a/src/mainboard/amd/olivehill/Kconfig b/src/mainboard/amd/olivehill/Kconfig
index a089d21f7f..ea975502db 100644
--- a/src/mainboard/amd/olivehill/Kconfig
+++ b/src/mainboard/amd/olivehill/Kconfig
@@ -56,22 +56,10 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
 config ACPI_SSDTX_NUM
 	int
 	default 0
 
-config RAMBASE
-	hex
-	default 0x200000
-
 config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
diff --git a/src/mainboard/amd/olivehillplus/Kconfig b/src/mainboard/amd/olivehillplus/Kconfig
index a61859f368..883df6c6bb 100644
--- a/src/mainboard/amd/olivehillplus/Kconfig
+++ b/src/mainboard/amd/olivehillplus/Kconfig
@@ -56,22 +56,10 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
 config ACPI_SSDTX_NUM
 	int
 	default 0
 
-config RAMBASE
-	hex
-	default 0x200000
-
 config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
diff --git a/src/mainboard/amd/parmer/Kconfig b/src/mainboard/amd/parmer/Kconfig
index 735321e609..ff198a64be 100644
--- a/src/mainboard/amd/parmer/Kconfig
+++ b/src/mainboard/amd/parmer/Kconfig
@@ -57,18 +57,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig
index 698d74acdd..d64c88e614 100644
--- a/src/mainboard/amd/persimmon/Kconfig
+++ b/src/mainboard/amd/persimmon/Kconfig
@@ -57,18 +57,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
index c542d8cbc4..f0b20431e8 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -62,20 +62,8 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_01000095.h"
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
 config ACPI_SSDTX_NUM
 	int
 	default 5
 
-config RAMBASE
-	hex
-	default 0x200000
-
 endif # BOARD_AMD_SERENGETI_CHEETAH_FAM10
diff --git a/src/mainboard/amd/south_station/Kconfig b/src/mainboard/amd/south_station/Kconfig
index 813dcfcda0..7982a06658 100644
--- a/src/mainboard/amd/south_station/Kconfig
+++ b/src/mainboard/amd/south_station/Kconfig
@@ -57,18 +57,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
diff --git a/src/mainboard/amd/thatcher/Kconfig b/src/mainboard/amd/thatcher/Kconfig
index aacd1e3e47..c2283650ea 100644
--- a/src/mainboard/amd/thatcher/Kconfig
+++ b/src/mainboard/amd/thatcher/Kconfig
@@ -57,18 +57,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
diff --git a/src/mainboard/amd/tilapia_fam10/Kconfig b/src/mainboard/amd/tilapia_fam10/Kconfig
index b1a201aa8c..4f5b8d52d3 100644
--- a/src/mainboard/amd/tilapia_fam10/Kconfig
+++ b/src/mainboard/amd/tilapia_fam10/Kconfig
@@ -61,18 +61,6 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_010000b6.h"
 
-config RAMTOP
-	hex
-	default 0x2000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config VGA_BIOS
         bool
         default n
diff --git a/src/mainboard/amd/torpedo/Kconfig b/src/mainboard/amd/torpedo/Kconfig
index 6013df7821..b4d6f5e346 100644
--- a/src/mainboard/amd/torpedo/Kconfig
+++ b/src/mainboard/amd/torpedo/Kconfig
@@ -67,18 +67,6 @@ config IRQ_SLOT_COUNT
         int
         default 11
 
-config RAMTOP
-        hex
-        default 0x1000000
-
-config HEAP_SIZE
-        hex
-        default 0xc0000
-
-config RAMBASE
-        hex
-        default 0x200000
-
 config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig
index 89554350f9..faaa8e8d14 100644
--- a/src/mainboard/amd/union_station/Kconfig
+++ b/src/mainboard/amd/union_station/Kconfig
@@ -56,18 +56,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig
index 2f2e58d751..9ef46c4cac 100644
--- a/src/mainboard/asrock/e350m1/Kconfig
+++ b/src/mainboard/asrock/e350m1/Kconfig
@@ -57,18 +57,6 @@ config IRQ_SLOT_COUNT
         int
         default 11
 
-config RAMTOP
-        hex
-        default 0x1000000
-
-config HEAP_SIZE
-        hex
-        default 0xc0000
-
-config RAMBASE
-        hex
-        default 0x200000
-
 config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
diff --git a/src/mainboard/asrock/imb-a180/Kconfig b/src/mainboard/asrock/imb-a180/Kconfig
index aa075c8e62..f3c8aa78d6 100644
--- a/src/mainboard/asrock/imb-a180/Kconfig
+++ b/src/mainboard/asrock/imb-a180/Kconfig
@@ -57,22 +57,10 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
 config ACPI_SSDTX_NUM
 	int
 	default 0
 
-config RAMBASE
-	hex
-	default 0x200000
-
 config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
diff --git a/src/mainboard/asus/a8v-e_deluxe/Kconfig b/src/mainboard/asus/a8v-e_deluxe/Kconfig
index a1533c4915..8ebff310fb 100644
--- a/src/mainboard/asus/a8v-e_deluxe/Kconfig
+++ b/src/mainboard/asus/a8v-e_deluxe/Kconfig
@@ -53,10 +53,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 1
 
-config HEAP_SIZE
-	hex
-	default 0x40000
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
diff --git a/src/mainboard/asus/a8v-e_se/Kconfig b/src/mainboard/asus/a8v-e_se/Kconfig
index dcc75fa341..d819b0dad9 100644
--- a/src/mainboard/asus/a8v-e_se/Kconfig
+++ b/src/mainboard/asus/a8v-e_se/Kconfig
@@ -53,10 +53,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 1
 
-config HEAP_SIZE
-	hex
-	default 0x40000
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
diff --git a/src/mainboard/asus/f2a85-m/Kconfig b/src/mainboard/asus/f2a85-m/Kconfig
index 6dea246f98..e3236f7025 100644
--- a/src/mainboard/asus/f2a85-m/Kconfig
+++ b/src/mainboard/asus/f2a85-m/Kconfig
@@ -82,18 +82,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
diff --git a/src/mainboard/asus/k8v-x/Kconfig b/src/mainboard/asus/k8v-x/Kconfig
index 0e829f084b..1deb5b673f 100644
--- a/src/mainboard/asus/k8v-x/Kconfig
+++ b/src/mainboard/asus/k8v-x/Kconfig
@@ -56,10 +56,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 1
 
-config HEAP_SIZE
-	hex
-	default 0x40000
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index 2c1331f6d3..27b8253d08 100644
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -63,10 +63,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 1
 
-config HEAP_SIZE
-	hex
-	default 0x40000
-
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
diff --git a/src/mainboard/asus/m2v/Kconfig b/src/mainboard/asus/m2v/Kconfig
index 099309689e..35ad38dd1b 100644
--- a/src/mainboard/asus/m2v/Kconfig
+++ b/src/mainboard/asus/m2v/Kconfig
@@ -56,10 +56,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 1
 
-config HEAP_SIZE
-	hex
-	default 0x40000
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
diff --git a/src/mainboard/asus/m4a78-em/Kconfig b/src/mainboard/asus/m4a78-em/Kconfig
index d100806399..440b7f5743 100644
--- a/src/mainboard/asus/m4a78-em/Kconfig
+++ b/src/mainboard/asus/m4a78-em/Kconfig
@@ -60,16 +60,4 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_010000b6.h"
 
-config RAMTOP
-	hex
-	default 0x2000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 endif
diff --git a/src/mainboard/asus/m4a785-m/Kconfig b/src/mainboard/asus/m4a785-m/Kconfig
index e0e76fef0a..5162e167d8 100644
--- a/src/mainboard/asus/m4a785-m/Kconfig
+++ b/src/mainboard/asus/m4a785-m/Kconfig
@@ -61,16 +61,4 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_010000b6.h"
 
-config RAMTOP
-	hex
-	default 0x2000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 endif
diff --git a/src/mainboard/asus/m4a785t-m/Kconfig b/src/mainboard/asus/m4a785t-m/Kconfig
index 71affb8968..3e3fcea97b 100644
--- a/src/mainboard/asus/m4a785t-m/Kconfig
+++ b/src/mainboard/asus/m4a785t-m/Kconfig
@@ -63,16 +63,4 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_0100009f.h"
 
-config RAMTOP
-	hex
-	default 0x2000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 endif
diff --git a/src/mainboard/asus/m5a88-v/Kconfig b/src/mainboard/asus/m5a88-v/Kconfig
index 40ac5428f3..a76dd5200e 100644
--- a/src/mainboard/asus/m5a88-v/Kconfig
+++ b/src/mainboard/asus/m5a88-v/Kconfig
@@ -71,18 +71,6 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_010000bf.h"
 
-config RAMTOP
-	hex
-	default 0x2000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config VGA_BIOS_ID
         string
         default "1002,9715"
diff --git a/src/mainboard/avalue/eax-785e/Kconfig b/src/mainboard/avalue/eax-785e/Kconfig
index 32b2affa0c..30fbe25ac4 100644
--- a/src/mainboard/avalue/eax-785e/Kconfig
+++ b/src/mainboard/avalue/eax-785e/Kconfig
@@ -73,18 +73,6 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_010000b6.h"
 
-config RAMTOP
-	hex
-	default 0x2000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config VGA_BIOS_ID
         string
         default "1002,9712"
diff --git a/src/mainboard/gigabyte/ma785gm/Kconfig b/src/mainboard/gigabyte/ma785gm/Kconfig
index 67804dcd32..82b5c4f070 100644
--- a/src/mainboard/gigabyte/ma785gm/Kconfig
+++ b/src/mainboard/gigabyte/ma785gm/Kconfig
@@ -61,16 +61,4 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_010000b6.h"
 
-config RAMTOP
-	hex
-	default 0x2000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 endif # BOARD_GIGABYTE_MA785GM
diff --git a/src/mainboard/gigabyte/ma785gmt/Kconfig b/src/mainboard/gigabyte/ma785gmt/Kconfig
index 3dee469167..7ae9ef86c3 100644
--- a/src/mainboard/gigabyte/ma785gmt/Kconfig
+++ b/src/mainboard/gigabyte/ma785gmt/Kconfig
@@ -61,16 +61,4 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_010000b6.h"
 
-config RAMTOP
-	hex
-	default 0x2000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 endif # BOARD_GIGABYTE_MA785GMT
diff --git a/src/mainboard/gigabyte/ma78gm/Kconfig b/src/mainboard/gigabyte/ma78gm/Kconfig
index f42008a02e..cd4fadf85d 100644
--- a/src/mainboard/gigabyte/ma78gm/Kconfig
+++ b/src/mainboard/gigabyte/ma78gm/Kconfig
@@ -61,16 +61,4 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_01000095.h"
 
-config RAMTOP
-	hex
-	default 0x2000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 endif # BOARD_GIGABYTE_MA78GM
diff --git a/src/mainboard/gizmosphere/gizmo/Kconfig b/src/mainboard/gizmosphere/gizmo/Kconfig
index fc34f12ee2..d949c5932d 100755
--- a/src/mainboard/gizmosphere/gizmo/Kconfig
+++ b/src/mainboard/gizmosphere/gizmo/Kconfig
@@ -58,18 +58,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
diff --git a/src/mainboard/hp/dl165_g6_fam10/Kconfig b/src/mainboard/hp/dl165_g6_fam10/Kconfig
index 985f4f546f..5bb58dba33 100644
--- a/src/mainboard/hp/dl165_g6_fam10/Kconfig
+++ b/src/mainboard/hp/dl165_g6_fam10/Kconfig
@@ -68,18 +68,6 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_01000095.h"
 
-config RAMBASE
-	hex
-	default 0x200000
-
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
 config BOOTBLOCK_MAINBOARD_INIT
 	string
 	default "mainboard/hp/dl165_g6_fam10/bootblock.c"
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
index d82bfb5efd..12e0579c6d 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
+++ b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
@@ -61,18 +61,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
diff --git a/src/mainboard/iei/kino-780am2-fam10/Kconfig b/src/mainboard/iei/kino-780am2-fam10/Kconfig
index 08c49a3688..7565043ed7 100644
--- a/src/mainboard/iei/kino-780am2-fam10/Kconfig
+++ b/src/mainboard/iei/kino-780am2-fam10/Kconfig
@@ -61,18 +61,6 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_01000086.h"
 
-config RAMTOP
-	hex
-	default 0x2000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config VGA_BIOS_ID
 	string
 	default "1002,9615"
diff --git a/src/mainboard/jetway/nf81-t56n-lf/Kconfig b/src/mainboard/jetway/nf81-t56n-lf/Kconfig
index 8a1e78bce5..2abaa68e83 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/Kconfig
+++ b/src/mainboard/jetway/nf81-t56n-lf/Kconfig
@@ -58,18 +58,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
diff --git a/src/mainboard/jetway/pa78vm5/Kconfig b/src/mainboard/jetway/pa78vm5/Kconfig
index 8d007a4456..c779eca988 100644
--- a/src/mainboard/jetway/pa78vm5/Kconfig
+++ b/src/mainboard/jetway/pa78vm5/Kconfig
@@ -61,16 +61,4 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_010000b6.h"
 
-config RAMTOP
-	hex
-	default 0x2000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 endif # BOARD_JETWAY_PA78VM5
diff --git a/src/mainboard/kontron/kt690/Kconfig b/src/mainboard/kontron/kt690/Kconfig
index 2891736b59..8d1f039a12 100644
--- a/src/mainboard/kontron/kt690/Kconfig
+++ b/src/mainboard/kontron/kt690/Kconfig
@@ -29,10 +29,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "KT690/mITX"
 
-config HEAP_SIZE
-	hex
-	default 0x8000
-
 config MAX_CPUS
 	int
 	default 2
diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig
index 64c9dd5e69..0e1b17bf83 100644
--- a/src/mainboard/lippert/frontrunner-af/Kconfig
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig
@@ -59,18 +59,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig
index 32ea029e64..72c0390aa1 100644
--- a/src/mainboard/lippert/toucan-af/Kconfig
+++ b/src/mainboard/lippert/toucan-af/Kconfig
@@ -61,18 +61,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index 15e179a65a..91ddbbc961 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -49,10 +49,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 
-config HEAP_SIZE
-	hex
-	default 0x20000
-
 config USE_OPTION_TABLE
 	bool
 	default n
@@ -61,10 +57,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "MS-9652"
 
-config RAMBASE
-	hex
-	default 0x200000
-
 config DEFAULT_CONSOLE_LOGLEVEL
 	int
 	default 9
@@ -97,10 +89,6 @@ config APIC_ID_OFFSET
 	hex
 	default 0x00
 
-config RAMTOP
-	hex
-	default 0x1000000
-
 config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_01000096.h"
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
index 02c46918c6..9f31542d89 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
@@ -32,18 +32,6 @@ config DCACHE_RAM_SIZE
 	hex
 	default 0x0c000
 
-config RAMBASE
-	hex
-	default 0x200000
-
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
 config APIC_ID_OFFSET
 	hex
 	default 0x0
diff --git a/src/mainboard/supermicro/h8qgi/Kconfig b/src/mainboard/supermicro/h8qgi/Kconfig
index ee78a2fbba..ced30cfcce 100644
--- a/src/mainboard/supermicro/h8qgi/Kconfig
+++ b/src/mainboard/supermicro/h8qgi/Kconfig
@@ -60,18 +60,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config DRIVERS_PS2_KEYBOARD
 	bool
 	default y
diff --git a/src/mainboard/supermicro/h8qme_fam10/Kconfig b/src/mainboard/supermicro/h8qme_fam10/Kconfig
index 28d408e469..89798aae52 100644
--- a/src/mainboard/supermicro/h8qme_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig
@@ -30,18 +30,6 @@ config DCACHE_RAM_SIZE
 	hex
 	default 0x0c000
 
-config RAMBASE
-	hex
-	default 0x200000
-
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xff000
-
 config APIC_ID_OFFSET
 	hex
 	default 0x0
diff --git a/src/mainboard/supermicro/h8scm/Kconfig b/src/mainboard/supermicro/h8scm/Kconfig
index a9757dfb62..793b918397 100644
--- a/src/mainboard/supermicro/h8scm/Kconfig
+++ b/src/mainboard/supermicro/h8scm/Kconfig
@@ -63,18 +63,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config DRIVERS_PS2_KEYBOARD
 	bool
 	default y
diff --git a/src/mainboard/supermicro/h8scm_fam10/Kconfig b/src/mainboard/supermicro/h8scm_fam10/Kconfig
index 967b62dbac..e76ecece2c 100644
--- a/src/mainboard/supermicro/h8scm_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8scm_fam10/Kconfig
@@ -61,16 +61,4 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_010000c4.h"
 
-config RAMTOP
-	hex
-	default 0x2000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 endif # BOARD_AMD_H8SCM_FAM10
diff --git a/src/mainboard/technexion/tim5690/Kconfig b/src/mainboard/technexion/tim5690/Kconfig
index 072919ddf0..98dce39aa2 100644
--- a/src/mainboard/technexion/tim5690/Kconfig
+++ b/src/mainboard/technexion/tim5690/Kconfig
@@ -53,8 +53,4 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config HEAP_SIZE
-	hex
-	default 0x4000
-
 endif # BOARD_TECHNEXION_TIM5690
diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig
index 8b651c64ed..901a7edf4b 100644
--- a/src/mainboard/tyan/s2912_fam10/Kconfig
+++ b/src/mainboard/tyan/s2912_fam10/Kconfig
@@ -72,18 +72,6 @@ config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_01000095.h"
 
-config RAMBASE
-	hex
-	default 0x200000
-
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
 config MCP55_PCI_E_X_0
 	int
 	default 1
diff --git a/src/mainboard/tyan/s8226/Kconfig b/src/mainboard/tyan/s8226/Kconfig
index 64aa29a857..20de9dcd69 100644
--- a/src/mainboard/tyan/s8226/Kconfig
+++ b/src/mainboard/tyan/s8226/Kconfig
@@ -60,18 +60,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 
-config RAMTOP
-	hex
-	default 0x1000000
-
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
-config RAMBASE
-	hex
-	default 0x200000
-
 config DRIVERS_PS2_KEYBOARD
 	bool
 	default y
diff --git a/src/northbridge/amd/agesa/Kconfig b/src/northbridge/amd/agesa/Kconfig
index 6caff0f2c2..d557e62607 100644
--- a/src/northbridge/amd/agesa/Kconfig
+++ b/src/northbridge/amd/agesa/Kconfig
@@ -39,4 +39,13 @@ source src/northbridge/amd/agesa/family15tn/Kconfig
 source src/northbridge/amd/agesa/family16kb/Kconfig
 source src/northbridge/amd/agesa/00730F01/Kconfig
 
+# TODO: Reservation for heap seems excessive
+config HEAP_SIZE
+	hex
+	default 0xc0000
+
+config RAMTOP
+	hex
+	default 0x400000
+
 endif # NORTHBRIDGE_AMD_AGESA
diff --git a/src/northbridge/amd/amdfam10/Kconfig b/src/northbridge/amd/amdfam10/Kconfig
index d26b05ebdd..4526e01b43 100644
--- a/src/northbridge/amd/amdfam10/Kconfig
+++ b/src/northbridge/amd/amdfam10/Kconfig
@@ -54,6 +54,15 @@ config MMCONF_BUS_NUMBER
 	int
 	default 256
 
+# TODO: Reservation for heap seems excessive
+config HEAP_SIZE
+	hex
+	default 0xc0000
+
+config RAMTOP
+	hex
+	default 0x400000
+
 config BOOTBLOCK_NORTHBRIDGE_INIT
         string
         default "northbridge/amd/amdfam10/bootblock.c"
diff --git a/src/northbridge/amd/amdk8/Kconfig b/src/northbridge/amd/amdk8/Kconfig
index e79b6b2eb0..8bee5ca261 100644
--- a/src/northbridge/amd/amdk8/Kconfig
+++ b/src/northbridge/amd/amdk8/Kconfig
@@ -107,6 +107,11 @@ config MEM_TRAIN_SEQ
 
 endif #K8_REV_F_SUPPORT
 
+# TODO: Reservation for heap seems excessive
+config HEAP_SIZE
+	hex
+	default 0x40000
+
 config IOMMU
 	bool
 	default y