public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 1/3] nhk8815: remove platform.S, which was unused at link time
@ 2011-04-16 17:49 Alessandro Rubini
  2011-04-16 17:49 ` [U-Boot] [PATCH 2/3] nhk8815: add support for relocation Alessandro Rubini
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Alessandro Rubini @ 2011-04-16 17:49 UTC (permalink / raw)
  To: u-boot

From: Alessandro Rubini <rubini@unipv.it>

This source file, which I got by the vendor in their own port,
was not actually executing because lib-based compilation
didn't call lowlevel_init (we have CONFIG_SKIP_LOWLEVEL_INIT).
With the change to object-based linking, an undefined symbol in
this file started hitting in the final link.

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
---
 board/st/nhk8815/Makefile   |    2 +-
 board/st/nhk8815/platform.S |  340 -------------------------------------------
 2 files changed, 1 insertions(+), 341 deletions(-)
 delete mode 100644 board/st/nhk8815/platform.S

diff --git a/board/st/nhk8815/Makefile b/board/st/nhk8815/Makefile
index 3f360dc..60b87b1 100644
--- a/board/st/nhk8815/Makefile
+++ b/board/st/nhk8815/Makefile
@@ -30,7 +30,7 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(BOARD).o
 
 COBJS	:= nhk8815.o
-SOBJS	:= platform.o
+SOBJS	:=
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
diff --git a/board/st/nhk8815/platform.S b/board/st/nhk8815/platform.S
deleted file mode 100644
index 2a67110..0000000
--- a/board/st/nhk8815/platform.S
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Board specific setup info
- *
- * (C) Copyright 2005
- * STMicrolelctronics, <www.st.com>
- *
- * (C) Copyright 2004, ARM Ltd.
- * Philippe Robin, <philippe.robin@arm.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
- */
-
-#include <config.h>
-#include <version.h>
-
-.globl lowlevel_init
-lowlevel_init:
-	/* Jump to the flash address */
-	ldr r0, =CFG_ONENAND_BASE
-
-	/*
-	 * Make it independent whether we boot from 0x0 or 0x30000000.
-	 * Non-portable: it relies on the knowledge that ip has to be updated
-	 */
-	orr ip, ip, r0	/* adjust return address of cpu_init_crit */
-	orr lr, lr, r0	/* adjust return address */
-	orr pc, pc, r0	/* jump to the normal address */
-	nop
-
-	/* Initialize PLL, Remap clear, FSMC, MPMC here! */
-	/* What about GPIO, CLCD and UART */
-
-	/* PLL Initialization */
-	/* Prog the PLL1 @ 266 MHz ==> SDRAM Clock = 100.8 MHz */
-	ldr r0, =NOMADIK_SRC_BASE
-
-	ldr r1, =0x2B013502
-
-	str r1, [r0, #0x14]
-
-	/* Used to set all the timers clock to 2.4MHZ */
-	ldr r1, =0x2AAAA004
-	str r1, [r0]
-
-	ldr r1, =0x10000000
-	str r1, [r0, #0x10]
-
-	/* FSMC setup ---- */
-	ldr r0, =NOMADIK_FSMC_BASE
-
-	ldr r1, =0x10DB		/* For 16-bit NOR flash */
-	str r1, [r0, #0x08]
-
-	ldr r1, =0x03333333	/* For 16-bit NOR flash */
-	str r1, [r0, #0xc]
-
-	/* oneNAND setting */
-	ldr r1, =0x0000105B	/* BCR0 Prog control register */
-	str r1, [r0]
-
-	ldr r1, =0x0A200551	/* BTR0 Prog timing register */
-	str r1, [r0, #0x04]
-
-	/* preload the instructions into icache */
-	add r0, pc, #0x1F
-	bic r0, r0, #0x1F
-	mcr p15, 0, r0, c7, c13, 1
-	add r0, r0, #0x20
-	mcr p15, 0, r0, c7, c13, 1
-
-	/* Now Clear Remap */
-	ldr r0, =NOMADIK_SRC_BASE
-
-	ldr r1, =0x2004
-	str r1, [r0]
-
-	ldr r1, =0x10000000
-	str r1, [r0, #0x10]
-
-	ldr r0, =0x101E9000
-	ldr r1, =0x2004
-	str r1, [r0]
-
-	ldr r0, =NOMADIK_SRC_BASE
-	ldr r1, =0x2104
-	str r1, [r0]
-
-	/* FSMC setup -- */
-	mov r0, #(NOMADIK_FSMC_BASE & 0x10000000)
-	orr r0, r0, #(NOMADIK_FSMC_BASE & 0x0FFFFFFF)
-
-	ldr r1, =0x10DB		/* For 16-bit NOR flash */
-	str r1, [r0, #0x8]
-
-	ldr r1, =0x03333333	/* For 16-bit NOR flash */
-	str r1, [r0, #0xc]
-
-	/* MPMC Setup */
-	ldr r0, =NOMADIK_MPMC_BASE
-
-	ldr r1, =0xF00003
-	str r1, [r0]		/* Enable the MPMC and the DLL */
-
-	ldr r1, =0x183
-	str r1, [r0, #0x20]
-
-	ldr r2, =NOMADIK_PMU_BASE
-
-	ldr r1, =0x1111
-	str r1, [r2]
-
-	ldr r1, =0x1111		/* Prog the, mand delay strategy */
-	str r1, [r0, #0x28]
-
-	ldr r1, =0x103		/* NOP ,mand */
-	str r1, [r0, #0x20]
-
-	/* FIXME -- Wait required here */
-
-	ldr r1, =0x103		/* PALL ,mand*/
-	str r1, [r0, #0x20]
-
-	ldr r1, =0x1
-	str r1, [r0, #0x24]	/* To do at least two auto-refresh */
-
-	/* FIXME -- Wait required here */
-
-	/* Auto-refresh period = 7.8us @ SDRAM Clock = 100.8 MHz */
-	ldr r1, =0x31
-	str r1, [r0, #0x24]
-
-	/* Prog Little Endian, Not defined in 8800 board */
-	ldr r1, =0x0
-	str r1,	[r0, #0x8]
-
-
-	ldr r1, =0x2
-	str r1, [r0, #0x30]		/* Prog tRP timing */
-
-	ldr r1, =0x4			/* Change for 8815 */
-	str r1, [r0, #0x34]		/* Prog tRAS timing */
-
-	ldr r1, =0xB
-	str r1, [r0, #0x38]		/* Prog tSREX timing */
-
-
-	ldr r1, =0x1
-	str r1, [r0, #0x44]		/* Prog tWR timing */
-
-	ldr r1, =0x8
-	str r1, [r0, #0x48]		/* Prog tRC timing */
-
-	ldr r1, =0xA
-	str r1, [r0, #0x4C]		/* Prog tRFC timing */
-
-	ldr r1, =0xB
-	str r1, [r0, #0x50]		/* Prog tXSR timing */
-
-	ldr r1, =0x1
-	str r1, [r0, #0x54]		/* Prog tRRD timing */
-
-	ldr r1, =0x1
-	str r1, [r0, #0x58]		/* Prog tMRD timing */
-
-	ldr r1, =0x1
-	str r1, [r0, #0x5C]		/* Prog tCDLR timing */
-
-	/* DDR-SDRAM MEMORY IS ON BANK0 8815 */
-	ldr r1, =0x304			/* Prog RAS and CAS for CS 0 */
-	str r1, [r0, #0x104]
-
-	/* SDR-SDRAM MEMORY IS ON BANK1 8815 */
-	ldr r1, =0x304			/* Prog RAS and CAS for CS 1 */
-	str r1, [r0, #0x124]
-	/* THE DATA BUS WIDE IS PROGRAM FOR 16-BITS */
-	/* DDR-SDRAM MEMORY IS ON BANK0*/
-
-	ldr r1, =0x884			/* 8815 : config reg in BRC for CS0 */
-	str r1, [r0, #0x100]
-
-	/*SDR-SDRAM MEMORY IS ON BANK1*/
-
-	ldr r1, =0x884			/* 8815 : config reg in BRC for CS1 */
-	str r1, [r0, #0x120]
-
-	ldr r1, =0x83			/*MODE Mand*/
-	str r1, [r0, #0x20]
-
-	/* LOAD MODE REGISTER FOR 2 bursts of 16b, with DDR mem ON BANK0 */
-
-	ldr r1, =0x62000			/*Data in*/
-	ldr r1, [r1]
-
-	/* LOAD MODE REGISTER FOR 2 bursts of 16b, with DDR mem ON BANK1 */
-
-	ldr r1, =0x8062000
-	ldr r1, [r1]
-
-	ldr r1, =0x003
-	str r1, [r0, #0x20]
-
-	/* ENABLE ALL THE BUFFER FOR EACH AHB PORT*/
-
-	ldr r1, =0x01			/* Enable buffer 0 */
-	str r1, [r0, #0x400]
-
-	ldr r1, =0x01			/* Enable buffer 1 */
-	str r1, [r0, #0x420]
-
-	ldr r1, =0x01			/* Enable buffer 2 */
-	str r1, [r0, #0x440]
-
-	ldr r1, =0x01			/* Enable buffer 3 */
-	str r1, [r0, #0x460]
-
-	ldr r1, =0x01			/* Enable buffer 4 */
-	str r1, [r0, #0x480]
-
-	ldr r1, =0x01			/* Enable buffer 5 */
-	str r1, [r0, #0x4A0]
-
-	/* GPIO settings */
-
-	ldr r0, =NOMADIK_GPIO1_BASE
-
-	ldr r1, =0xC0600000
-	str r1, [r0, #0x20]
-
-	ldr r1, =0x3F9FFFFF		/* ABHI change this for uart1 */
-	str r1, [r0, #0x24]
-
-	ldr r1, =0x3F9FFFFF		/* ABHI change this for uart1 */
-	str r1, [r0, #0x28]
-
-	ldr r0, =NOMADIK_GPIO0_BASE
-
-	ldr r1, =0xFFFFFFFF
-	str r1, [r0, #0x20]
-
-	ldr r1, =0x00
-	str r1, [r0, #0x24]
-
-	ldr r1, =0x00
-	str r1, [r0, #0x28]
-
-	/* Configure CPLD_CTRL register for enabling MUX logic for UART0/UART2 */
-
-	ldr r0, =NOMADIK_FSMC_BASE
-
-	ldr r1, =0x10DB			/* INIT FSMC bank 0 */
-	str r1, [r0, #0x00]
-
-	ldr r1, =0x0FFFFFFF
-	str r1, [r0, #0x04]
-
-	ldr r1, =0x010DB		/* INIT FSMC bank 1 */
-	str r1, [r0, #0x08]
-
-	ldr r1, =0x00FFFFFFF
-	str r1, [r0, #0x0C]
-
-	ldr r0, =NOMADIK_UART0_BASE
-
-	ldr r1, =0x00000000
-	str r1, [r0, #0x30]
-
-	ldr r1, =0x0000004e
-	str r1, [r0, #0x24]
-
-	ldr r1, =0x00000008
-	str r1, [r0, #0x28]
-
-	ldr r1, =0x00000060
-	str r1, [r0, #0x2C]
-
-	ldr r1, =0x00000301
-	str r1, [r0, #0x30]
-
-	ldr r1, =0x00000066
-	str r1, [r0]
-
-	ldr r0, =NOMADIK_UART1_BASE
-
-	ldr r1, =0x00000000
-	str r1, [r0, #0x30]
-
-	ldr r1, =0x0000004e
-	str r1, [r0, #0x24]
-
-	ldr r1, =0x00000008
-	str r1, [r0, #0x28]
-
-	ldr r1, =0x00000060
-	str r1, [r0, #0x2C]
-
-	ldr r1, =0x00000301
-	str r1, [r0, #0x30]
-
-	ldr r1, =0x00000066
-	str r1, [r0]
-
-	ldr r0, =NOMADIK_UART2_BASE
-
-	ldr r1, =0x00000000
-	str r1, [r0, #0x30]
-
-	ldr r1, =0x0000004e
-	str r1, [r0, #0x24]
-
-	ldr r1, =0x00000008
-	str r1, [r0, #0x28]
-
-	ldr r1, =0x00000060
-	str r1, [r0, #0x2C]
-
-	ldr r1, =0x00000301
-	str r1, [r0, #0x30]
-
-	ldr r1, =0x00000066
-	str r1, [r0]
-
-	/* Configure CPLD to enable UART0 */
-
-	mov pc, lr
-- 
1.5.6.5

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [U-Boot] [PATCH 2/3] nhk8815: add support for relocation
  2011-04-16 17:49 [U-Boot] [PATCH 1/3] nhk8815: remove platform.S, which was unused at link time Alessandro Rubini
@ 2011-04-16 17:49 ` Alessandro Rubini
  2011-04-16 23:00   ` [U-Boot] [PATCH 2/3 V2] " Alessandro Rubini
  2011-04-16 17:50 ` [U-Boot] [PATCH 3/3] nhk8815: move config targets from Makefile to boards.cfg Alessandro Rubini
  2011-04-23 11:28 ` [U-Boot] [PATCH 1/3] nhk8815: remove platform.S, which was unused at link time Albert ARIBAUD
  2 siblings, 1 reply; 7+ messages in thread
From: Alessandro Rubini @ 2011-04-16 17:49 UTC (permalink / raw)
  To: u-boot

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@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
---
 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

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..1cecc34 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
-- 
1.5.6.5

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [U-Boot] [PATCH 3/3] nhk8815: move config targets from Makefile to boards.cfg
  2011-04-16 17:49 [U-Boot] [PATCH 1/3] nhk8815: remove platform.S, which was unused at link time Alessandro Rubini
  2011-04-16 17:49 ` [U-Boot] [PATCH 2/3] nhk8815: add support for relocation Alessandro Rubini
