Signed-off-by: Heiko Schocher <h...@denx.de>
---
arch/arm/cpu/arm926ejs/orion5x/dram.c | 12 ++++++++++--
board/Marvell/guruplug/guruplug.c | 15 ++++++++++++---
board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 12 ++++++++++--
board/Marvell/openrd_base/openrd_base.c | 11 +++++++++--
board/Marvell/rd6281a/rd6281a.c | 15 ++++++++++++---
board/Marvell/sheevaplug/sheevaplug.c | 15 ++++++++++++---
board/armltd/versatile/versatile.c | 10 ++++++++++
board/atmel/at91cap9adk/at91cap9adk.c | 11 +++++++++--
board/atmel/at91sam9260ek/at91sam9260ek.c | 11 +++++++++--
board/atmel/at91sam9261ek/at91sam9261ek.c | 11 +++++++++--
board/atmel/at91sam9263ek/at91sam9263ek.c | 11 +++++++++--
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 11 +++++++++--
board/atmel/at91sam9rlek/at91sam9rlek.c | 11 +++++++++--
board/calao/sbc35_a9g20/sbc35_a9g20.c | 15 ++++++++++-----
board/calao/tny_a9260/tny_a9260.c | 14 +++++++++-----
board/davinci/common/misc.c | 12 +++++++++---
board/esd/meesc/meesc.c | 13 ++++++++++---
board/esd/otc570/otc570.c | 13 ++++++++++---
board/eukrea/cpu9260/cpu9260.c | 15 ++++++++++-----
board/karo/tx25/tx25.c | 6 ++----
board/keymile/km_arm/km_arm.c | 13 +++++++++++--
board/logicpd/imx27lite/config.mk | 2 +-
board/logicpd/imx27lite/imx27lite.c | 15 +++++++++------
board/ronetix/pm9261/pm9261.c | 13 ++++++++++---
board/ronetix/pm9263/pm9263.c | 13 ++++++++++---
board/ronetix/pm9g45/pm9g45.c | 13 ++++++++++---
board/st/nhk8815/nhk8815.c | 11 +++++++++--
board/ti/omap1510inn/config.mk | 3 ++-
board/ti/omap1510inn/omap1510innovator.c | 13 +++++++++----
board/ti/omap1610inn/config.mk | 3 ++-
board/ti/omap1610inn/omap1610innovator.c | 12 +++++++++---
board/ti/omap5912osk/omap5912osk.c | 12 +++++++++---
board/ti/omap730p2/omap730p2.c | 12 +++++++++---
include/configs/at91cap9adk.h | 4 ++++
include/configs/at91sam9260ek.h | 4 ++++
include/configs/at91sam9261ek.h | 4 ++++
include/configs/at91sam9263ek.h | 4 ++++
include/configs/at91sam9m10g45ek.h | 4 ++++
include/configs/at91sam9rlek.h | 4 ++++
include/configs/cpu9260.h | 4 ++++
include/configs/da830evm.h | 5 +++++
include/configs/da850evm.h | 4 ++++
include/configs/davinci_dm355evm.h | 4 ++++
include/configs/davinci_dm355leopard.h | 4 ++++
include/configs/davinci_dm365evm.h | 4 ++++
include/configs/davinci_dm6467evm.h | 4 ++++
include/configs/davinci_dvevm.h | 6 ++++++
include/configs/davinci_schmoogie.h | 5 +++++
include/configs/davinci_sffsdr.h | 5 +++++
include/configs/davinci_sonata.h | 6 ++++++
include/configs/edminiv2.h | 4 ++++
include/configs/guruplug.h | 4 ++++
include/configs/imx27lite-common.h | 4 ++++
include/configs/km_arm.h | 4 ++++
include/configs/meesc.h | 4 ++++
include/configs/mv88f6281gtw_ge.h | 4 ++++
include/configs/nhk8815.h | 4 ++++
include/configs/ns9750dev.h | 4 ++++
include/configs/omap1610h2.h | 4 ++++
include/configs/omap1610inn.h | 4 ++++
include/configs/omap5912osk.h | 4 ++++
include/configs/omap730p2.h | 4 ++++
include/configs/openrd_base.h | 4 ++++
include/configs/otc570.h | 4 ++++
include/configs/pm9261.h | 4 ++++
include/configs/pm9263.h | 4 ++++
include/configs/pm9g45.h | 4 ++++
include/configs/rd6281a.h | 4 ++++
include/configs/sbc35_a9g20.h | 4 ++++
include/configs/sheevaplug.h | 4 ++++
include/configs/tny_a9260.h | 4 ++++
include/configs/versatile.h | 4 ++++
72 files changed, 452 insertions(+), 90 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/orion5x/dram.c
b/arch/arm/cpu/arm926ejs/orion5x/dram.c
index c719798..d490880 100644
--- a/arch/arm/cpu/arm926ejs/orion5x/dram.c
+++ b/arch/arm/cpu/arm926ejs/orion5x/dram.c
@@ -50,7 +50,16 @@ u32 orion5x_sdram_bar(enum memory_bank bank)
return result;
}
-int dram_init(void)
+int dram_init (void)
+{
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size(
+ (volatile long *) orion5x_sdram_bar(0),
+ CONFIG_MAX_RAM_BANK_SIZE);
+ return 0;
+}
+
+void dram_init_banksize (void)
{
int i;
@@ -60,5 +69,4 @@ int dram_init(void)
(volatile long *) (gd->bd->bi_dram[i].start),
CONFIG_MAX_RAM_BANK_SIZE);
}
- return 0;
}
diff --git a/board/Marvell/guruplug/guruplug.c
b/board/Marvell/guruplug/guruplug.c
index c028a53..761e014 100644
--- a/board/Marvell/guruplug/guruplug.c
+++ b/board/Marvell/guruplug/guruplug.c
@@ -108,15 +108,24 @@ int board_init(void)
return 0;
}
-int dram_init(void)
+int dram_init (void)
+{
+ /* dram_init must store complete ramsize in gd->ram_size */
+ /* Fix this */
+ gd->ram_size = get_ram_size((volatile void *)kw_sdram_bar(0),
+ kw_sdram_bs(0));
+ return 0;
+}
+
+void dram_init_banksize (void)
{
int i;
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
gd->bd->bi_dram[i].start = kw_sdram_bar(i);
- gd->bd->bi_dram[i].size = kw_sdram_bs(i);
+ gd->bd->bi_dram[i].size = get_ram_size((long *)kw_sdram_bar(i),
+ kw_sdram_bs(i));
}
- return 0;
}
#ifdef CONFIG_RESET_PHY_R
diff --git a/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
b/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
index c959bf8..3a98f72 100644
--- a/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
+++ b/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
@@ -110,7 +110,16 @@ int board_init(void)
return 0;
}
-int dram_init(void)
+int dram_init (void)
+{
+ /* dram_init must store complete ramsize in gd->ram_size */
+ /* Fix this */
+ gd->ram_size = get_ram_size((volatile void *)kw_sdram_bar(0),
+ kw_sdram_bs(0));
+ return 0;
+}
+
+void dram_init_banksize (void)
{
int i;
@@ -118,7 +127,6 @@ int dram_init(void)
gd->bd->bi_dram[i].start = kw_sdram_bar(i);
gd->bd->bi_dram[i].size = kw_sdram_bs(i);
}
- return 0;
}
#ifdef CONFIG_MV88E61XX_SWITCH
diff --git a/board/Marvell/openrd_base/openrd_base.c
b/board/Marvell/openrd_base/openrd_base.c
index c00a08a..409dfb8 100644
--- a/board/Marvell/openrd_base/openrd_base.c
+++ b/board/Marvell/openrd_base/openrd_base.c
@@ -113,7 +113,15 @@ int board_init(void)
return 0;
}
-int dram_init(void)
+int dram_init (void)
+{
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ kw_sdram_bs(0));
+ return 0;
+}
+
+void dram_init_banksize (void)
{
int i;
@@ -121,7 +129,6 @@ int dram_init(void)
gd->bd->bi_dram[i].start = kw_sdram_bar(i);
gd->bd->bi_dram[i].size = kw_sdram_bs(i);
}
- return 0;
}
#ifdef CONFIG_RESET_PHY_R
diff --git a/board/Marvell/rd6281a/rd6281a.c b/board/Marvell/rd6281a/rd6281a.c
index 8713a3c..eec89c7 100644
--- a/board/Marvell/rd6281a/rd6281a.c
+++ b/board/Marvell/rd6281a/rd6281a.c
@@ -109,15 +109,24 @@ int board_init(void)
return 0;
}
-int dram_init(void)
+int dram_init (void)
+{
+ /* dram_init must store complete ramsize in gd->ram_size */
+ /* Fix this */
+ gd->ram_size = get_ram_size((volatile void *)kw_sdram_bar(0),
+ kw_sdram_bs(0));
+ return 0;
+}
+
+void dram_init_banksize (void)
{
int i;
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
gd->bd->bi_dram[i].start = kw_sdram_bar(i);
- gd->bd->bi_dram[i].size = kw_sdram_bs(i);
+ gd->bd->bi_dram[i].size = get_ram_size((long *)kw_sdram_bar(i),
+ kw_sdram_bs(i));
}
- return 0;
}
void mv_phy_88e1116_init(char *name)
diff --git a/board/Marvell/sheevaplug/sheevaplug.c
b/board/Marvell/sheevaplug/sheevaplug.c
index 547126a..2fb5141 100644
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -108,15 +108,24 @@ int board_init(void)
return 0;
}
-int dram_init(void)
+int dram_init (void)
+{
+ /* dram_init must store complete ramsize in gd->ram_size */
+ /* Fix this */
+ gd->ram_size = get_ram_size((volatile void *)kw_sdram_bar(0),
+ kw_sdram_bs(0));
+ return 0;
+}
+
+void dram_init_banksize (void)
{
int i;
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
gd->bd->bi_dram[i].start = kw_sdram_bar(i);
- gd->bd->bi_dram[i].size = kw_sdram_bs(i);
+ gd->bd->bi_dram[i].size = get_ram_size((long *)kw_sdram_bar(i),
+ kw_sdram_bs(i));
}
- return 0;
}
#ifdef CONFIG_RESET_PHY_R
diff --git a/board/armltd/versatile/versatile.c
b/board/armltd/versatile/versatile.c
index 6e836dd..0a138b4 100644
--- a/board/armltd/versatile/versatile.c
+++ b/board/armltd/versatile/versatile.c
@@ -88,9 +88,19 @@ int misc_init_r (void)
******************************/
int dram_init (void)
{
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_1_SIZE);
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].size = get_ram_size((volatile void *)PHYS_SDRAM_1,
+ PHYS_SDRAM_1_SIZE);
+}
+
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
diff --git a/board/atmel/at91cap9adk/at91cap9adk.c
b/board/atmel/at91cap9adk/at91cap9adk.c
index 2ab8bc2..03e767a 100644
--- a/board/atmel/at91cap9adk/at91cap9adk.c
+++ b/board/atmel/at91cap9adk/at91cap9adk.c
@@ -331,11 +331,18 @@ int board_init(void)
int dram_init(void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_SIZE);
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
#ifdef CONFIG_RESET_PHY_R
void reset_phy(void)
{
diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c
b/board/atmel/at91sam9260ek/at91sam9260ek.c
index 64c6d17..4c62420 100644
--- a/board/atmel/at91sam9260ek/at91sam9260ek.c
+++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
@@ -171,11 +171,18 @@ int board_init(void)
int dram_init(void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_SIZE);
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
#ifdef CONFIG_RESET_PHY_R
void reset_phy(void)
{
diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c
b/board/atmel/at91sam9261ek/at91sam9261ek.c
index de5cfae..69aa5b6 100644
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
@@ -273,11 +273,18 @@ int board_eth_init(bd_t *bis)
int dram_init(void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_SIZE);
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
#ifdef CONFIG_RESET_PHY_R
void reset_phy(void)
{
diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c
b/board/atmel/at91sam9263ek/at91sam9263ek.c
index 91efc07..72314fa 100644
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -276,11 +276,18 @@ int board_init(void)
int dram_init(void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_SIZE);
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
#ifdef CONFIG_RESET_PHY_R
void reset_phy(void)
{
diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
index f92b20f..1f525fa 100644
--- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
+++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
@@ -283,11 +283,18 @@ int board_init(void)
int dram_init(void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_SIZE);
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
#ifdef CONFIG_RESET_PHY_R
void reset_phy(void)
{
diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c
b/board/atmel/at91sam9rlek/at91sam9rlek.c
index e374917..87a79e6 100644
--- a/board/atmel/at91sam9rlek/at91sam9rlek.c
+++ b/board/atmel/at91sam9rlek/at91sam9rlek.c
@@ -199,7 +199,14 @@ int board_init(void)
int dram_init(void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_SIZE);
return 0;
}
+
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
diff --git a/board/calao/sbc35_a9g20/sbc35_a9g20.c
b/board/calao/sbc35_a9g20/sbc35_a9g20.c
index 9df45c0..ccac942 100644
--- a/board/calao/sbc35_a9g20/sbc35_a9g20.c
+++ b/board/calao/sbc35_a9g20/sbc35_a9g20.c
@@ -164,16 +164,21 @@ int board_init(void)
return 0;
}
-int dram_init(void)
+int dram_init (void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- if(get_ram_size((long *) PHYS_SDRAM, PHYS_SDRAM_SIZE) !=
PHYS_SDRAM_SIZE)
+ /* dram_init must store complete ramsize in gd->ram_size */
+ if(get_ram_size((long *) CONFIG_SYS_SDRAM_BASE, PHYS_SDRAM_SIZE) !=
PHYS_SDRAM_SIZE)
return -1;
-
- gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+ gd->ram_size = PHYS_SDRAM_SIZE;
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].start = gd->ram_size;
+}
+
#ifdef CONFIG_RESET_PHY_R
void reset_phy(void)
{
diff --git a/board/calao/tny_a9260/tny_a9260.c
b/board/calao/tny_a9260/tny_a9260.c
index d51ca15..7d4dc0f 100644
--- a/board/calao/tny_a9260/tny_a9260.c
+++ b/board/calao/tny_a9260/tny_a9260.c
@@ -99,12 +99,16 @@ int board_init(void)
return 0;
}
-int dram_init(void)
+int dram_init (void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- if(get_ram_size((long *) PHYS_SDRAM, PHYS_SDRAM_SIZE) !=
PHYS_SDRAM_SIZE)
+ if(get_ram_size((long *) CONFIG_SYS_SDRAM_BASE, PHYS_SDRAM_SIZE) !=
PHYS_SDRAM_SIZE)
return -1;
-
- gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+ gd->ram_size = PHYS_SDRAM_SIZE;
return 0;
}
+
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].start = gd->ram_size;
+}
diff --git a/board/davinci/common/misc.c b/board/davinci/common/misc.c
index 25ca326..b4c5d7a 100644
--- a/board/davinci/common/misc.c
+++ b/board/davinci/common/misc.c
@@ -35,10 +35,16 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_1_SIZE);
+ return 0;
+}
- return(0);
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].size = gd->ram_size;
}
#ifdef CONFIG_DRIVER_TI_EMAC
diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index a1b66cb..74467c5 100644
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -139,13 +139,20 @@ static void meesc_ethercat_hw_init(void)
at91_set_B_periph(AT91_PIN_PE20, 0); /* EBI1_NWAIT */
}
-int dram_init(void)
+int dram_init (void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- gd->bd->bi_dram[0].size = get_ram_size((long *) PHYS_SDRAM, (1 << 27));
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ (1 << 27));
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
int board_eth_init(bd_t *bis)
{
int rc = 0;
diff --git a/board/esd/otc570/otc570.c b/board/esd/otc570/otc570.c
index 07d9c62..5b36a31 100644
--- a/board/esd/otc570/otc570.c
+++ b/board/esd/otc570/otc570.c
@@ -237,13 +237,20 @@ void lcd_show_board_info(void)
#endif /* CONFIG_LCD_INFO */
#endif /* CONFIG_LCD */
-int dram_init(void)
+int dram_init (void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- gd->bd->bi_dram[0].size = get_ram_size((long *) PHYS_SDRAM, (1 << 27));
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ get_ram_size((long *) PHYS_SDRAM, (1 << 27)));
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = PHYS_SDRAM;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
int board_eth_init(bd_t *bis)
{
int rc = 0;
diff --git a/board/eukrea/cpu9260/cpu9260.c b/board/eukrea/cpu9260/cpu9260.c
index 61b6c33..e00894d 100644
--- a/board/eukrea/cpu9260/cpu9260.c
+++ b/board/eukrea/cpu9260/cpu9260.c
@@ -188,15 +188,20 @@ int board_init(void)
int dram_init(void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- if (get_ram_size((long *) PHYS_SDRAM, PHYS_SDRAM_SIZE) !=
- PHYS_SDRAM_SIZE)
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_SIZE);
+ if (gd->ram_size != PHYS_SDRAM_SIZE)
return -1;
-
- gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
#ifdef CONFIG_RESET_PHY_R
void reset_phy(void)
{
diff --git a/board/karo/tx25/tx25.c b/board/karo/tx25/tx25.c
index 3940106..eb03987 100644
--- a/board/karo/tx25/tx25.c
+++ b/board/karo/tx25/tx25.c
@@ -160,22 +160,20 @@ int board_late_init(void)
int dram_init (void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((volatile void *)PHYS_SDRAM_1,
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_1_SIZE);
return 0;
}
void dram_init_banksize (void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_dram[0].size = get_ram_size((volatile void *)PHYS_SDRAM_1,
PHYS_SDRAM_1_SIZE);
#if CONFIG_NR_DRAM_BANKS > 1
gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
gd->bd->bi_dram[1].size = get_ram_size((volatile void *)PHYS_SDRAM_2,
PHYS_SDRAM_2_SIZE);
-#else
-
#endif
}
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index d7cbd7a..b6c5038 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -225,16 +225,25 @@ U_BOOT_CMD(
);
#endif
-int dram_init(void)
+int dram_init (void)
+{
+ /* dram_init must store complete ramsize in gd->ram_size */
+ /* Fix this */
+ gd->ram_size = get_ram_size((volatile void *)kw_sdram_bar(0),
+ kw_sdram_bs(0));
+ return 0;
+}
+
+void dram_init_banksize (void)
{
int i;
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
gd->bd->bi_dram[i].start = kw_sdram_bar(i);
+ gd->bd->bi_dram[i].size = kw_sdram_bs(i);
gd->bd->bi_dram[i].size = get_ram_size((long *)kw_sdram_bar(i),
kw_sdram_bs(i));
}
- return 0;
}
/* Configure and enable MV88E1118 PHY */
diff --git a/board/logicpd/imx27lite/config.mk
b/board/logicpd/imx27lite/config.mk
index a2e7768..2f9c4e6 100644
--- a/board/logicpd/imx27lite/config.mk
+++ b/board/logicpd/imx27lite/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0xA7F00000
+TEXT_BASE = 0xc0000000
diff --git a/board/logicpd/imx27lite/imx27lite.c
b/board/logicpd/imx27lite/imx27lite.c
index 4427415..f6a6385 100644
--- a/board/logicpd/imx27lite/imx27lite.c
+++ b/board/logicpd/imx27lite/imx27lite.c
@@ -66,19 +66,22 @@ int board_init (void)
int dram_init (void)
{
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_1_SIZE);
+ return 0;
+}
-#if CONFIG_NR_DRAM_BANKS > 0
- gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
- gd->bd->bi_dram[0].size = get_ram_size((volatile void *)PHYS_SDRAM_1,
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].size = get_ram_size((volatile void
*)CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_1_SIZE);
-#endif
#if CONFIG_NR_DRAM_BANKS > 1
gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
gd->bd->bi_dram[1].size = get_ram_size((volatile void *)PHYS_SDRAM_2,
PHYS_SDRAM_2_SIZE);
#endif
-
- return 0;
}
int checkboard(void)
diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c
index 53d8c48..a317ebc 100644
--- a/board/ronetix/pm9261/pm9261.c
+++ b/board/ronetix/pm9261/pm9261.c
@@ -279,13 +279,20 @@ int board_eth_init(bd_t *bis)
}
#endif
-int dram_init(void)
+int dram_init (void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_SIZE);
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = PHYS_SDRAM;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
#ifdef CONFIG_RESET_PHY_R
void reset_phy(void)
{
diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c
index e41c84c..a88a038 100644
--- a/board/ronetix/pm9263/pm9263.c
+++ b/board/ronetix/pm9263/pm9263.c
@@ -377,13 +377,20 @@ int board_init(void)
return 0;
}
-int dram_init(void)
+int dram_init (void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_SIZE);
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = PHYS_SDRAM;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
#ifdef CONFIG_RESET_PHY_R
void reset_phy(void)
{
diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c
index 3b4d9a3..23bc6a2 100644
--- a/board/ronetix/pm9g45/pm9g45.c
+++ b/board/ronetix/pm9g45/pm9g45.c
@@ -158,13 +158,20 @@ int board_init(void)
return 0;
}
-int dram_init(void)
+int dram_init (void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_SIZE);
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
#ifdef CONFIG_RESET_PHY_R
void reset_phy(void)
{
diff --git a/board/st/nhk8815/nhk8815.c b/board/st/nhk8815/nhk8815.c
index faef810..62cde13 100644
--- a/board/st/nhk8815/nhk8815.c
+++ b/board/st/nhk8815/nhk8815.c
@@ -80,7 +80,15 @@ int board_late_init(void)
return 0;
}
-int dram_init(void)
+int dram_init (void)
+{
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_1_SIZE);
+ return 0;
+}
+
+void dram_init_banksize (void)
{
/* set dram bank start addr and size */
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
@@ -88,7 +96,6 @@ int dram_init(void)
gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
- return 0;
}
#ifdef CONFIG_CMD_NET
diff --git a/board/ti/omap1510inn/config.mk b/board/ti/omap1510inn/config.mk
index 9cd7424..cfccaa1 100644
--- a/board/ti/omap1510inn/config.mk
+++ b/board/ti/omap1510inn/config.mk
@@ -22,4 +22,5 @@
#
-TEXT_BASE = 0x11080000
+#TEXT_BASE = 0x11080000
+TEXT_BASE = 0x00000000
diff --git a/board/ti/omap1510inn/omap1510innovator.c
b/board/ti/omap1510inn/omap1510innovator.c
index 2cb6062..7859bbf 100644
--- a/board/ti/omap1510inn/omap1510innovator.c
+++ b/board/ti/omap1510inn/omap1510innovator.c
@@ -120,15 +120,20 @@ static void ether__init (void)
udelay (3);
}
-
int dram_init (void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_1_SIZE);
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
diff --git a/board/ti/omap1610inn/config.mk b/board/ti/omap1610inn/config.mk
index 1c5b7b5..826601c 100644
--- a/board/ti/omap1610inn/config.mk
+++ b/board/ti/omap1610inn/config.mk
@@ -23,4 +23,5 @@
#
-TEXT_BASE = 0x11080000
+#TEXT_BASE = 0x11080000
+TEXT_BASE = 0x00000000
diff --git a/board/ti/omap1610inn/omap1610innovator.c
b/board/ti/omap1610inn/omap1610innovator.c
index 44818bb..1b0f7eb 100644
--- a/board/ti/omap1610inn/omap1610innovator.c
+++ b/board/ti/omap1610inn/omap1610innovator.c
@@ -154,12 +154,18 @@ void ether__init (void)
******************************/
int dram_init (void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_1_SIZE);
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
/******************************************************
Routine: set_muxconf_regs
Description: Setting up the configuration Mux registers
diff --git a/board/ti/omap5912osk/omap5912osk.c
b/board/ti/omap5912osk/omap5912osk.c
index cbf451b..a3f7457 100644
--- a/board/ti/omap5912osk/omap5912osk.c
+++ b/board/ti/omap5912osk/omap5912osk.c
@@ -137,12 +137,18 @@ void ether__init (void)
******************************/
int dram_init (void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_1_SIZE);
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
/******************************************************
Routine: set_muxconf_regs
Description: Setting up the configuration Mux registers
diff --git a/board/ti/omap730p2/omap730p2.c b/board/ti/omap730p2/omap730p2.c
index 954ced5..b4c8b98 100644
--- a/board/ti/omap730p2/omap730p2.c
+++ b/board/ti/omap730p2/omap730p2.c
@@ -181,12 +181,18 @@ void ether__init (void)
******************************/
int dram_init (void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_1_SIZE);
return 0;
}
+void dram_init_banksize (void)
+{
+ gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
/******************************************************
Routine: set_muxconf_regs
Description: Setting up the configuration Mux registers
diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index 44c2870..fcc2efe 100644
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -217,4 +217,8 @@
#error CONFIG_USE_IRQ not supported
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index b89242b..9533f84 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -221,4 +221,8 @@
#error CONFIG_USE_IRQ not supported
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index df8181b..f8594a3 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -239,4 +239,8 @@
#error CONFIG_USE_IRQ not supported
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 5cafa1e..5e2208e 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -349,4 +349,8 @@
#error CONFIG_USE_IRQ not supported
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif
diff --git a/include/configs/at91sam9m10g45ek.h
b/include/configs/at91sam9m10g45ek.h
index 44c5496..f94da3a 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -225,4 +225,8 @@
#error CONFIG_USE_IRQ not supported
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index e8fcd66..18d1aa7 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -184,4 +184,8 @@
#error CONFIG_USE_IRQ not supported
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif
diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h
index fb6f79a..1091293 100644
--- a/include/configs/cpu9260.h
+++ b/include/configs/cpu9260.h
@@ -453,4 +453,8 @@
#error CONFIG_USE_IRQ not supported
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif
diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index 160ece2..cec7da4 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -281,4 +281,9 @@
"mtdparts=davinci_nand.1:" PART_BOOT PART_PARAMS PART_KERNEL PART_REST
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE 0xc0000000 /* should be
DAVINCI_DDR_EMIF_DATA_BASE */
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
+
#endif /* __CONFIG_H */
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 357715d..e14817b 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -137,4 +137,8 @@
#undef CONFIG_CMD_ENV
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE 0xc0000000
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* __CONFIG_H */
diff --git a/include/configs/davinci_dm355evm.h
b/include/configs/davinci_dm355evm.h
index 37011c0..f322664 100644
--- a/include/configs/davinci_dm355evm.h
+++ b/include/configs/davinci_dm355evm.h
@@ -191,4 +191,8 @@
#define MTDPARTS_DEFAULT \
"mtdparts=davinci_nand.0:" PART_BOOT PART_KERNEL PART_REST
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* __CONFIG_H */
diff --git a/include/configs/davinci_dm355leopard.h
b/include/configs/davinci_dm355leopard.h
index e09fb75..de11948 100644
--- a/include/configs/davinci_dm355leopard.h
+++ b/include/configs/davinci_dm355leopard.h
@@ -159,4 +159,8 @@
#define MTDPARTS_DEFAULT \
"mtdparts=davinci_nand.0:" PART_BOOT PART_KERNEL PART_REST
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* __CONFIG_H */
diff --git a/include/configs/davinci_dm365evm.h
b/include/configs/davinci_dm365evm.h
index 2c3d88d..5036b34 100644
--- a/include/configs/davinci_dm365evm.h
+++ b/include/configs/davinci_dm365evm.h
@@ -217,4 +217,8 @@
#define MTDPARTS_DEFAULT \
"mtdparts=davinci_nand.0:" PART_BOOT PART_KERNEL PART_REST
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* __CONFIG_H */
diff --git a/include/configs/davinci_dm6467evm.h
b/include/configs/davinci_dm6467evm.h
index ddc5990..c9e77ff 100644
--- a/include/configs/davinci_dm6467evm.h
+++ b/include/configs/davinci_dm6467evm.h
@@ -128,4 +128,8 @@
#define CONFIG_CMD_NAND
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* __CONFIG_H */
diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index aab2afa..e9c8b0e 100644
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -161,6 +161,7 @@
#define PHYS_FLASH_SIZE 0x2000000 /* Flash size 32MB
*/
#define CONFIG_SYS_MAX_FLASH_SECT
(PHYS_FLASH_SIZE/CONFIG_SYS_FLASH_SECT_SZ)
#define CONFIG_ENV_SECT_SIZE CONFIG_SYS_FLASH_SECT_SZ /* Env sector
Size */
+#define CONFIG_ENV_SIZE CONFIG_SYS_FLASH_SECT_SZ /* Fix
this */
#endif
/*==============================*/
/* U-Boot general configuration */
@@ -240,4 +241,9 @@
#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */
#endif
+
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* __CONFIG_H */
diff --git a/include/configs/davinci_schmoogie.h
b/include/configs/davinci_schmoogie.h
index 875dda4..e267266 100644
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -157,4 +157,9 @@
#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */
#endif
+
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* __CONFIG_H */
diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index f4e17f8..0007cf8 100644
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -150,4 +150,9 @@
#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */
#endif
+
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* __CONFIG_H */
diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index 4c01844..4a6e3b3 100644
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -148,6 +148,7 @@
#define PHYS_FLASH_SIZE 0x2000000 /* Flash size 32MB
*/
#define CONFIG_SYS_MAX_FLASH_SECT
(PHYS_FLASH_SIZE/CONFIG_SYS_FLASH_SECT_SZ)
#define CONFIG_ENV_SECT_SIZE CONFIG_SYS_FLASH_SECT_SZ /* Env sector
Size */
+#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE /* Fix this */
#endif
/*==============================*/
/* U-Boot general configuration */
@@ -209,4 +210,9 @@
#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */
#endif
+
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* __CONFIG_H */
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 055931c..8aa7f83 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -180,4 +180,8 @@
#define CONFIG_SYS_RESET_ADDRESS 0xffff0000
#define CONFIG_SYS_MAXARGS 16
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE 0x00000000
+#define CONFIG_SYS_INIT_SP_ADDR (0x00000000 + 0x1000 - /* Fix
this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* _CONFIG_EDMINIV2_H */
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index eb3fa57..3995a3e 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -195,4 +195,8 @@
#define CONFIG_SYS_ALT_MEMTEST
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE 0x00000000
+#define CONFIG_SYS_INIT_SP_ADDR (0x00000000 + 0x1000 - /* Fix
this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* _CONFIG_GURUPLUG_H */
diff --git a/include/configs/imx27lite-common.h
b/include/configs/imx27lite-common.h
index 1da8602..ddbcf28 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -234,4 +234,8 @@
"mtdids=" MTDIDS_DEFAULT "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* __IMX27LITE_COMMON_CONFIG_H */
diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h
index 6519c90..198fc59 100644
--- a/include/configs/km_arm.h
+++ b/include/configs/km_arm.h
@@ -188,4 +188,8 @@ int get_scl (void);
#undef CONFIG_JFFS2_CMDLINE
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE 0x00000000
+#define CONFIG_SYS_INIT_SP_ADDR (0x00000000 + 0x1000 - /* Fix
this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* _CONFIG_KM_ARM_H */
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index e085f4a..6c71b01 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -180,4 +180,8 @@
#error CONFIG_USE_IRQ not supported
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif
diff --git a/include/configs/mv88f6281gtw_ge.h
b/include/configs/mv88f6281gtw_ge.h
index 9ef03a6..e4a1703 100644
--- a/include/configs/mv88f6281gtw_ge.h
+++ b/include/configs/mv88f6281gtw_ge.h
@@ -197,4 +197,8 @@
#define CONFIG_SUPPORT_VFAT
#endif /* CONFIG_CMD_USB */
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE 0x00000000
+#define CONFIG_SYS_INIT_SP_ADDR (0x00000000 + 0x1000 - /* Fix
this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* _CONFIG_MV88F6281GTW_GE_H */
diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
index 2b640dc..98a1d56 100644
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -197,4 +197,8 @@
#define CONFIG_SYS_MAX_FLASH_SECT 512
#define CONFIG_SYS_MAX_FLASH_BANKS 1
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* __CONFIG_H */
diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h
index 79dcd64..34386bc 100644
--- a/include/configs/ns9750dev.h
+++ b/include/configs/ns9750dev.h
@@ -195,4 +195,8 @@ extern void __led_set(led_id_t mask, int state);
#endif /* CONFIG_STATUS_LED */
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* __CONFIG_H */
diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h
index 0bbb5b3..2bd352a 100644
--- a/include/configs/omap1610h2.h
+++ b/include/configs/omap1610h2.h
@@ -190,4 +190,8 @@ extern unsigned long omap_flash_base; /* set
in flash__init */
#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */
#define CONFIG_ENV_OFFSET 0x20000 /* environment starts here */
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* __CONFIG_H */
diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h
index 832dd42..0734957 100644
--- a/include/configs/omap1610inn.h
+++ b/include/configs/omap1610inn.h
@@ -195,4 +195,8 @@ extern unsigned long omap_flash_base; /* set
in flash__init */
#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */
#define CONFIG_ENV_OFFSET 0x20000 /* environment starts here */
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* __CONFIG_H */
diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index bc660e3..f472798 100644
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -200,4 +200,8 @@
#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */
#define CONFIG_ENV_OFFSET 0x20000 /* environment starts here */
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* __CONFIG_H */
diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h
index a6a8a02..f011427 100644
--- a/include/configs/omap730p2.h
+++ b/include/configs/omap730p2.h
@@ -201,4 +201,8 @@
#define CONFIG_ENV_SIZE 0x20000 /* Total Size of
Environment Sector */
#define CONFIG_ENV_OFFSET 0x20000 /* environment starts
here */
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* ! __CONFIG_H */
diff --git a/include/configs/openrd_base.h b/include/configs/openrd_base.h
index 52fa73d..ae6a9cd 100644
--- a/include/configs/openrd_base.h
+++ b/include/configs/openrd_base.h
@@ -216,4 +216,8 @@
#define CONFIG_CMD_MTDPARTS
#define CONFIG_LZO
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE 0x00000000
+#define CONFIG_SYS_INIT_SP_ADDR (0x00000000 + 0x1000 - /* Fix
this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* _CONFIG_OPENRD_BASE_H */
diff --git a/include/configs/otc570.h b/include/configs/otc570.h
index fb0f576..ee14bd8 100644
--- a/include/configs/otc570.h
+++ b/include/configs/otc570.h
@@ -242,4 +242,8 @@
#error CONFIG_USE_IRQ not supported
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index a0b00e9..73e0ba9 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -378,4 +378,8 @@
#error CONFIG_USE_IRQ not supported
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 9735e6a..6ea54d8 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -409,4 +409,8 @@
#error CONFIG_USE_IRQ not supported
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 690f119..a3e147a 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -183,4 +183,8 @@
#error CONFIG_USE_IRQ not supported
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif
diff --git a/include/configs/rd6281a.h b/include/configs/rd6281a.h
index 5857301..0ba436a 100644
--- a/include/configs/rd6281a.h
+++ b/include/configs/rd6281a.h
@@ -195,4 +195,8 @@
#define CONFIG_SUPPORT_VFAT
#endif /* CONFIG_CMD_USB */
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE 0x00000000
+#define CONFIG_SYS_INIT_SP_ADDR (0x00000000 + 0x1000 - /* Fix
this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* _CONFIG_RD6281A_H */
diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h
index b9f27cc..5aa4810 100644
--- a/include/configs/sbc35_a9g20.h
+++ b/include/configs/sbc35_a9g20.h
@@ -194,4 +194,8 @@
#error CONFIG_USE_IRQ not supported
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index c5de86e..0537c8f 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -209,4 +209,8 @@
#define CONFIG_CMD_MTDPARTS
#define CONFIG_LZO
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE 0x00000000
+#define CONFIG_SYS_INIT_SP_ADDR (0x00000000 + 0x1000 - /* Fix
this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* _CONFIG_SHEEVAPLUG_H */
diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h
index 5af2af3..1fb0846 100644
--- a/include/configs/tny_a9260.h
+++ b/include/configs/tny_a9260.h
@@ -172,4 +172,8 @@
#error CONFIG_USE_IRQ not supported
#endif
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif
diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index 4273b84..cb763ec 100644
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -232,4 +232,8 @@
#define CONFIG_SYS_FLASH_PROTECTION /* The devices have real protection */
#define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000
- /* Fix this */ \
+ CONFIG_SYS_GBL_DATA_SIZE)
#endif /* __CONFIG_H */
--
1.6.2.5
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
