Patchwork [U-Boot,0/1] pm9g45: ARM relocation support

login
register
mail settings
Submitter Asen Dimov
Date Dec. 12, 2010, 10:42 a.m.
Message ID <1292150548-3581-1-git-send-email-dimov@ronetix.at>
Download mbox | patch
Permalink /patch/75231/
State Accepted
Commit 510f794c894321fe65e62bb6fd9f21fa2569dcec
Headers show

Comments

Asen Dimov - Dec. 12, 2010, 10:42 a.m.
Signed-off-by: Asen Dimov <dimov@ronetix.at>
---
 board/ronetix/pm9g45/config.mk |    1 -
 board/ronetix/pm9g45/pm9g45.c  |    9 ++++++++-
 include/configs/pm9g45.h       |    6 ++++++
 3 files changed, 14 insertions(+), 2 deletions(-)
 delete mode 100644 board/ronetix/pm9g45/config.mk
Wolfgang Denk - Dec. 16, 2010, 9:44 p.m.
Dear Asen Dimov,

In message <1292150548-3581-1-git-send-email-dimov@ronetix.at> you wrote:
> 
> Signed-off-by: Asen Dimov <dimov@ronetix.at>
> ---
>  board/ronetix/pm9g45/config.mk |    1 -
>  board/ronetix/pm9g45/pm9g45.c  |    9 ++++++++-
>  include/configs/pm9g45.h       |    6 ++++++
>  3 files changed, 14 insertions(+), 2 deletions(-)
>  delete mode 100644 board/ronetix/pm9g45/config.mk

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/board/ronetix/pm9g45/config.mk b/board/ronetix/pm9g45/config.mk
deleted file mode 100644
index 9d3c5ae..0000000
--- a/board/ronetix/pm9g45/config.mk
+++ /dev/null
@@ -1 +0,0 @@ 
-CONFIG_SYS_TEXT_BASE = 0x73f00000
diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c
index f3d48f2..79b7c9d 100644
--- a/board/ronetix/pm9g45/pm9g45.c
+++ b/board/ronetix/pm9g45/pm9g45.c
@@ -159,9 +159,16 @@  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 *)PHYS_SDRAM,
+				PHYS_SDRAM_SIZE);
+	return 0;
+}
+
+void dram_init_banksize(void)
+{
 	gd->bd->bi_dram[0].start = PHYS_SDRAM;
 	gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
-	return 0;
 }
 
 #ifdef CONFIG_RESET_PHY_R
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 3ed6b56..8822012 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -39,6 +39,8 @@ 
 /* ARM asynchronous clock */
 #define CONFIG_SYS_AT91_MAIN_CLOCK	12000000 /* from 12 MHz crystal */
 #define CONFIG_SYS_HZ			1000
+#define CONFIG_SYS_TEXT_BASE	0x73f00000
+#define CONFIG_AT91FAMILY
 
 #define CONFIG_ARCH_CPU_INIT
 
@@ -175,6 +177,10 @@ 
 #define CONFIG_SYS_MALLOC_LEN		ROUND(3 * CONFIG_ENV_SIZE + 128*1024,\
 					0x1000)
 
+#define CONFIG_SYS_SDRAM_BASE	PHYS_SDRAM
+#define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_SDRAM_BASE + 0x1000 - \
+				GENERATED_GBL_DATA_SIZE)
+
 #define CONFIG_STACKSIZE		(32*1024)	/* regular stack */
 
 #ifdef CONFIG_USE_IRQ