@ 2011-04-16 17:50 ` Alessandro Rubini
  2011-04-23 11:40   ` Albert ARIBAUD
  2011-04-23 11:28 ` [U-Boot] [PATCH 1/3] nhk8815: remove platform.S, which was unused at link time Albert ARIBAUD
  2 siblings, 1 reply; 7+ messages in thread
From: Alessandro Rubini @ 2011-04-16 17:50 UTC (permalink / raw)
  To: u-boot

From: Alessandro Rubini <rubini@unipv.it>

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

BTW: please note that file is not sorted and has some white-space
error: "dkb" is aligned with tabs while all other use spaces and
there is a spurious tab after "Target" (both begin and end)


 Makefile   |    9 ---------
 boards.cfg |    2 ++
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 713dba1..584105c 100644
--- a/Makefile
+++ b/Makefile
@@ -933,15 +933,6 @@ cp922_XA10_config	\
 cp1026_config: unconfig
 	@board/armltd/integrator/split_by_variant.sh cp $@
 
-nhk8815_config \
-nhk8815_onenand_config:	unconfig
-	@mkdir -p $(obj)include
-	@ > $(obj)include/config.h
-	@if [ "$(findstring _onenand, $@)" ] ; then \
-		echo "#define CONFIG_BOOT_ONENAND" >> $(obj)include/config.h; \
-	fi
-	@$(MKCONFIG) -n $@ -a nhk8815 arm arm926ejs nhk8815 st nomadik
-
 xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$(subst _config,,$1))))
 
 omap1610inn_config \
diff --git a/boards.cfg b/boards.cfg
index 554e06c..9194610 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -103,6 +103,8 @@ dockstar                     arm         arm926ejs   -                   Seagate
 jadecpu                      arm         arm926ejs   jadecpu             syteco         mb86r0x
 imx27lite                    arm         arm926ejs   imx27lite           logicpd        mx27
 magnesium                    arm         arm926ejs   imx27lite           logicpd        mx27
+nhk8815                      arm         arm926ejs   nhk8815             st             nomadik
+nhk8815_onenand              arm         arm926ejs   nhk8815             st             nomadik       nhk8815:BOOT_ONENAND
 omap5912osk                  arm         arm926ejs   -                   ti             omap
 edminiv2                     arm         arm926ejs   -                   LaCie          orion5x
 dkb			     arm         arm926ejs   -                   Marvell        pantheon
-- 
1.5.6.5

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [U-Boot] [PATCH 2/3 V2] nhk8815: add support for relocation
  2011-04-16 17:49 ` [U-Boot] [PATCH 2/3] nhk8815: add support for relocation Alessandro Rubini
