[U-Boot-Users] [GIT PULL] Please pull u-boot-arm

[Magnus Lilja]

>  I would expect, that the state of the current repository represents
>  what we get after applying Sascha's and Guennadi's patches (in the
>  correct versions and order). Howver, the current tree looks totally
>  different to me.

There are some vital differences between the current git trees (both
the ARM tree and the main tree) and the tree one gets after applying
the patches manually (from the posts here on the list).

I had to make some changes in order to get the litekit to work with
the git source, it seems like the phycore is also affected but I don't
have such a board to test on.

The following changes to the current git will put the files into the
same state as in the patches posted on the list.

At the moment I'm using gmail to post this so the diff below may be
garbled, I can re-post tonight using another mailer if necessary.

Regards, Magnus Lilja

 board/imx31_litekit/Makefile        |    2 ++
 board/imx31_litekit/lowlevel_init.S |    5 +++++
 board/imx31_phycore/Makefile        |    2 ++
 board/imx31_phycore/lowlevel_init.S |    3 +++
 4 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/board/imx31_litekit/Makefile b/board/imx31_litekit/Makefile
index aaaec69..76ed1ad 100644
--- a/board/imx31_litekit/Makefile
+++ b/board/imx31_litekit/Makefile
@@ -48,3 +48,5 @@ distclean:	clean
 include $(SRCTREE)/rules.mk

 sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/imx31_litekit/lowlevel_init.S
b/board/imx31_litekit/lowlevel_init.S
index 74d6067..c778e88 100644
--- a/board/imx31_litekit/lowlevel_init.S
+++ b/board/imx31_litekit/lowlevel_init.S
@@ -101,3 +101,8 @@ lowlevel_init:
 	REG	0xB8001000, 0xb2100000
 	REG8	0x80000033, 0xda
 	REG8	0x81000000, 0xff
+	REG	0xB8001000, 0x82226080
+	REG	0x80000000, 0xDEADBEEF
+	REG	0xB8001010, 0x0000000c
+
+	mov	pc, lr
diff --git a/board/imx31_phycore/Makefile b/board/imx31_phycore/Makefile
index de37cca..f6c248d 100644
--- a/board/imx31_phycore/Makefile
+++ b/board/imx31_phycore/Makefile
@@ -47,3 +47,5 @@ distclean:	clean
 include $(SRCTREE)/rules.mk

 sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/imx31_phycore/lowlevel_init.S
b/board/imx31_phycore/lowlevel_init.S
index b0a5389..61a500e 100644
--- a/board/imx31_phycore/lowlevel_init.S
+++ b/board/imx31_phycore/lowlevel_init.S
@@ -103,3 +103,6 @@ lowlevel_init:
 	REG8	0x81000000, 0xff
 	REG	0xB8001000, 0x82226080
 	REG	0x80000000, 0xDEADBEEF
+	REG	0xB8001010, 0x0000000c
+
+	mov	pc, lr