diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2013-12-23 12:14:13 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-02-06 11:22:14 +0100 |
| commit | 732cee31a6ab9b796043cb2455f4a19765a95c5a (patch) | |
| tree | 70d0217bd4c9b3455c6ab89417a7bb2f51006105 | |
| parent | c79dfdb9910ba368e3473f758c84b0f24064833f (diff) | |
| download | coreboot-732cee31a6ab9b796043cb2455f4a19765a95c5a.tar.xz | |
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>
| -rw-r--r-- | src/cpu/samsung/exynos5250/Kconfig | 4 | ||||
| -rw-r--r-- | src/cpu/samsung/exynos5420/Kconfig | 4 | ||||
| -rw-r--r-- | src/cpu/ti/am335x/Kconfig | 5 | ||||
| -rw-r--r-- | src/mainboard/google/pit/mainboard.c | 15 | ||||
| -rw-r--r-- | src/mainboard/google/snow/mainboard.c | 15 |
5 files changed, 0 insertions, 43 deletions
diff --git a/src/cpu/samsung/exynos5250/Kconfig b/src/cpu/samsung/exynos5250/Kconfig index 6731bb60e4..63038c3ecb 100644 --- a/src/cpu/samsung/exynos5250/Kconfig +++ b/src/cpu/samsung/exynos5250/Kconfig @@ -88,10 +88,6 @@ config SYS_SDRAM_BASE 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 df721ae0c1..dd35c356e4 100644 --- a/src/cpu/samsung/exynos5420/Kconfig +++ b/src/cpu/samsung/exynos5420/Kconfig @@ -90,10 +90,6 @@ config SYS_SDRAM_BASE 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 0c37eefb81..0142c49cb5 100644 --- a/src/cpu/ti/am335x/Kconfig +++ b/src/cpu/ti/am335x/Kconfig @@ -47,8 +47,3 @@ config CBFS_HEADER_ROM_OFFSET 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 f25c2a55b2..190ad23e67 100644 --- a/src/mainboard/google/pit/mainboard.c +++ b/src/mainboard/google/pit/mainboard.c @@ -428,25 +428,10 @@ static void mainboard_init(device_t dev) 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 aa11487778..23b7072592 100644 --- a/src/mainboard/google/snow/mainboard.c +++ b/src/mainboard/google/snow/mainboard.c @@ -265,25 +265,10 @@ static void mainboard_init(device_t dev) // 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(); |