[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-10-gdb0708c

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  db0708ccc78cf72953d6baccdbdc83c0856515cc (commit)
      from  f8a43e3a7b99ac62923e78f1c049c14c96f102f0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit db0708ccc78cf72953d6baccdbdc83c0856515cc
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Oct 23 14:22:18 2012 +0200

    [UBOOT] 2012.10/apf28: speed up U-Boot by forcing code relocation into cached memory

-----------------------------------------------------------------------

Summary of changes:
 ...-Add-support-for-the-armadeus-apf27-board.patch |   28 +++++++++++++++-----
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch b/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch
index f6fd612..d49e642 100644
--- a/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch
+++ b/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch
@@ -78,7 +78,7 @@ new file mode 100644
 index 0000000..c1ca6bd
 --- /dev/null
 +++ b/board/armadeus/apf27/apf27.c
-@@ -0,0 +1,304 @@
+@@ -0,0 +1,318 @@
 +/*
 + * Copyright (C) 2007 Sascha Hauer, Pengutronix
 + * Copyright (C) 2008-2012 Eric Jarrige <eri...@ar...>
@@ -303,10 +303,12 @@ index 0000000..c1ca6bd
 +dram_init(void)
 +{
 +	/* dram_init must store complete ramsize in gd->ram_size */
-+	gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
 +	if (get_num_ram_bank() > 1) {
-+		gd->ram_size += get_ram_size((void *)PHYS_SDRAM_2,
-+					     PHYS_SDRAM_2_SIZE);
++		gd->ram_size = PHYS_SDRAM_2 - CONFIG_SYS_SDRAM_BASE
++			+ get_ram_size((void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
++	} else {
++		gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
++			PHYS_SDRAM_1_SIZE);
 +	}
 +
 +	return 0;
@@ -314,12 +316,24 @@ index 0000000..c1ca6bd
 +
 +void dram_init_banksize(void)
 +{
++	phys_size_t ramsize = gd->ram_size;
++
++	if (get_num_ram_bank() > 1) {
++		ramsize -= PHYS_SDRAM_2 - CONFIG_SYS_SDRAM_BASE;
++	}
++
 +	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-+	gd->bd->bi_dram[0].size = gd->ram_size / get_num_ram_bank();
++	gd->bd->bi_dram[0].size = ramsize;
++	gd->ram_size = gd->bd->bi_dram[0].size;
++
 +	if (CONFIG_NR_DRAM_BANKS > 1) {
 +		gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
-+		gd->bd->bi_dram[1].size = \
-+			gd->ram_size - gd->bd->bi_dram[0].size;
++		if (get_num_ram_bank() > 1) {
++			gd->bd->bi_dram[1].size = ramsize;
++		} else {
++			gd->bd->bi_dram[1].size = 0;
++		}
++		gd->ram_size += gd->bd->bi_dram[1].size;
 +	}
 +}
 +


hooks/post-receive
-- 
armadeus