diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-19 10:55:58 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-19 10:55:58 +0100 |
| commit | 1feb6e3c9216a34885f24f0df4a02a30dfb35f19 (patch) | |
| tree | a971d9d2fe6528910cf7acaf7632b747731c6caa /board | |
| parent | 529a8d05ff848e7bfd6049c99210557aa5e31d39 (diff) | |
| parent | e158665c1e4c4665302f0d95e26b7c7e6b70a83c (diff) | |
| download | talos-obmc-uboot-1feb6e3c9216a34885f24f0df4a02a30dfb35f19.tar.gz talos-obmc-uboot-1feb6e3c9216a34885f24f0df4a02a30dfb35f19.zip | |
Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'
Diffstat (limited to 'board')
| -rw-r--r-- | board/xilinx/zynq/Makefile | 1 | ||||
| -rw-r--r-- | board/xilinx/zynq/board.c | 10 | ||||
| -rw-r--r-- | board/xilinx/zynq/ps7_init.c | 12 |
3 files changed, 13 insertions, 10 deletions
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/board.c b/board/xilinx/zynq/board.c index 5a47149902..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; @@ -59,8 +53,6 @@ int board_init(void) } #endif - icache_enable(); - #ifdef CONFIG_FPGA fpga_init(); fpga_add(fpga_xilinx, &fpga); @@ -89,7 +81,6 @@ int board_late_init(void) return 0; } -#ifdef CONFIG_CMD_NET int board_eth_init(bd_t *bis) { u32 ret = 0; @@ -123,7 +114,6 @@ int board_eth_init(bd_t *bis) #endif return ret; } -#endif #ifdef CONFIG_CMD_MMC int board_mmc_init(bd_t *bd) 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 <common.h> +#include <asm/arch/spl.h> + +__weak void ps7_init(void) +{ + puts("Please copy ps7_init.c/h from hw project\n"); +} |
