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

[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 52c1900..fc4c60c 100644 (file)
--- a/board/st/stm32f746-disco/stm32f746-disco.c
+++ b/board/st/stm32f746-disco/stm32f746-disco.c
@@ -8,11 +8,12 @@
 #include <common.h>
 #include <dm.h>
 #include <ram.h>
+#include <spl.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
 #include <asm/arch/stm32.h>
 #include <asm/arch/gpio.h>
-#include <dm/platdata.h>
+#include <asm/arch/fmc.h>
 #include <dm/platform_data/serial_stm32x7.h>
 #include <asm/arch/stm32_periph.h>
 #include <asm/arch/stm32_defs.h>
@@ -21,32 +22,53 @@
 
 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;
-       struct ram_info ram;
        int rv;
+       fdt_addr_t mr_base, mr_size;
 
+#ifndef CONFIG_SUPPORT_SPL
+       struct udevice *dev;
        rv = uclass_get_device(UCLASS_RAM, 0, &dev);
        if (rv) {
                debug("DRAM init failed: %d\n", rv);
                return rv;
        }
-       rv = ram_get_info(dev, &ram);
-       if (rv) {
-               debug("Cannot get DRAM size: %d\n", rv);
+
+#endif
+       rv = get_memory_base_size(&mr_base, &mr_size);
+       if (rv)
                return rv;
-       }
-       debug("SDRAM base=%lx, size=%x\n", ram.base, ram.size);
-       gd->ram_size = ram.size;
+       gd->ram_size = mr_size;
+       gd->ram_top = mr_base;
+
+       return rv;
+}
 
+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 = CONFIG_SYS_RAM_BASE;
-       gd->bd->bi_dram[0].size  = ram.size;
+       gd->bd->bi_dram[0].start = mr_base;
+       gd->bd->bi_dram[0].size  = mr_size;
 
-       return rv;
+       return 0;
 }
 
 #ifdef CONFIG_ETH_DESIGNWARE
@@ -68,6 +90,37 @@ int board_early_init_f(void)
 }
 #endif
 
+#ifdef CONFIG_SPL_BUILD
+#ifdef CONFIG_SPL_OS_BOOT
+int spl_start_uboot(void)
+{
+       debug("SPL: booting kernel\n");
+       /* break into full u-boot on 'c' */
+       return serial_tstc() && serial_getc() == 'c';
+}
+#endif
+
+int spl_dram_init(void)
+{
+       struct udevice *dev;
+       int rv;
+       rv = uclass_get_device(UCLASS_RAM, 0, &dev);
+       if (rv)
+               debug("DRAM init failed: %d\n", rv);
+       return rv;
+}
+void spl_board_init(void)
+{
+       spl_dram_init();
+       preloader_console_init();
+       arch_cpu_init(); /* to configure mpu for sdram rw permissions */
+}
+u32 spl_boot_device(void)
+{
+       return BOOT_DEVICE_XIP;
+}
+
+#endif
 u32 get_board_rev(void)
 {
        return 0;
@@ -82,7 +135,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)) {
@@ -96,8 +149,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))
@@ -111,7 +164,6 @@ int board_late_init(void)
 
 int board_init(void)
 {
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
+       gd->bd->bi_boot_params = gd->bd->bi_dram[0].start + 0x100;
        return 0;
 }