diff --git a/arch/mips/boot/main_entry.c b/arch/mips/boot/main_entry.c index 0a33c45..015150b 100644 --- a/arch/mips/boot/main_entry.c +++ b/arch/mips/boot/main_entry.c @@ -18,6 +18,8 @@ #include #include +#include +#include #include #include #include @@ -90,5 +92,8 @@ trap_init(); + mem_malloc_init((void *)MALLOC_BASE, + (void *)(MALLOC_BASE + MALLOC_SIZE - 1)); + start_barebox(); } diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index a31046b..71c4f6b 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile @@ -3,7 +3,6 @@ obj-y += lshrdi3.o obj-y += ashldi3.o obj-y += ashrdi3.o -obj-y += memory.o obj-y += cpu-probe.o obj-y += traps.o obj-y += genex.o diff --git a/arch/mips/lib/memory.c b/arch/mips/lib/memory.c deleted file mode 100644 index 003fc00..0000000 --- a/arch/mips/lib/memory.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2011 Antony Pavlov - * - * This file is part of barebox. - * See file CREDITS for list of people who contributed to this project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * 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. - * - */ - -#include -#include -#include -#include - -static int mips_mem_malloc_init(void) -{ - mem_malloc_init((void *)MALLOC_BASE, - (void *)(MALLOC_BASE + MALLOC_SIZE - 1)); - return 0; -} -core_initcall(mips_mem_malloc_init);