Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / board / w7o / init.S

diff --git a/board/w7o/init.S b/board/w7o/init.S
index 090b07a1e62e046ef46e375dedf6a8a5e7d76097..54eda3299f290a7a8bb9610961ecbd000451cb54 100644 (file)
--- a/board/w7o/init.S
+++ b/board/w7o/init.S
@@ -1,28 +1,8 @@
-/******************************************************************************
- *   This source code is dual-licensed.  You may use it under the terms of the
- *   GNU General Public License version 2, or under the license below.
- *
- *      This source code has been made available to you by IBM on an AS-IS
- *      basis.  Anyone receiving this source is licensed under IBM
- *      copyrights to use it in any way he or she deems fit, including
- *      copying it, modifying it, compiling it, and redistributing it either
- *      with or without modifications.  No license under IBM patents or
- *      patent applications is to be implied by the copyright license.
- *
- *      Any user of this software should understand that IBM cannot provide
- *      technical support for this software and will not be responsible for
- *      any consequences resulting from the use of this software.
- *
- *      Any person who transfers this source code or any derivative work
- *      must include the IBM copyright notice, this paragraph, and the
- *      preceding two paragraphs in the transferred software.
- *
- *      COPYRIGHT   I B M   CORPORATION 1995
- *      LICENSED MATERIAL  -  PROGRAM PROPERTY OF I B M
- *
- *****************************************************************************/
+/*
+ * SPDX-License-Identifier:    GPL-2.0 IBM-pibs
+ */
 #include <config.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 
 #define _LINUX_CONFIG_H 1      /* avoid reading Linux autoconf.h file  */
 
@@ -182,7 +162,7 @@ sdram_init:
         * Disable memory controller to allow
         * values to be changed.
         */
-       addi    r3, 0, mem_mcopt1
+       addi    r3, 0, SDRAM0_CFG
        mtdcr   SDRAM0_CFGADDR, r3
        addis   r4, 0, 0x0
        ori     r4, r4, 0x0
@@ -192,7 +172,7 @@ sdram_init:
         * Set MB0CF for ext bank 0. (0-4MB) Address Mode 5 since 11x8x2
         * All other banks are disabled.
         */
-       addi    r3, 0, mem_mb0cf
+       addi    r3, 0, SDRAM0_B0CR
        mtdcr   SDRAM0_CFGADDR, r3
        addis   r4, 0, 0x0000           /* BA=0x0, SZ=4MB */
        ori     r4, r4, 0x8001          /* Mode is 5, 11x8x2or4, BE=Enabled */
@@ -222,7 +202,7 @@ sdram_init:
        /*
         * Set up SDTR1
         */
-       addi    r3, 0, mem_sdtr1
+       addi    r3, 0, SDRAM0_TR
        mtdcr   SDRAM0_CFGADDR, r3
        addis   r4, 0, 0x0086           /* SDTR1 value for 100Mhz */
        ori     r4, r4, 0x400D
@@ -231,7 +211,7 @@ sdram_init:
        /*
         * Set RTR
         */
-       addi    r3, 0, mem_rtr
+       addi    r3, 0, SDRAM0_RTR
        mtdcr   SDRAM0_CFGADDR, r3
        addis   r4, 0, 0x05F0           /* RTR refresh val = 15.625ms@100Mhz */
        mtdcr   SDRAM0_CFGDATA, r4
@@ -250,7 +230,7 @@ sdram_init:
        /********************************************************************
         * Set memory controller options reg, MCOPT1.
         *******************************************************************/
-       addi    r3, 0, mem_mcopt1
+       addi    r3, 0, SDRAM0_CFG
        mtdcr   SDRAM0_CFGADDR, r3
        addis   r4, 0, 0x80E0           /* DC_EN=1,SRE=0,PME=0,MEMCHK=0 */
        ori     r4, r4, 0x0000          /* REGEN=0,DRW=00,BRPF=01,ECCDD=1 */