[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-282-ga8a9310
Brought to you by:
sszy
|
From: jorasse <jo...@us...> - 2012-04-20 16:14:30
|
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 a8a9310f8979be628f99a8fc63bf66f08bae3853 (commit)
via ed49591ca50e54d81e70afd0b6c800e0321df176 (commit)
from eded072706c3595f717fdbf051d3761830d81240 (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 a8a9310f8979be628f99a8fc63bf66f08bae3853
Merge: ed49591 eded072
Author: Eric Jarrige <eri...@ar...>
Date: Fri Apr 20 18:25:30 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit ed49591ca50e54d81e70afd0b6c800e0321df176
Author: Eric Jarrige <eri...@ar...>
Date: Fri Apr 20 18:24:38 2012 +0200
[TOOLS] APF27: make recover tool ready for new generation of bootloader - update RAM initiliasation
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/apf27_recover.py | 94 ++++++++++++------------------
1 files changed, 38 insertions(+), 56 deletions(-)
diff --git a/software/uboot_recover/apf27_recover.py b/software/uboot_recover/apf27_recover.py
index 30d4645..5ccd017 100644
--- a/software/uboot_recover/apf27_recover.py
+++ b/software/uboot_recover/apf27_recover.py
@@ -240,58 +240,39 @@ class apf27Bootloader:
def initSDRAM2( self ):
print "SDRAM INIT2 APF",
- self.put("D800100C","00695728","l")
-
- self.put("D8001008","92100000","l")
- self.put("B0000F00","00000000","l")
- self.put("D8001008","A2100000","l")
- self.put("B0000F00","00000000","l")
- self.put("B0000F00","00000000","l")
- self.put("B0000F00","00000000","l")
- self.put("B0000F00","00000000","l")
- self.put("D8001008","A2100000","l")
- self.put("B0000F00","00000000","l")
- self.put("B0000F00","00000000","l")
- self.put("B0000F00","00000000","l")
- self.put("B0000F00","00000000","l")
- self.put("D8001008","b2100000","l")
- self.put("B0000033","DA0000DA","b")
- self.put("B2000000","00000000","b")
- self.put("D8001008","82126080","l")
-
- def initSDRAM1( self, sdramType ):
-
- print "SDRAM INIT1 APF",
- self.put("10027818","0000080f","l")
- #self.put("D8001010","00000004","l")
- self.put("D8001010","0000000C","l")
-
- #self.put("10027828","55555555","l")
- #self.put("10027830","55555555","l")
- #self.put("10027834","55555555","l")
- #self.put("10027838","00005005","l")
- #self.put("1002783C","15555555","l")
- #self.put("D8001010","00000024","l")
- #self.put("D8001004","0069eb38","l")
- #self.put("D8001004","007FFFFF","l")
- self.put("D8001004","00695728","l")
-
- self.put("D8001000","92100000","l")
- self.put("A0000F00","00000000","l")
- self.put("D8001000","A2100000","l")
- self.put("A0000F00","00000000","l")
- self.put("A0000F00","00000000","l")
- self.put("A0000F00","00000000","l")
- self.put("A0000F00","00000000","l")
- self.put("D8001000","A2100000","l")
- self.put("A0000F00","00000000","l")
- self.put("A0000F00","00000000","l")
- self.put("A0000F00","00000000","l")
- self.put("A0000F00","00000000","l")
- self.put("D8001000","b2100000","l")
- self.put("A0000033","DA0000DA","b")
- self.put("A2000000","00000000","b")
- self.put("D8001000","82126080","l")
+ self.put("D800100C","0069D42A","l")
+
+ self.put("D8001008","92126485","l")
+ self.put("B0000400","00000000","l")
+ self.put("D8001008","A2126485","l")
+ self.put("B0000000","00000000","l")
+ self.put("B0000000","00000000","l")
+ self.put("B0000000","00000000","l")
+ self.put("B0000000","00000000","l")
+ self.put("D8001008","B2126485","l")
+ self.put("B0000033","DA0000DA","b")
+ self.put("B2000000","00000000","b")
+ self.put("D8001008","82126485","l")
+
+ def initSDRAM1( self ):
+
+ print "SDRAM INIT1 APF",
+ self.put("10027818","0000080f","l")
+ self.put("D8001010","0000002C","l")
+
+ self.put("D8001004","0069D42A","l")
+
+ self.put("D8001000","92126485","l")
+ self.put("A0000400","00000000","l")
+ self.put("D8001000","A2126485","l")
+ self.put("A0000000","00000000","l")
+ self.put("A0000000","00000000","l")
+ self.put("A0000000","00000000","l")
+ self.put("A0000000","00000000","l")
+ self.put("D8001000","B2126485","l")
+ self.put("A0000033","DA0000DA","b")
+ self.put("A2000000","00000000","b")
+ self.put("D8001000","82126485","l")
def consoleDump(tid):
@@ -327,8 +308,8 @@ class UBoot:
BINARY = "apf27-u-boot.bin"
if not os.path.exists(BINARY):
raise Error("file "+BINARY+" doesn't exit",0)
- fsize = "%08x" % os.path.getsize(BINARY) #os.stat(filesize)[6]
- self.bootstrap.download("A0000000", BINARY, fsize)
+ self.fsize = "%08x" % os.path.getsize(BINARY) #os.stat(filesize)[6]
+ self.bootstrap.download("A0000000", BINARY, self.fsize)
def resetenv(self):
self.serial.flushInput()
@@ -345,7 +326,7 @@ class UBoot:
def flash(self):
""" flash uboot """
self.serial.flushInput()
- self.serial.write("run flash_uboot\n")
+ self.serial.write("setenv fileaddr A0000000; setenv filesize "+self.fsize+";run flash_uboot\n")
try:
ret = self.__getOutput()
except Error,e:
@@ -377,7 +358,8 @@ if __name__ == "__main__":
uboot = UBoot(apfBootloader, ser)
apfBootloader.getstatus()
- apfBootloader.initSDRAM1("APF27")
+ apfBootloader.initSDRAM1()
+ apfBootloader.initSDRAM2()
uboot.load()
uboot.waitForPrompt()
eraseAll = raw_input('Would you like to erase the environment variables? y/n: ')
hooks/post-receive
--
armadeus
|