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

login
register
mail settings
Submitter Asen Dimov
Date Dec. 12, 2010, 10:41 a.m.
Message ID <1292150519-3527-1-git-send-email-dimov@ronetix.at>
Download mbox | patch
Permalink /patch/75235/
State Accepted
Commit 9a2a05a4a3674be55fe28b130112754395a43c7a
Headers show

Comments

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

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

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/board/ronetix/pm9263/config.mk b/board/ronetix/pm9263/config.mk
deleted file mode 100644
index e554a45..0000000
--- a/board/ronetix/pm9263/config.mk
+++ /dev/null
@@ -1 +0,0 @@ 
-CONFIG_SYS_TEXT_BASE = 0x23f00000
diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c
index 4dc0237..ec9f865 100644
--- a/board/ronetix/pm9263/pm9263.c
+++ b/board/ronetix/pm9263/pm9263.c
@@ -378,9 +378,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/pm9263.h b/include/configs/pm9263.h
index 619af2d..c9e7489 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -44,6 +44,8 @@ 
 #define CONFIG_PM9263		1	/* on a Ronetix PM9263 Board	*/
 #define CONFIG_ARCH_CPU_INIT
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
+#define CONFIG_SYS_TEXT_BASE	0
+#define CONFIG_AT91FAMILY
 
 /* clocks */
 #define CONFIG_SYS_MOR_VAL						\
@@ -401,6 +403,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