From 32cccecd06871f990d69779440ca498f3ebb125f Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 3 Jan 2014 09:31:11 +0100 Subject: zynq: Do not explicitely enable icache icache is already enabled by default. Signed-off-by: Michal Simek --- board/xilinx/zynq/board.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'board/xilinx') diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 5a47149902..498d143e39 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -59,8 +59,6 @@ int board_init(void) } #endif - icache_enable(); - #ifdef CONFIG_FPGA fpga_init(); fpga_add(fpga_xilinx, &fpga); -- cgit From e66da8bbf45762a340371bf8aff730cb17454801 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 16 Jan 2014 09:19:02 +0100 Subject: zynq: Use board_eth_init if CMD_NET is not enabled board_eth_init can be also called in cases where CMD_NET is not enabled. Signed-off-by: Michal Simek --- board/xilinx/zynq/board.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'board/xilinx') diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 498d143e39..16d2d99cae 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -87,7 +87,6 @@ int board_late_init(void) return 0; } -#ifdef CONFIG_CMD_NET int board_eth_init(bd_t *bis) { u32 ret = 0; @@ -121,7 +120,6 @@ int board_eth_init(bd_t *bis) #endif return ret; } -#endif #ifdef CONFIG_CMD_MMC int board_mmc_init(bd_t *bd) -- cgit From 627981213ad1693591a03614d35ccdc060aa5935 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 16 Jan 2014 09:18:21 +0100 Subject: zynq: Move bootmode to headers These numbers will be reused by SPL. Signed-off-by: Michal Simek --- board/xilinx/zynq/board.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'board/xilinx') diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 16d2d99cae..82f2345c95 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -12,12 +12,6 @@ DECLARE_GLOBAL_DATA_PTR; -/* Bootmode setting values */ -#define ZYNQ_BM_MASK 0x0F -#define ZYNQ_BM_NOR 0x02 -#define ZYNQ_BM_SD 0x05 -#define ZYNQ_BM_JTAG 0x0 - #ifdef CONFIG_FPGA Xilinx_desc fpga; -- cgit From d7e269cfbdd5fe0bbc0961bcf89845484bf28de7 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 14 Jan 2014 14:21:52 +0100 Subject: zynq: Add support for U-BOOT SPL SPL is using ps7_init.c/h files which are generated from design tools which have to be copied to boards/xilinx/zynq folder before compilation. BSS section is moved to SDRAM because fat support requires more space than SRAM size. Added: - MMC and QSPI support - Boot OS directly from SPL - Enable SPL command Signed-off-by: Michal Simek Reviewed-by: Tom Rini --- board/xilinx/zynq/Makefile | 1 + board/xilinx/zynq/ps7_init.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 board/xilinx/zynq/ps7_init.c (limited to 'board/xilinx') diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile index 6301a8c149..3f19a1cd8b 100644 --- a/board/xilinx/zynq/Makefile +++ b/board/xilinx/zynq/Makefile @@ -6,3 +6,4 @@ # obj-y := board.o +obj-$(CONFIG_SPL_BUILD) += ps7_init.o diff --git a/board/xilinx/zynq/ps7_init.c b/board/xilinx/zynq/ps7_init.c new file mode 100644 index 0000000000..c47da09b9e --- /dev/null +++ b/board/xilinx/zynq/ps7_init.c @@ -0,0 +1,12 @@ +/* + * (C) Copyright 2014 Xilinx, Inc. Michal Simek + * + * SPDX-License-Identifier: GPL-2.0+ + */ +#include +#include + +__weak void ps7_init(void) +{ + puts("Please copy ps7_init.c/h from hw project\n"); +} -- cgit