arm: Disable ATAGs support

[platform/kernel/u-boot.git] / board / st / stm32f746-disco / stm32f746-disco.c

diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c
index dc3a9dc..376bc06 100644 (file)
--- a/board/st/stm32f746-disco/stm32f746-disco.c
+++ b/board/st/stm32f746-disco/stm32f746-disco.c
@@ -1,96 +1,83 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * (C) Copyright 2016
- * Vikas Manocha, <vikas.manocha@st.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Copyright (C) 2016, STMicroelectronics - All Rights Reserved
+ * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics.
  */
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
+#include <lcd.h>
+#include <log.h>
+#include <miiphy.h>
+#include <phy_interface.h>
 #include <ram.h>
+#include <serial.h>
+#include <spl.h>
+#include <splash.h>
+#include <st_logo_data.h>
+#include <video.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
 #include <asm/arch/stm32.h>
 #include <asm/arch/gpio.h>
-#include <dm/platdata.h>
-#include <dm/platform_data/serial_stm32x7.h>
-#include <asm/arch/stm32_periph.h>
-#include <asm/arch/stm32_defs.h>
 #include <asm/arch/syscfg.h>
 #include <asm/gpio.h>
+#include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int get_memory_base_size(fdt_addr_t *mr_base, fdt_addr_t *mr_size)
-{
-       int mr_node;
-
-       mr_node = fdt_path_offset(gd->fdt_blob, "/memory");
-       if (mr_node < 0)
-               return mr_node;
-       *mr_base = fdtdec_get_addr_size_auto_noparent(gd->fdt_blob, mr_node,
-                                                     "reg", 0, mr_size, false);
-       debug("mr_base = %lx, mr_size= %lx\n", *mr_base, *mr_size);
-
-       return 0;
-}
 int dram_init(void)
 {
-       struct udevice *dev;
+#ifndef CONFIG_SUPPORT_SPL
        int rv;
-       fdt_addr_t mr_base, mr_size;
-
+       struct udevice *dev;
        rv = uclass_get_device(UCLASS_RAM, 0, &dev);
        if (rv) {
                debug("DRAM init failed: %d\n", rv);
                return rv;
        }
 
-       rv = get_memory_base_size(&mr_base, &mr_size);
-       if (rv)
-               return rv;
-       gd->ram_size = mr_size;
-       gd->ram_top = mr_base;
-
-       return rv;
+#endif
+       return fdtdec_setup_mem_size_base();
 }
 
 int dram_init_banksize(void)
 {
-       fdt_addr_t mr_base, mr_size;
-       get_memory_base_size(&mr_base, &mr_size);
-       /*
-        * Fill in global info with description of SRAM configuration
-        */
-       gd->bd->bi_dram[0].start = mr_base;
-       gd->bd->bi_dram[0].size  = mr_size;
-
-       return 0;
+       return fdtdec_setup_memory_banksize();
 }
 
-#ifdef CONFIG_ETH_DESIGNWARE
-static int stmmac_setup(void)
+#ifdef CONFIG_SPL_BUILD
+#ifdef CONFIG_SPL_OS_BOOT
+int spl_start_uboot(void)
 {
-       clock_setup(SYSCFG_CLOCK_CFG);
-       /* Set >RMII mode */
-       STM32_SYSCFG->pmc |= SYSCFG_PMC_MII_RMII_SEL;
-       clock_setup(STMMAC_CLOCK_CFG);
-
-       return 0;
+       debug("SPL: booting kernel\n");
+       /* break into full u-boot on 'c' */
+       return serial_tstc() && serial_getc() == 'c';
 }
+#endif
 
-int board_early_init_f(void)
+int spl_dram_init(void)
 {
-       stmmac_setup();
-
-       return 0;
+       struct udevice *dev;
+       int rv;
+       rv = uclass_get_device(UCLASS_RAM, 0, &dev);
+       if (rv)
+               debug("DRAM init failed: %d\n", rv);
+       return rv;
 }
-#endif
-
-u32 get_board_rev(void)
+void spl_board_init(void)
 {
-       return 0;
+       preloader_console_init();
+       spl_dram_init();
+       arch_cpu_init(); /* to configure mpu for sdram rw permissions */
 }
+u32 spl_boot_device(void)
+{
+       return BOOT_DEVICE_XIP;
+}
+#endif
 
 int board_late_init(void)
 {
@@ -101,7 +88,7 @@ int board_late_init(void)
        if (node < 0)
                return -1;
 
-       gpio_request_by_name_nodev(gd->fdt_blob, node, "led-gpio", 0, &gpio,
+       gpio_request_by_name_nodev(offset_to_ofnode(node), "led-gpio", 0, &gpio,
                                   GPIOD_IS_OUT);
 
        if (dm_gpio_is_valid(&gpio)) {
@@ -115,8 +102,8 @@ int board_late_init(void)
        if (node < 0)
                return -1;
 
-       gpio_request_by_name_nodev(gd->fdt_blob, node, "button-gpio", 0, &gpio,
-                                  GPIOD_IS_IN);
+       gpio_request_by_name_nodev(offset_to_ofnode(node), "button-gpio", 0,
+                                  &gpio, GPIOD_IS_IN);
 
        if (dm_gpio_is_valid(&gpio)) {
                if (dm_gpio_get_value(&gpio))
@@ -131,5 +118,33 @@ int board_late_init(void)
 int board_init(void)
 {
        gd->bd->bi_boot_params = gd->bd->bi_dram[0].start + 0x100;
+
+#ifdef CONFIG_ETH_DESIGNWARE
+       const char *phy_mode;
+       int node;
+
+       node = fdt_node_offset_by_compatible(gd->fdt_blob, 0, "st,stm32-dwmac");
+       if (node < 0)
+               return -1;
+
+       phy_mode = fdt_getprop(gd->fdt_blob, node, "phy-mode", NULL);
+
+       switch (phy_get_interface_by_name(phy_mode)) {
+       case PHY_INTERFACE_MODE_RMII:
+               STM32_SYSCFG->pmc |= SYSCFG_PMC_MII_RMII_SEL;
+               break;
+       case PHY_INTERFACE_MODE_MII:
+               STM32_SYSCFG->pmc &= ~SYSCFG_PMC_MII_RMII_SEL;
+               break;
+       default:
+               printf("PHY interface %s not supported !\n", phy_mode);
+       }
+#endif
+
+#if defined(CONFIG_CMD_BMP)
+       bmp_display((ulong)stmicroelectronics_uboot_logo_8bit_rle,
+                   BMP_ALIGN_CENTER, BMP_ALIGN_CENTER);
+#endif /* CONFIG_CMD_BMP */
+
        return 0;
 }