Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

[platform/kernel/u-boot.git] / board / keymile / km_arm / kwbimage.cfg

diff --git a/board/keymile/km_arm/kwbimage.cfg b/board/keymile/km_arm/kwbimage.cfg
index 26d6aa0..ce2c3e2 100644 (file)
--- a/board/keymile/km_arm/kwbimage.cfg
+++ b/board/keymile/km_arm/kwbimage.cfg
@@ -2,41 +2,27 @@
 # (C) Copyright 2010
 # Heiko Schocher, DENX Software Engineering, hs@denx.de.
 #
-# See file CREDITS for list of people who contributed to this
-# project.
+# SPDX-License-Identifier:     GPL-2.0+
 #
-# 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., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
-#
-# Refer docs/README.kwimage for more details about how-to configure
+# Refer doc/README.kwbimage for more details about how-to configure
 # and create kirkwood boot image
 #
 
 # Boot Media configurations
 BOOT_FROM      spi     # Boot from SPI flash
 
-DATA 0xFFD10000 0x01111111     # MPP Control 0 Register
-# bit 3-0:   MPPSel0   1, NF_IO[2]
-# bit 7-4:   MPPSel1   1, NF_IO[3]
-# bit 12-8:  MPPSel2   1, NF_IO[4]
-# bit 15-12: MPPSel3   1, NF_IO[5]
+DATA 0xFFD10000 0x01112222     # MPP Control 0 Register
+# bit 3-0:   MPPSel0   2, NF_IO[2]
+# bit 7-4:   MPPSel1   2, NF_IO[3]
+# bit 12-8:  MPPSel2   2, NF_IO[4]
+# bit 15-12: MPPSel3   2, NF_IO[5]
 # bit 19-16: MPPSel4   1, NF_IO[6]
 # bit 23-20: MPPSel5   1, NF_IO[7]
 # bit 27-24: MPPSel6   1, SYSRST_O
 # bit 31-28: MPPSel7   0, GPO[7]
 
+DATA 0xFFD10004 0x03303300
+
 DATA 0xFFD10008 0x00001100     # MPP Control 2 Register
 # bit 3-0:   MPPSel16  0, GPIO[16]
 # bit 7-4:   MPPSel17  0, GPIO[17]
@@ -48,11 +34,11 @@ DATA 0xFFD10008 0x00001100  # MPP Control 2 Register
 # bit 31-28: MPPSel23  0, GPIO[23]
 
 DATA 0xFFD100E0 0x1B1B1B1B     # IO Configuration 0 Register
-DATA 0xFFD20134 0xBBBBBBBB     # L2 RAM Timing 0 Register
-DATA 0xFFD20138 0x00BBBBBB     # L2 RAM Timing 1 Register
-DATA 0xFFD20154 0x00000200     # CPU RAM Management Control3 Register
-DATA 0xFFD2014C 0x00001C00     # CPU RAM Management Control1 Register
-DATA 0xFFD20148 0x00000001     # CPU RAM Management Control0 Register
+DATA 0xFFD20134 0x66666666     # L2 RAM Timing 0 Register
+DATA 0xFFD20138 0x66666666     # L2 RAM Timing 1 Register
+
+# NOTE: Don't write on 0x20148 , 0x2014c and 0x20154, leave them untouched!
+# If not it could cause KW Exceptions during boot in Fast Corners/High Voltage
 
 #Dram initalization
 DATA 0xFFD01400 0x43000400     # SDRAM Configuration Register
@@ -63,7 +49,7 @@ DATA 0xFFD01400 0x43000400    # SDRAM Configuration Register
 # bit29-26: zero
 # bit31-30: 01
 
-DATA 0xFFD01404 0x36343000     # DDR Controller Control Low
+DATA 0xFFD01404 0x39543000     # DDR Controller Control Low
 # bit 3-0:  0 reserved
 # bit 4:    0=addr/cmd in smame cycle
 # bit 5:    0=clk is driven during self refresh, we don't care for APX
@@ -75,7 +61,7 @@ DATA 0xFFD01404 0x36343000    # DDR Controller Control Low
 # bit30-28: 3 required
 # bit31:    0=no additional STARTBURST delay
 
-DATA 0xFFD01408 0x2302544B     # DDR Timing (Low) (active cycles value +1)
+DATA 0xFFD01408 0x34136552     # DDR Timing (Low) (active cycles value +1)
 # bit3-0:   TRAS lsbs
 # bit7-4:   TRCD
 # bit11- 8: TRP
@@ -86,7 +72,7 @@ DATA 0xFFD01408 0x2302544B    # DDR Timing (Low) (active cycles value +1)
 # bit27-24: TRRD
 # bit31-28: TRTP
 
-DATA 0xFFD0140C 0x00000032     #  DDR Timing (High)
+DATA 0xFFD0140C 0x00000033     #  DDR Timing (High)
 # bit6-0:   TRFC
 # bit8-7:   TR2R
 # bit10-9:  TR2W
@@ -116,8 +102,8 @@ DATA 0xFFD01418 0x00000000  #  DDR Operation
 # bit3-0:   0x0, DDR cmd
 # bit31-4:  0 required
 
-DATA 0xFFD0141C 0x00000642     #  DDR Mode
-DATA 0xFFD01420 0x00000040     #  DDR Extended Mode
+DATA 0xFFD0141C 0x00000652     #  DDR Mode
+DATA 0xFFD01420 0x00000044     #  DDR Extended Mode
 # bit0:    0,  DDR DLL enabled
 # bit1:    0,  DDR drive strenght normal
 # bit2:    1,  DDR ODT control lsd disabled
@@ -140,6 +126,8 @@ DATA 0xFFD01424 0x0000F07F  #  DDR Controller Control High
 # bit11 :  0  , 1/4 clock cycle skew disabled for write mesh
 # bit15-12: 1111 required
 # bit31-16: 0    required
+DATA 0xFFD01428 0x00074510
+DATA 0xFFD0147c 0x00007451
 
 DATA 0xFFD01500 0x00000000     # CS[0]n Base address to 0x0
 DATA 0xFFD01504 0x07FFFFF1     # CS[0]n Size
@@ -153,7 +141,7 @@ DATA 0xFFD0150C 0x00000000  # CS[1]n Size, window disabled
 DATA 0xFFD01514 0x00000000     # CS[2]n Size, window disabled
 DATA 0xFFD0151C 0x00000000     # CS[3]n Size, window disabled
 
-DATA 0xFFD01494 0x00000000     #  DDR ODT Control (Low)
+DATA 0xFFD01494 0x00010001     #  DDR ODT Control (Low)
 # bit3-0:  0, ODT0Rd, MODT[0] asserted during read from DRAM CS0
 # bit19-16:0, ODT0Wr, MODT[0] asserted during write to DRAM CS0
 
@@ -162,7 +150,7 @@ DATA 0xFFD01498 0x00000000  #  DDR ODT Control (High)
 # bit3-2:  00, ODT1 controlled by register
 # bit31-4: zero, required
 
-DATA 0xFFD0149C 0x0000E90F     # CPU ODT Control
+DATA 0xFFD0149C 0x0000FC11     # CPU ODT Control
 # bit3-0:  F, ODT0Rd, Internal ODT asserted during read from DRAM bank0
 # bit7-4:  0, ODT0Wr, Internal ODT asserted during write to DRAM bank0
 # bit9-8:  1, ODTEn, never active