[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2453-gd2c7479
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2453-gd2c7479
|
From: jorasse <jo...@us...> - 2011-08-06 21:08:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via d2c7479be55e0123152aabb2a4481f44473595c3 (commit)
from 2b159105d548b8fd0be1229920c322501cf3e474 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d2c7479be55e0123152aabb2a4481f44473595c3
Author: Eric Jarrige <eri...@ar...>
Date: Sat Aug 6 23:02:25 2011 +0200
[UBOOT][2011.06] workaround to have U-Boot runnable from either Flash or RAM
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf9328/apf9328-u-boot-2011.06.h | 2 +-
patches/u-boot/2011.06/02-apf9328.patch | 50 ++++++++++++++------
patches/u-boot/2011.06/03-apf9328-makefile.patch | 19 ++++----
patches/u-boot/2011.06/04-apf9328-config.patch | 4 +-
patches/u-boot/2011.06/07-mx1-relocation.patch | 2 +-
patches/u-boot/2011.06/series | 2 +-
6 files changed, 50 insertions(+), 29 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h
index c004b29..b5b5794 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h
@@ -407,7 +407,7 @@
#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_SDRAM_1_BASE
#ifndef CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_TEXT_BASE 0x10000000
+#define CONFIG_SYS_TEXT_BASE 0x08E00000
#endif
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x0f00000)
diff --git a/patches/u-boot/2011.06/02-apf9328.patch b/patches/u-boot/2011.06/02-apf9328.patch
index c99880f..a2b8433 100644
--- a/patches/u-boot/2011.06/02-apf9328.patch
+++ b/patches/u-boot/2011.06/02-apf9328.patch
@@ -5,16 +5,16 @@ Add Armadeus Project board APF9328
Signed-off-by: Eric Jarrige <eri...@ar...>
Signed-off-by: Nicolas Colombain <nic...@ar...>
---
- board/armadeus/apf9328/Makefile | 51 ++++
- board/armadeus/apf9328/apf9328.c | 91 +++++++
+ board/armadeus/apf9328/Makefile | 51 +++
+ board/armadeus/apf9328/apf9328.c | 91 ++++++
board/armadeus/apf9328/apf9328fpga.c | 89 ++++++
board/armadeus/apf9328/apf9328fpga.h | 31 ++
board/armadeus/apf9328/eeprom.c | 88 ++++++
- board/armadeus/apf9328/fpga.c | 121 +++++++++
+ board/armadeus/apf9328/fpga.c | 121 ++++++++
board/armadeus/apf9328/fpga.h | 30 ++
- board/armadeus/apf9328/i2c.c | 276 ++++++++++++++++++++
- board/armadeus/apf9328/lowlevel_init.S | 448 ++++++++++++++++++++++++++++++++
- 9 files changed, 1225 insertions(+), 0 deletions(-)
+ board/armadeus/apf9328/i2c.c | 276 +++++++++++++++++++
+ board/armadeus/apf9328/lowlevel_init.S | 470 ++++++++++++++++++++++++++++++++
+ 9 files changed, 1247 insertions(+), 0 deletions(-)
create mode 100644 board/armadeus/apf9328/Makefile
create mode 100644 board/armadeus/apf9328/apf9328.c
create mode 100644 board/armadeus/apf9328/apf9328fpga.c
@@ -852,10 +852,10 @@ index 0000000..0ba0a8d
+#endif /* CONFIG_HARD_I2C */
diff --git a/board/armadeus/apf9328/lowlevel_init.S b/board/armadeus/apf9328/lowlevel_init.S
new file mode 100644
-index 0000000..55955b7
+index 0000000..f17bcf9
--- /dev/null
+++ b/board/armadeus/apf9328/lowlevel_init.S
-@@ -0,0 +1,448 @@
+@@ -0,0 +1,470 @@
+/*
+ * (C) Copyright 2005-2011 ej Armadeus Project <eri...@ar...>
+ * Copyright (C) 2004 Sascha Hauer, Synertronixx GmbH
@@ -883,9 +883,6 @@ index 0000000..55955b7
+
+.globl lowlevel_init
+lowlevel_init:
-+
-+ mov r10, lr
-+
+/* Change PERCLK1DIV to 14 ie 14+1 */
+ ldr r0, =PCDR
+ ldr r1, =CONFIG_SYS_PCDR_VAL
@@ -1267,7 +1264,7 @@ index 0000000..55955b7
+ /* test if we run from flash or RAM */
+ ldr r1, =CONFIG_SYS_FLASH_BASE
+ cmp r0, r1 /* don't reloc during debug */
-+ bmi endofmemsetup
++ bmi copy2ram
+
+/* SDRAM Setup */
+sdramsetup:
@@ -1301,6 +1298,31 @@ index 0000000..55955b7
+
+ ldr r1, =CONFIG_SYS_NORMAL_RW_CMD
+ str r1, [r0]
++/* make U-Boot runnable form "almost" anywhere */
++/* but SYS_TEXT_BASE should be in RAM */
++copy2ram: /* populate _TEXT_BASE with U-Boot from load addr */
++ ldr r0, _start_adr
++ ldr r1, _copy2ram
++ sub r1, r1, r0
++ adr r0, copy2ram
++ sub r0, r0, r1
++ ldr r1, =CONFIG_SYS_TEXT_BASE
++ cmp r0, r1
++ beq end_of_copy2ram /* skip U-Boot copy */
++ ldr r2, =CONFIG_SYS_MONITOR_LEN
++ add r2, r2, r0 /* r2 <- source end address */
++
++copy_loop:
++ ldmia r0!, {r9-r10} /* copy from source address [r0] */
++ stmia r1!, {r9-r10} /* copy to target address [r1] */
++ cmp r0, r2 /* until source end address [r2] */
++ blo copy_loop
++
++end_of_copy2ram:
++ mov pc,lr
++
++_copy2ram:
++ .word copy2ram
++_start_adr:
++ .word _start
+
-+endofmemsetup:
-+ mov pc,r10
diff --git a/patches/u-boot/2011.06/03-apf9328-makefile.patch b/patches/u-boot/2011.06/03-apf9328-makefile.patch
index a15fd2e..72cbf14 100644
--- a/patches/u-boot/2011.06/03-apf9328-makefile.patch
+++ b/patches/u-boot/2011.06/03-apf9328-makefile.patch
@@ -6,14 +6,14 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
---
MAINTAINERS | 4 ++++
MAKEALL | 1 +
- boards.cfg | 2 ++
- 3 files changed, 7 insertions(+), 0 deletions(-)
+ boards.cfg | 1 +
+ 3 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
-index 6e6affa..c81a2e1 100644
+index f8d8559..7b8d537 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -683,6 +683,10 @@ Grazvydas Ignotas <no...@gm...>
+@@ -681,6 +681,10 @@ Grazvydas Ignotas <no...@gm...>
omap3_pandora ARM ARMV7 (OMAP3xx SoC)
@@ -25,10 +25,10 @@ index 6e6affa..c81a2e1 100644
smdk2400 ARM920T
diff --git a/MAKEALL b/MAKEALL
-index 4adaeb8..5ac6ecc 100755
+index 266e231..0f460bf 100755
--- a/MAKEALL
+++ b/MAKEALL
-@@ -322,6 +322,7 @@ LIST_ARM7=" \
+@@ -320,6 +320,7 @@ LIST_ARM7=" \
LIST_ARM9=" \
a320evb \
@@ -37,15 +37,14 @@ index 4adaeb8..5ac6ecc 100755
ap922_XA10 \
ap926ejs \
diff --git a/boards.cfg b/boards.cfg
-index 5cfaa78..b5309ab 100644
+index 3e79c82..43860ce 100644
--- a/boards.cfg
+++ b/boards.cfg
-@@ -49,6 +49,8 @@ lpc2292sodimm arm arm720t - -
+@@ -49,6 +49,7 @@ lpc2292sodimm arm arm720t - -
SMN42 arm arm720t - siemens lpc2292
evb4510 arm arm720t - - s3c4510b
a320evb arm arm920t - faraday a320
-+apf9328 arm arm920t apf9328 armadeus imx apf9328:SYS_TEXT_BASE=0x00000000
-+apf9328_ram arm arm920t apf9328 armadeus imx apf9328:SYS_TEXT_BASE=0x08000000
++apf9328 arm arm920t apf9328 armadeus imx
at91rm9200ek arm arm920t at91rm9200ek atmel at91 at91rm9200ek
at91rm9200ek_ram arm arm920t at91rm9200ek atmel at91 at91rm9200ek:RAMBOOT
eb_cpux9k2 arm arm920t - BuS at91
diff --git a/patches/u-boot/2011.06/04-apf9328-config.patch b/patches/u-boot/2011.06/04-apf9328-config.patch
index 1374431..3b472e7 100644
--- a/patches/u-boot/2011.06/04-apf9328-config.patch
+++ b/patches/u-boot/2011.06/04-apf9328-config.patch
@@ -10,7 +10,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
diff --git a/include/configs/apf9328.h b/include/configs/apf9328.h
new file mode 100644
-index 0000000..c004b29
+index 0000000..b5b5794
--- /dev/null
+++ b/include/configs/apf9328.h
@@ -0,0 +1,1030 @@
@@ -423,7 +423,7 @@ index 0000000..c004b29
+
+#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_SDRAM_1_BASE
+#ifndef CONFIG_SYS_TEXT_BASE
-+#define CONFIG_SYS_TEXT_BASE 0x10000000
++#define CONFIG_SYS_TEXT_BASE 0x08E00000
+#endif
+
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x0f00000)
diff --git a/patches/u-boot/2011.06/07-mx1-relocation.patch b/patches/u-boot/2011.06/07-mx1-relocation.patch
index 19a48a0..cc01a26 100644
--- a/patches/u-boot/2011.06/07-mx1-relocation.patch
+++ b/patches/u-boot/2011.06/07-mx1-relocation.patch
@@ -9,7 +9,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S
-index a7476b0..3fee99f 100644
+index 0090f89..46c201a 100644
--- a/arch/arm/cpu/arm920t/start.S
+++ b/arch/arm/cpu/arm920t/start.S
@@ -292,9 +292,7 @@ _nand_boot_ofs:
diff --git a/patches/u-boot/2011.06/series b/patches/u-boot/2011.06/series
index 8c7b2de..d084963 100644
--- a/patches/u-boot/2011.06/series
+++ b/patches/u-boot/2011.06/series
@@ -1,4 +1,4 @@
-# This series applies on GIT commit 53232d507051884f12d3ead53144ee972fe8d627
+# This series applies on GIT commit 03d4ce814d094a148344c663b05bc802abc63a64
01-mx1-i2c.patch
02-apf9328.patch
03-apf9328-makefile.patch
hooks/post-receive
--
armadeus
|
