diff mbox

[U-Boot,2/3,V2] nhk8815: add support for relocation

Message ID 20110416230012.GA21009@mail.gnudd.com
State Accepted
Commit afba32bcd6ab06293660892b6d3f00fa8c17d107
Delegated to: Albert ARIBAUD
Headers show

Commit Message

Alessandro Rubini April 16, 2011, 11 p.m. UTC 
From: Alessandro Rubini <rubini@unipv.it>

This patch defines all the needed symbols in the header file
and removes the now-unused config.mk in board directory.
Changes to board C file as requested.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
---

Sorry, just noted that a parenthesis was missing in CONFIG_SYS_INIT_SP_ADDR.
It was a latent bug spitting a warning. This only changes that line
over V1 I sent earlier.

 board/st/nhk8815/config.mk |   26 --------------------------
 board/st/nhk8815/nhk8815.c |    9 +++++++--
 include/configs/nhk8815.h  |    5 +++++
 3 files changed, 12 insertions(+), 28 deletions(-)
 delete mode 100644 board/st/nhk8815/config.mk

Comments

Albert ARIBAUD April 23, 2011, 11:33 a.m. UTC | #1 
Hi Alessandro,

Le 17/04/2011 01:00, Alessandro Rubini a écrit :
> From: Alessandro Rubini<rubini@unipv.it>
>
> This patch defines all the needed symbols in the header file
> and removes the now-unused config.mk in board directory.
> Changes to board C file as requested.
>
> Signed-off-by: Alessandro Rubini<rubini@gnudd.com>
> Signed-off-by: Alessandro Rubini<rubini@unipv.it>
> Acked-by: Andrea Gallo<andrea.gallo@stericsson.com>
> ---
>
> Sorry, just noted that a parenthesis was missing in CONFIG_SYS_INIT_SP_ADDR.
> It was a latent bug spitting a warning. This only changes that line
> over V1 I sent earlier.
>
>   board/st/nhk8815/config.mk |   26 --------------------------
>   board/st/nhk8815/nhk8815.c |    9 +++++++--
>   include/configs/nhk8815.h  |    5 +++++
>   3 files changed, 12 insertions(+), 28 deletions(-)
>   delete mode 100644 board/st/nhk8815/config.mk

Applied to u-boot-arm/master, thanks.

Amicalement,
diff mbox

Patch

diff --git a/board/st/nhk8815/config.mk b/board/st/nhk8815/config.mk
deleted file mode 100644
index 1789717..0000000
--- a/board/st/nhk8815/config.mk
+++ /dev/null
@@ -1,26 +0,0 @@ 
-# (C) Copyright 2007
-# STMicroelectronics, <www.st.com>
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-#
-# image should be loaded at 0x01000000
-#
-
-CONFIG_SYS_TEXT_BASE = 0x03F80000
diff --git a/board/st/nhk8815/nhk8815.c b/board/st/nhk8815/nhk8815.c
index faef810..9b62011 100644
--- a/board/st/nhk8815/nhk8815.c
+++ b/board/st/nhk8815/nhk8815.c
@@ -82,13 +82,18 @@  int board_late_init(void)
 
 int dram_init(void)
 {
-	/* set dram bank start addr and size */
+	gd->ram_size = get_ram_size(CONFIG_SYS_SDRAM_BASE,
+				    CONFIG_SYS_SDRAM_SIZE);
+	return 0;
+}
+
+void dram_init_banksize(void)
+{
 	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
 	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
 
 	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/include/configs/nhk8815.h b/include/configs/nhk8815.h
index 49a16ab..758f19d 100644
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -80,6 +80,11 @@ 
 #define PHYS_SDRAM_1_SIZE	0x04000000	/* 64 MB */
 #define PHYS_SDRAM_2		0x08000000	/* SDR-SDRAM BANK #2*/
 #define PHYS_SDRAM_2_SIZE	0x04000000	/* 64 MB */
+#define CONFIG_SYS_SDRAM_BASE	PHYS_SDRAM_1
+#define CONFIG_SYS_SDRAM_SIZE	(PHYS_SDRAM_1_SIZE + PHYS_SDRAM_2_SIZE)
+/* The IPL loads us at 0, tell so to u-boot. Put stack pointer 1M into RAM */
+#define CONFIG_SYS_TEXT_BASE    0x00000000
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + (1<<20))
 
 #define CONFIG_STACKSIZE	(128 * 1024)	/* regular stack */
 #ifdef CONFIG_USE_IRQ