ARMv7: Remove static CBMEM allocation
The calculations for static allocation are no longer valid.
Change-Id: I6740cdcec789abddf78485a0edaf24882ef8c2a5
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/4569
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: David Hendricks <dhendrix@chromium.org>
diff --git a/src/cpu/samsung/exynos5250/Kconfig b/src/cpu/samsung/exynos5250/Kconfig
index 6731bb6..63038c3 100644
--- a/src/cpu/samsung/exynos5250/Kconfig
+++ b/src/cpu/samsung/exynos5250/Kconfig
@@ -88,10 +88,6 @@
hex
default 0x40000000
-config COREBOOT_TABLES_SIZE
- hex
- default 0x4000000
-
choice CONSOLE_SERIAL_UART_CHOICES
prompt "Serial Console UART"
default CONSOLE_SERIAL_UART3
diff --git a/src/cpu/samsung/exynos5420/Kconfig b/src/cpu/samsung/exynos5420/Kconfig
index df721ae..dd35c35 100644
--- a/src/cpu/samsung/exynos5420/Kconfig
+++ b/src/cpu/samsung/exynos5420/Kconfig
@@ -90,10 +90,6 @@
hex
default 0x20000000
-config COREBOOT_TABLES_SIZE
- hex
- default 0x4000000
-
choice CONSOLE_SERIAL_UART_CHOICES
prompt "Serial Console UART"
default CONSOLE_SERIAL_UART3
diff --git a/src/cpu/ti/am335x/Kconfig b/src/cpu/ti/am335x/Kconfig
index 0c37eef..0142c49 100644
--- a/src/cpu/ti/am335x/Kconfig
+++ b/src/cpu/ti/am335x/Kconfig
@@ -47,8 +47,3 @@
config SYS_SDRAM_BASE
hex
default 0x40000000
-
-# FIXME: this can probably be smaller
-config COREBOOT_TABLES_SIZE
- hex
- default 0x800
diff --git a/src/mainboard/google/pit/mainboard.c b/src/mainboard/google/pit/mainboard.c
index f25c2a5..190ad23 100644
--- a/src/mainboard/google/pit/mainboard.c
+++ b/src/mainboard/google/pit/mainboard.c
@@ -428,25 +428,10 @@
backlight_en();
}
-#if !CONFIG_DYNAMIC_CBMEM
-void get_cbmem_table(uint64_t *base, uint64_t *size)
-{
- *size = CONFIG_COREBOOT_TABLES_SIZE;
- *base = CONFIG_SYS_SDRAM_BASE +
- ((unsigned)CONFIG_DRAM_SIZE_MB << 20ULL) -
- CONFIG_COREBOOT_TABLES_SIZE;
-}
-#endif
-
static void mainboard_enable(device_t dev)
{
dev->ops->init = &mainboard_init;
-#if !CONFIG_DYNAMIC_CBMEM
- /* set up coreboot tables */
- cbmem_initialize();
-#endif
-
/* set up dcache and MMU */
/* FIXME: this should happen via resource allocator */
exynos5420_config_l2_cache();
diff --git a/src/mainboard/google/snow/mainboard.c b/src/mainboard/google/snow/mainboard.c
index aa11487..23b7072 100644
--- a/src/mainboard/google/snow/mainboard.c
+++ b/src/mainboard/google/snow/mainboard.c
@@ -265,25 +265,10 @@
// gpio_info();
}
-#if !CONFIG_DYNAMIC_CBMEM
-void get_cbmem_table(uint64_t *base, uint64_t *size)
-{
- *size = CONFIG_COREBOOT_TABLES_SIZE;
- *base = CONFIG_SYS_SDRAM_BASE +
- ((unsigned)CONFIG_DRAM_SIZE_MB << 20ULL) -
- CONFIG_COREBOOT_TABLES_SIZE;
-}
-#endif
-
static void mainboard_enable(device_t dev)
{
dev->ops->init = &mainboard_init;
-#if !CONFIG_DYNAMIC_CBMEM
- /* set up coreboot tables */
- cbmem_initialize();
-#endif
-
/* set up dcache and MMU */
/* FIXME: this should happen via resource allocator */
exynos5250_config_l2_cache();