From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by casper.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TzPlX-0008Vw-F9 for barebox@lists.infradead.org; Sun, 27 Jan 2013 10:47:14 +0000 From: Sascha Hauer Date: Sun, 27 Jan 2013 11:47:00 +0100 Message-Id: <1359283623-1782-32-git-send-email-s.hauer@pengutronix.de> In-Reply-To: <1359283623-1782-1-git-send-email-s.hauer@pengutronix.de> References: <1359283623-1782-1-git-send-email-s.hauer@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 31/34] ARM: Automatically determine malloc size To: barebox@lists.infradead.org Signed-off-by: Sascha Hauer --- arch/arm/cpu/start.c | 28 ++++++++++++++++++++++++++++ arch/arm/lib/Makefile | 1 - arch/arm/lib/arm.c | 14 -------------- 3 files changed, 28 insertions(+), 15 deletions(-) delete mode 100644 arch/arm/lib/arm.c diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c index b25592c..19e332d 100644 --- a/arch/arm/cpu/start.c +++ b/arch/arm/cpu/start.c @@ -35,6 +35,7 @@ static noinline __noreturn void __start(uint32_t membase, uint32_t memsize, uint32_t boarddata) { unsigned long endmem = membase + memsize; + unsigned long malloc_start, malloc_end; setup_c(); @@ -51,6 +52,33 @@ static noinline __noreturn void __start(uint32_t membase, uint32_t memsize, mmu_early_enable(membase, memsize, endmem); } + if ((unsigned long)_text > membase + memsize || + (unsigned long)_text < membase) + /* + * barebox is either outside SDRAM or in another + * memory bank, so we can use the whole bank for + * malloc. + */ + malloc_end = endmem; + else + malloc_end = (unsigned long)_text; + + /* + * Maximum malloc space is the Kconfig value if given + * or 64MB. + */ + if (MALLOC_SIZE > 0) { + malloc_start = malloc_end - MALLOC_SIZE; + if (malloc_start < membase) + malloc_start = membase; + } else { + malloc_start = malloc_end - (malloc_end - membase) / 2; + if (malloc_end - malloc_start > SZ_64M) + malloc_start = malloc_end - SZ_64M; + } + + mem_malloc_init((void *)malloc_start, (void *)malloc_end - 1); + start_barebox(); } diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 2e624cd..3ea695c 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -4,7 +4,6 @@ obj-$(CONFIG_CMD_BOOTZ) += bootz.o obj-$(CONFIG_CMD_BOOTU) += bootu.o obj-y += div0.o obj-y += findbit.o -obj-y += arm.o obj-y += io.o obj-y += io-readsb.o obj-y += io-readsw-armv4.o diff --git a/arch/arm/lib/arm.c b/arch/arm/lib/arm.c deleted file mode 100644 index 80b62e9..0000000 --- a/arch/arm/lib/arm.c +++ /dev/null @@ -1,14 +0,0 @@ -#include -#include -#include -#include -#include - -static int arm_mem_malloc_init(void) -{ - mem_malloc_init((void *)MALLOC_BASE, - (void *)(MALLOC_BASE + MALLOC_SIZE - 1)); - return 0; -} - -core_initcall(arm_mem_malloc_init); -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox