3 files changed, 4 insertions, 38 deletions

diff --git a/src/cpu/allwinner/a10/Kconfig b/src/cpu/allwinner/a10/Kconfig
index e38227b755..191e45d54c 100644
--- a/src/cpu/allwinner/a10/Kconfig
+++ b/src/cpu/allwinner/a10/Kconfig
@@ -15,11 +15,6 @@ config CPU_SPECIFIC_OPTIONS
 	select BOOTBLOCK_CONSOLE
 	select CPU_HAS_BOOTBLOCK_INIT
 
-# The "eGON.BT0" header takes 32 bytes
-config BOOTBLOCK_BASE
-	hex
-	default 0x20
-
 config BOOTBLOCK_ROM_OFFSET
 	hex
 	default 0x00
@@ -36,41 +31,10 @@ config CBFS_HEADER_ROM_OFFSET
 config CBFS_ROM_OFFSET
 	default 0x5fc0
 
-# Arbitrarily chosen to be at the base of SDRAM
-config RAMSTAGE_BASE
-	hex
-	default SYS_SDRAM_BASE
-
-# 16 MiB above ramstage, so there is no overlap
-config ROMSTAGE_BASE
-	hex
-	default 0x41000000
-
-# Keep the stack in SRAM block A2.
-# SRAM blocks A1 (0-16KiB) and A2 (16KiB-32KiB) are always accessible to the
-# CPU. This gives us 32KiB of SRAM to boot with. The BROM bootloader will use up
-# to 24KiB to load our bootblock, which leaves us the area from 24KiB to 32KiB
-# to use however we see fit.
-config STACK_TOP
-	hex
-	default 0x00008000
-
-config STACK_BOTTOM
-	hex
-	default 0x00006000
-
-config STACK_SIZE
-	hex
-	default 0x00002000
-
 ## TODO Change this to some better address not overlapping bootblock when
 ## cbfstool supports creating header in arbitrary location.
 config CBFS_HEADER_ROM_OFFSET
 	hex "offset of master CBFS header in ROM"
 	default 0x40
 
-config SYS_SDRAM_BASE
-	hex
-	default 0x40000000
-
 endif # if CPU_ALLWINNER_A10
diff --git a/src/cpu/allwinner/a10/cpu.c b/src/cpu/allwinner/a10/cpu.c
index 3159f20422..c2cbc2fadd 100644
--- a/src/cpu/allwinner/a10/cpu.c
+++ b/src/cpu/allwinner/a10/cpu.c
@@ -9,11 +9,12 @@
 #include <device/device.h>
 #include <cpu/cpu.h>
 #include <cbmem.h>
+#include <symbols.h>
 
 
 static void cpu_enable_resources(struct device *dev)
 {
-	ram_resource(dev, 0, CONFIG_SYS_SDRAM_BASE >> 10,
+	ram_resource(dev, 0, (uintptr_t)_dram/KiB,
 		     CONFIG_DRAM_SIZE_MB << 10);
 	/* TODO: Declare CBFS cache as reserved? There's no guarantee we won't
 	 * overwrite it. It seems to stay intact, being so high in RAM
diff --git a/src/cpu/allwinner/a10/ram_segs.h b/src/cpu/allwinner/a10/ram_segs.h
index 45141fe5c0..26944e4a22 100644
--- a/src/cpu/allwinner/a10/ram_segs.h
+++ b/src/cpu/allwinner/a10/ram_segs.h
@@ -6,13 +6,14 @@
  */
 
 #include <config.h>
+#include <symbols.h>
 
 /*
  * Put CBMEM at top of RAM
  */
 static inline void *a1x_get_cbmem_top(void)
 {
-	return (void *)CONFIG_SYS_SDRAM_BASE + (CONFIG_DRAM_SIZE_MB << 20);
+	return _dram + (CONFIG_DRAM_SIZE_MB << 20);
 }
 
 /*