Patchwork [U-Boot,2/8,v4] integratorap: make the compile work again

login
register
mail settings
Submitter Linus Walleij
Date July 25, 2011, 11:49 a.m.
Message ID <1311594576-19597-1-git-send-email-linus.walleij@linaro.org>
Download mbox | patch
Permalink /patch/106640/
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Comments

Linus Walleij - July 25, 2011, 11:49 a.m.
The integratorap/cp config for u-boot was outdated and would not
even compile, so fix the obvious missing bits for it to start
building. After this "make ap920t_config/make all" starts working
again.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 board/armltd/integrator/lowlevel_init.S |    2 +-
 include/configs/integratorap.h          |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletions(-)

Patch

diff --git a/board/armltd/integrator/lowlevel_init.S b/board/armltd/integrator/lowlevel_init.S
index ab9589c..6f55bb5 100644
--- a/board/armltd/integrator/lowlevel_init.S
+++ b/board/armltd/integrator/lowlevel_init.S
@@ -199,7 +199,7 @@  cm_remap:
 
 	/* Now 0x00000000 is writeable, replace the vectors	*/
 	ldr	r0, =_start	/* r0 <- start of vectors	*/
-	ldr	r2, =_armboot_start	/* r2 <- past vectors	*/
+	ldr	r2, =_TEXT_BASE	/* r2 <- past vectors	*/
 	sub	r1,r1,r1		/* destination 0x00000000	*/
 
 copy_vec:
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index 32ff193..8b41885 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -120,6 +120,12 @@ 
 #define CONFIG_NR_DRAM_BANKS	1	/* we have 1 bank of DRAM */
 #define PHYS_SDRAM_1		0x00000000	/* SDRAM Bank #1 */
 #define PHYS_SDRAM_1_SIZE	0x02000000	/* 32 MB */
+#define CONFIG_SYS_SDRAM_BASE	PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_RAM_SIZE PHYS_SDRAM_1_SIZE
+#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_SDRAM_BASE + \
+				    CONFIG_SYS_INIT_RAM_SIZE - \
+				    GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_FLASH_BASE	0x24000000