@ 2011-04-16 23:00   ` Alessandro Rubini
  2011-04-23 11:33     ` Albert ARIBAUD
  0 siblings, 1 reply; 7+ messages in thread
From: Alessandro Rubini @ 2011-04-16 23:00 UTC (permalink / raw)
  To: u-boot

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

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
-- 
1.5.6.5

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [U-Boot] [PATCH 1/3] nhk8815: remove platform.S, which was unused at link time
  2011-04-16 17:49 [U-Boot] [PATCH 1/3] nhk8815: remove platform.S, which was unused at link time Alessandro Rubini
  2011-04-16 17:49 ` [U-Boot] [PATCH 2/3] nhk8815: add support for relocation Alessandro Rubini
  2011-04-16 17:50 ` [U-Boot] [PATCH 3/3] nhk8815: move config targets from Makefile to boards.cfg Alessandro Rubini
@ 2011-04-23 11:28 ` Albert ARIBAUD
  2 siblings, 0 replies; 7+ messages in thread
From: Albert ARIBAUD @ 2011-04-23 11:28 UTC (permalink / raw)
  To: u-boot

Hi Alessandro,

Le 16/04/2011 19:49, Alessandro Rubini a ?crit :
> From: Alessandro Rubini<rubini@unipv.it>
>
> This source file, which I got by the vendor in their own port,
> was not actually executing because lib-based compilation
> didn't call lowlevel_init (we have CONFIG_SKIP_LOWLEVEL_INIT).
> With the change to object-based linking, an undefined symbol in
> this file started hitting in the final link.
>
> Signed-off-by: Alessandro Rubini<rubini@unipv.it>
> Acked-by: Andrea Gallo<andrea.gallo@stericsson.com>
> ---
>   board/st/nhk8815/Makefile   |    2 +-
>   board/st/nhk8815/platform.S |  340 -------------------------------------------
>   2 files changed, 1 insertions(+), 341 deletions(-)
>   delete mode 100644 board/st/nhk8815/platform.S

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

Amicalement,
-- 
Albert.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [U-Boot] [PATCH 2/3 V2] nhk8815: add support for relocation
  2011-04-16 23:00   ` [U-Boot] [PATCH 2/3 V2] " Alessandro Rubini
