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

[oweals/u-boot.git] / board / m5271evb / m5271evb.c

diff --git a/board/m5271evb/m5271evb.c b/board/m5271evb/m5271evb.c
index d364bd612c987b958f8fcb3617c6bffb9a8fc548..9caad6325a5a3094be214045c973c87217eafb73 100644 (file)
--- a/board/m5271evb/m5271evb.c
+++ b/board/m5271evb/m5271evb.c
@@ -22,8 +22,7 @@
  */
 
 #include <common.h>
-#include <asm/m5271.h>
-#include <asm/immap_5271.h>
+#include <asm/immap.h>
 
 int checkboard (void) {
        puts ("Board: Freescale M5271EVB\n");
@@ -53,10 +52,9 @@ long int initdram (int board_type) {
         * Check to see if the SDRAM has already been initialized
         * by a run control tool
         */
-       if (!(mbar_readLong(MCF_SDRAMC_DACR0) & MCF_SDRAMC_DACRn_RE))
-       {
+       if (!(mbar_readLong(MCF_SDRAMC_DACR0) & MCF_SDRAMC_DACRn_RE)) {
                /* Initialize DRAM Control Register: DCR */
-               mbar_writeShort(MCF_SDRAMC_DCR, 
+               mbar_writeShort(MCF_SDRAMC_DCR,
                                MCF_SDRAMC_DCR_RTIM(0x01)
                                | MCF_SDRAMC_DCR_RC(0x30));
 
@@ -74,7 +72,7 @@ long int initdram (int board_type) {
                                | MCF_SDRAMC_DACRn_PS(0));
 
                /* Initialize DMR0 */
-               mbar_writeLong(MCF_SDRAMC_DMR0, 
+               mbar_writeLong(MCF_SDRAMC_DMR0,
                                MCF_SDRAMC_DMRn_BAM_16M
                                | MCF_SDRAMC_DMRn_V);