aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-11-10 15:08:47 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2015-01-02 21:52:15 +0100
commit22261c387e0dea62126aab6c6765fef0122d10ba (patch)
tree8975dbb166eb55c9594aadb487689ccaa2cc457b
parent6d8228599b4110b2a83491d0a6bc5388f9f5943d (diff)
allwinner/a10: Always has DYNAMIC_CBMEM
The static allocator only worked for x86 anyway. Change-Id: Iadaab225fea04b455c559c25b918a2a842b9faca Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/8029 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
-rw-r--r--src/cpu/allwinner/a10/Kconfig1
-rw-r--r--src/cpu/allwinner/a10/cbmem.c4
2 files changed, 1 insertions, 4 deletions
diff --git a/src/cpu/allwinner/a10/Kconfig b/src/cpu/allwinner/a10/Kconfig
index 2bf32ecfaf..b7b435fa6d 100644
--- a/src/cpu/allwinner/a10/Kconfig
+++ b/src/cpu/allwinner/a10/Kconfig
@@ -13,6 +13,7 @@ config CPU_SPECIFIC_OPTIONS
select HAVE_UART_SPECIAL
select BOOTBLOCK_CONSOLE
select CPU_HAS_BOOTBLOCK_INIT
+ select DYNAMIC_CBMEM
# The "eGON.BT0" header takes 32 bytes
config BOOTBLOCK_BASE
diff --git a/src/cpu/allwinner/a10/cbmem.c b/src/cpu/allwinner/a10/cbmem.c
index 84dc2bf8ad..e051f06b34 100644
--- a/src/cpu/allwinner/a10/cbmem.c
+++ b/src/cpu/allwinner/a10/cbmem.c
@@ -8,11 +8,7 @@
#include "ram_segs.h"
#include <cbmem.h>
-#if IS_ENABLED(CONFIG_DYNAMIC_CBMEM)
-
void *cbmem_top(void)
{
return a1x_get_cbmem_top();
}
-
-#endif