nand: Remove unused ppc4xx NAND driver and references

[oweals/u-boot.git] / board / xilinx / zynq / board.c

diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 2c86940957ec5d021e045d6a34be3c9f133f1a7a..fb8eab07d76820dbc5fcc77756205b919d538a7e 100644 (file)
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -1,5 +1,6 @@
 /*
  * (C) Copyright 2012 Michal Simek <monstr@monstr.eu>
+ * (C) Copyright 2013 - 2018 Xilinx, Inc.
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -11,6 +12,7 @@
 #include <zynqpl.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/arch/ps7_init_gpl.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -85,17 +87,23 @@ int board_init(void)
 int board_late_init(void)
 {
        switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) {
+       case ZYNQ_BM_QSPI:
+               env_set("modeboot", "qspiboot");
+               break;
+       case ZYNQ_BM_NAND:
+               env_set("modeboot", "nandboot");
+               break;
        case ZYNQ_BM_NOR:
-               setenv("modeboot", "norboot");
+               env_set("modeboot", "norboot");
                break;
        case ZYNQ_BM_SD:
-               setenv("modeboot", "sdboot");
+               env_set("modeboot", "sdboot");
                break;
        case ZYNQ_BM_JTAG:
-               setenv("modeboot", "jtagboot");
+               env_set("modeboot", "jtagboot");
                break;
        default:
-               setenv("modeboot", "");
+               env_set("modeboot", "");
                break;
        }
 
@@ -105,7 +113,15 @@ int board_late_init(void)
 #ifdef CONFIG_DISPLAY_BOARDINFO
 int checkboard(void)
 {
+       u32 version = zynq_get_silicon_version();
+
+       version <<= 1;
+       if (version > (PCW_SILICON_VERSION_3 << 1))
+               version += 1;
+
        puts("Board: Xilinx Zynq\n");
+       printf("Silicon: v%d.%d\n", version >> 1, version & 1);
+
        return 0;
 }
 #endif
@@ -124,121 +140,15 @@ int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)
 }
 
 #if !defined(CONFIG_SYS_SDRAM_BASE) && !defined(CONFIG_SYS_SDRAM_SIZE)
-/*
- * fdt_get_reg - Fill buffer by information from DT
- */
-static phys_size_t fdt_get_reg(const void *fdt, int nodeoffset, void *buf,
-                              const u32 *cell, int n)
+int dram_init_banksize(void)
 {
-       int i = 0, b, banks;
-       int parent_offset = fdt_parent_offset(fdt, nodeoffset);
-       int address_cells = fdt_address_cells(fdt, parent_offset);
-       int size_cells = fdt_size_cells(fdt, parent_offset);
-       char *p = buf;
-       u64 val;
-       u64 vals;
-
-       debug("%s: addr_cells=%x, size_cell=%x, buf=%p, cell=%p\n",
-             __func__, address_cells, size_cells, buf, cell);
-
-       /* Check memory bank setup */
-       banks = n % (address_cells + size_cells);
-       if (banks)
-               panic("Incorrect memory setup cells=%d, ac=%d, sc=%d\n",
-                     n, address_cells, size_cells);
-
-       banks = n / (address_cells + size_cells);
-
-       for (b = 0; b < banks; b++) {
-               debug("%s: Bank #%d:\n", __func__, b);
-               if (address_cells == 2) {
-                       val = cell[i + 1];
-                       val <<= 32;
-                       val |= cell[i];
-                       val = fdt64_to_cpu(val);
-                       debug("%s: addr64=%llx, ptr=%p, cell=%p\n",
-                             __func__, val, p, &cell[i]);
-                       *(phys_addr_t *)p = val;
-               } else {
-                       debug("%s: addr32=%x, ptr=%p\n",
-                             __func__, fdt32_to_cpu(cell[i]), p);
-                       *(phys_addr_t *)p = fdt32_to_cpu(cell[i]);
-               }
-               p += sizeof(phys_addr_t);
-               i += address_cells;
-
-               debug("%s: pa=%p, i=%x, size=%zu\n", __func__, p, i,
-                     sizeof(phys_addr_t));
-
-               if (size_cells == 2) {
-                       vals = cell[i + 1];
-                       vals <<= 32;
-                       vals |= cell[i];
-                       vals = fdt64_to_cpu(vals);
-
-                       debug("%s: size64=%llx, ptr=%p, cell=%p\n",
-                             __func__, vals, p, &cell[i]);
-                       *(phys_size_t *)p = vals;
-               } else {
-                       debug("%s: size32=%x, ptr=%p\n",
-                             __func__, fdt32_to_cpu(cell[i]), p);
-                       *(phys_size_t *)p = fdt32_to_cpu(cell[i]);
-               }
-               p += sizeof(phys_size_t);
-               i += size_cells;
-
-               debug("%s: ps=%p, i=%x, size=%zu\n",
-                     __func__, p, i, sizeof(phys_size_t));
-       }
-
-       /* Return the first address size */
-       return *(phys_size_t *)((char *)buf + sizeof(phys_addr_t));
-}
-
-#define FDT_REG_SIZE  sizeof(u32)
-/* Temp location for sharing data for storing */
-/* Up to 64-bit address + 64-bit size */
-static u8 tmp[CONFIG_NR_DRAM_BANKS * 16];
-
-void dram_init_banksize(void)
-{
-       int bank;
-
-       memcpy(&gd->bd->bi_dram[0], &tmp, sizeof(tmp));
-
-       for (bank = 0; bank < CONFIG_NR_DRAM_BANKS; bank++) {
-               debug("Bank #%d: start %llx\n", bank,
-                     (unsigned long long)gd->bd->bi_dram[bank].start);
-               debug("Bank #%d: size %llx\n", bank,
-                     (unsigned long long)gd->bd->bi_dram[bank].size);
-       }
+       return fdtdec_setup_memory_banksize();
 }
 
 int dram_init(void)
 {
-       int node, len;
-       const void *blob = gd->fdt_blob;
-       const u32 *cell;
-
-       memset(&tmp, 0, sizeof(tmp));
-
-       /* find or create "/memory" node. */
-       node = fdt_subnode_offset(blob, 0, "memory");
-       if (node < 0) {
-               printf("%s: Can't get memory node\n", __func__);
-               return node;
-       }
-
-       /* Get pointer to cells and lenght of it */
-       cell = fdt_getprop(blob, node, "reg", &len);
-       if (!cell) {
-               printf("%s: Can't get reg property\n", __func__);
-               return -1;
-       }
-
-       gd->ram_size = fdt_get_reg(blob, node, &tmp, cell, len / FDT_REG_SIZE);
-
-       debug("%s: Initial DRAM size %llx\n", __func__, (u64)gd->ram_size);
+       if (fdtdec_setup_memory_size() != 0)
+               return -EINVAL;
 
        zynq_ddrc_init();