@ 2011-04-23 11:33     ` Albert ARIBAUD
  0 siblings, 0 replies; 7+ messages in thread
From: Albert ARIBAUD @ 2011-04-23 11:33 UTC (permalink / raw)
  To: u-boot

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,
-- 
Albert.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [U-Boot] [PATCH 3/3] nhk8815: move config targets from Makefile to boards.cfg
  2011-04-16 17:50 ` [U-Boot] [PATCH 3/3] nhk8815: move config targets from Makefile to boards.cfg Alessandro Rubini
@ 2011-04-23 11:40   ` Albert ARIBAUD
  0 siblings, 0 replies; 7+ messages in thread
From: Albert ARIBAUD @ 2011-04-23 11:40 UTC (permalink / raw)
  To: u-boot

Hi Alessandro,

Le 16/04/2011 19:50, Alessandro Rubini a ?crit :
> From: Alessandro Rubini<rubini@unipv.it>
>
> Signed-off-by: Alessandro Rubini<rubini@unipv.it>
> Acked-by: Andrea Gallo<andrea.gallo@stericsson.com>
> ---
>
> BTW: please note that file is not sorted and has some white-space
> error: "dkb" is aligned with tabs while all other use spaces and
> there is a spurious tab after "Target" (both begin and end)

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

Amicalement,
-- 
Albert.

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2011-04-23 11:40 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-16 17:49 [U-Boot] [PATCH 1/3] nhk8815: remove platform.S, which was unused at link time Alessandro Rubini
2011-04-16 17:49 ` [U-Boot] [PATCH 2/3] nhk8815: add support for relocation Alessandro Rubini
2011-04-16 23:00   ` [U-Boot] [PATCH 2/3 V2] " Alessandro Rubini
2011-04-23 11:33     ` Albert ARIBAUD
2011-04-16 17:50 ` [U-Boot] [PATCH 3/3] nhk8815: move config targets from Makefile to boards.cfg Alessandro Rubini
2011-04-23 11:40   ` Albert ARIBAUD
2011-04-23 11:28 ` [U-Boot] [PATCH 1/3] nhk8815: remove platform.S, which was unused at link time Albert ARIBAUD

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox