diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-11-10 15:08:47 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2015-01-03 06:25:52 +0100 |
| commit | 3ae558f5a1f00aba39621c5d0f042436c5f71789 (patch) | |
| tree | 7ee2976f75d2d474ecb393e1d78caa34c801b083 | |
| parent | a38d1b2795c68ef5234517d3c8c793815821083d (diff) | |
ARM64: Always has DYNAMIC_CBMEM
The static allocator only worked for x86 anyway.
Change-Id: Ibe4e172bb654f6414949bd11787c9407d091a858
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/8028
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
| -rw-r--r-- | src/arch/arm64/cbmem.c | 30 | ||||
| -rw-r--r-- | src/arch/arm64/tables.c | 17 |
2 files changed, 0 insertions, 47 deletions
diff --git a/src/arch/arm64/cbmem.c b/src/arch/arm64/cbmem.c deleted file mode 100644 index b33e9b8cd8..0000000000 --- a/src/arch/arm64/cbmem.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <cbmem.h> - -unsigned long get_top_of_ram(void); - -unsigned long get_top_of_ram(void) -{ - return CONFIG_RAMTOP; -} - -void *cbmem_top(void) -{ - return (void *)get_top_of_ram(); -} diff --git a/src/arch/arm64/tables.c b/src/arch/arm64/tables.c index 49fab9f3d2..ce7ad5ae5e 100644 --- a/src/arch/arm64/tables.c +++ b/src/arch/arm64/tables.c @@ -29,15 +29,6 @@ #define MAX_COREBOOT_TABLE_SIZE (8 * 1024) -#if ! CONFIG_DYNAMIC_CBMEM -/* - * TODO: "High" tables are a convention used on x86. Maybe we can - * clean up that naming at some point. - */ -uint64_t high_tables_base = 0; -uint64_t high_tables_size; -#endif - void cbmem_arch_init(void) { } @@ -46,14 +37,6 @@ struct lb_memory *write_tables(void) { unsigned long table_pointer, new_table_pointer; -#if ! CONFIG_DYNAMIC_CBMEM - if (!high_tables_base) { - printk(BIOS_ERR, "ERROR: high_tables_base is not set.\n"); - } - - printk(BIOS_DEBUG, "high_tables_base: %llx.\n", high_tables_base); -#endif - post_code(0x9d); table_pointer = (unsigned long)cbmem_add(CBMEM_ID_CBTABLE, |