Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4569
-gerrit
commit 1778e85395a42a8f4882f66f609f347867f947e2 Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Mon Dec 23 12:14:13 2013 +0200
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 --- src/arch/armv7/tables.c | 13 ------------- src/cpu/samsung/exynos5250/Kconfig | 4 ---- src/cpu/samsung/exynos5420/Kconfig | 4 ---- src/cpu/ti/am335x/Kconfig | 5 ----- src/mainboard/google/pit/mainboard.c | 15 --------------- src/mainboard/google/snow/mainboard.c | 15 --------------- 6 files changed, 56 deletions(-)
diff --git a/src/arch/armv7/tables.c b/src/arch/armv7/tables.c index cf4e4e0..ce7ad5a 100644 --- a/src/arch/armv7/tables.c +++ b/src/arch/armv7/tables.c @@ -29,15 +29,6 @@
#define MAX_COREBOOT_TABLE_SIZE (8 * 1024)
-#if !CONFIG_DYNAMIC_CBMEM -void __attribute__((weak)) get_cbmem_table(uint64_t *base, uint64_t *size) -{ - printk(BIOS_WARNING, "WARNING: you need to define get_cbmem_table for your board\n"); - *base = 0; - *size = 0; -} -#endif - void cbmem_arch_init(void) { } @@ -46,10 +37,6 @@ struct lb_memory *write_tables(void) { unsigned long table_pointer, new_table_pointer;
-#if !CONFIG_DYNAMIC_CBMEM - cbmem_base_check(); -#endif - post_code(0x9d);
table_pointer = (unsigned long)cbmem_add(CBMEM_ID_CBTABLE, 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 @@ 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 df721ae..dd35c35 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 0c37eef..0142c49 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 f25c2a5..190ad23 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 aa11487..23b7072 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();