Merge branch 'iu-boot/master' into 'u-boot-arm/master'

[u-boot] / board / logicpd / imx27lite / imx27lite.c

diff --git a/board/logicpd/imx27lite/imx27lite.c b/board/logicpd/imx27lite/imx27lite.c
index 63375d5da0cfa51d6623c2bd42776470b683d5f4..07b07a07f69529c7650b632e75c29b841303ad41 100644 (file)
--- a/board/logicpd/imx27lite/imx27lite.c
+++ b/board/logicpd/imx27lite/imx27lite.c
@@ -3,71 +3,75 @@
  * Copyright (C) 2008,2009 Eric Jarrige <jorasse@users.sourceforge.net>
  * Copyright (C) 2009 Ilya Yanok <yanok@emcraft.com>
  *
- * 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., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
+#include <asm/gpio.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int board_init (void)
+int board_init(void)
 {
-       struct gpio_regs *regs = (struct gpio_regs *)IMX_GPIO_BASE;
+#if defined(CONFIG_SYS_NAND_LARGEPAGE)
+       struct system_control_regs *sc_regs =
+               (struct system_control_regs *)IMX_SYSTEM_CTL_BASE;
+#endif
 
        gd->bd->bi_arch_number = MACH_TYPE_IMX27LITE;
        gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
 #ifdef CONFIG_MXC_UART
-       mx27_uart_init_pins();
+       mx27_uart1_init_pins();
 #endif
 #ifdef CONFIG_FEC_MXC
        mx27_fec_init_pins();
        imx_gpio_mode((GPIO_PORTC | GPIO_OUT | GPIO_PUEN | GPIO_GPIO | 31));
-       writel(readl(&regs->port[PORTC].dr) | (1 << 31),
-                               &regs->port[PORTC].dr);
+       gpio_set_value(GPIO_PORTC | 31, 1);
 #endif
 #ifdef CONFIG_MXC_MMC
+#if defined(CONFIG_MAGNESIUM)
+       mx27_sd1_init_pins();
+#else
        mx27_sd2_init_pins();
 #endif
+#endif
 
+#if defined(CONFIG_SYS_NAND_LARGEPAGE)
+       /*
+        * set in FMCR NF_FMS Bit(5) to 1
+        * (NAND Flash with 2 Kbyte page size)
+        */
+       writel(readl(&sc_regs->fmcr) | (1 << 5), &sc_regs->fmcr);
+#endif
        return 0;
 }
 
-int dram_init (void)
+int dram_init(void)
 {
+       /* dram_init must store complete ramsize in gd->ram_size */
+       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+                               PHYS_SDRAM_1_SIZE);
+       return 0;
+}
 
-#if CONFIG_NR_DRAM_BANKS > 0
-       gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-       gd->bd->bi_dram[0].size = get_ram_size((volatile void *)PHYS_SDRAM_1,
+void dram_init_banksize(void)
+{
+       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
                        PHYS_SDRAM_1_SIZE);
-#endif
 #if CONFIG_NR_DRAM_BANKS > 1
        gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
-       gd->bd->bi_dram[1].size = get_ram_size((volatile void *)PHYS_SDRAM_2,
+       gd->bd->bi_dram[1].size = get_ram_size((void *)PHYS_SDRAM_2,
                        PHYS_SDRAM_2_SIZE);
 #endif
-
-       return 0;
 }
 
 int checkboard(void)
 {
-       printf("LogicPD imx27lite\n");
+       puts("Board: ");
+       puts(CONFIG_BOARDNAME);
        return 0;
 }