diff options
Diffstat (limited to 'board/xilinx')
-rw-r--r-- | board/xilinx/ml507/.gitignore | 1 | ||||
-rw-r--r-- | board/xilinx/ml507/Makefile | 2 | ||||
-rw-r--r-- | board/xilinx/ppc405-generic/.gitignore | 1 | ||||
-rw-r--r-- | board/xilinx/ppc440-generic/.gitignore | 1 | ||||
-rw-r--r-- | board/xilinx/zynq/board.c | 22 |
5 files changed, 22 insertions, 5 deletions
diff --git a/board/xilinx/ml507/.gitignore b/board/xilinx/ml507/.gitignore deleted file mode 100644 index f6418a0c50..0000000000 --- a/board/xilinx/ml507/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/config.tmp diff --git a/board/xilinx/ml507/Makefile b/board/xilinx/ml507/Makefile index 3c84651063..9a3809f3c0 100644 --- a/board/xilinx/ml507/Makefile +++ b/board/xilinx/ml507/Makefile @@ -8,4 +8,4 @@ obj-y += ml507.o -include $(SRCTREE)/board/xilinx/ppc440-generic/Makefile +include $(srctree)/board/xilinx/ppc440-generic/Makefile diff --git a/board/xilinx/ppc405-generic/.gitignore b/board/xilinx/ppc405-generic/.gitignore deleted file mode 100644 index b644f59941..0000000000 --- a/board/xilinx/ppc405-generic/.gitignore +++ /dev/null @@ -1 +0,0 @@ -config.tmp diff --git a/board/xilinx/ppc440-generic/.gitignore b/board/xilinx/ppc440-generic/.gitignore deleted file mode 100644 index f6418a0c50..0000000000 --- a/board/xilinx/ppc440-generic/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/config.tmp diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 82f2345c95..485a5e4a24 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <fdtdec.h> #include <netdev.h> #include <zynqpl.h> #include <asm/arch/hardware.h> @@ -134,8 +135,27 @@ int board_mmc_init(bd_t *bd) int dram_init(void) { +#ifdef CONFIG_OF_CONTROL + int node; + fdt_addr_t addr; + fdt_size_t size; + const void *blob = gd->fdt_blob; + + node = fdt_node_offset_by_prop_value(blob, -1, "device_type", + "memory", 7); + if (node == -FDT_ERR_NOTFOUND) { + debug("ZYNQ DRAM: Can't get memory node\n"); + return -1; + } + addr = fdtdec_get_addr_size(blob, node, "reg", &size); + if (addr == FDT_ADDR_T_NONE || size == 0) { + debug("ZYNQ DRAM: Can't get base address or size\n"); + return -1; + } + gd->ram_size = size; +#else gd->ram_size = CONFIG_SYS_SDRAM_SIZE; - +#endif zynq_ddrc_init(); return 0; |