diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-28 11:31:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-28 11:31:21 -0400 |
| commit | 66d10c18bf2c34698362b6fe1891bcc6e8755243 (patch) | |
| tree | e645a386e4de9330d2d7793bc90631416caa8bea /board | |
| parent | 0a0db402d1c9c93a91e2e229eea2e3f547d6148b (diff) | |
| parent | 711e5e26b41457e658155e7c225c9ccfed0182ef (diff) | |
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'board')
| -rw-r--r-- | board/xilinx/zynq/Makefile | 2 | ||||
| -rw-r--r-- | board/xilinx/zynqmp/Kconfig | 15 | ||||
| -rw-r--r-- | board/xilinx/zynqmp/MAINTAINERS | 5 | ||||
| -rw-r--r-- | board/xilinx/zynqmp/zynqmp.c | 37 |
4 files changed, 41 insertions, 18 deletions
diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile index 20522fba50..fd5d6fe950 100644 --- a/board/xilinx/zynq/Makefile +++ b/board/xilinx/zynq/Makefile @@ -25,7 +25,7 @@ ifeq ($(init-objs),) ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) init-objs := ps7_init_gpl.o $(if $(CONFIG_SPL_BUILD),\ -$(warning Put custom ps7_init_gpl.c/h to board/xilinx/zynq/custome_hw_platform/)) +$(warning Put custom ps7_init_gpl.c/h to board/xilinx/zynq/custom_hw_platform/)) endif endif diff --git a/board/xilinx/zynqmp/Kconfig b/board/xilinx/zynqmp/Kconfig deleted file mode 100644 index b07932e805..0000000000 --- a/board/xilinx/zynqmp/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_XILINX_ZYNQMP - -config SYS_BOARD - default "zynqmp" - -config SYS_VENDOR - default "xilinx" - -config SYS_SOC - default "zynqmp" - -config SYS_CONFIG_NAME - default "xilinx_zynqmp" - -endif diff --git a/board/xilinx/zynqmp/MAINTAINERS b/board/xilinx/zynqmp/MAINTAINERS index da33340459..20ca6522e5 100644 --- a/board/xilinx/zynqmp/MAINTAINERS +++ b/board/xilinx/zynqmp/MAINTAINERS @@ -1,6 +1,7 @@ -XILINX_ZYNQMP BOARD +XILINX_ZYNQMP_EP BOARD M: Michal Simek <michal.simek@xilinx.com> S: Maintained F: board/xilinx/zynqmp/ F: include/configs/xilinx_zynqmp.h -F: configs/xilinx_zynqmp_defconfig +F: include/configs/xilinx_zynqmp_ep.h +F: configs/xilinx_zynqmp_ep_defconfig diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index f5ff64d988..0c9a814144 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -7,6 +7,8 @@ #include <common.h> #include <netdev.h> +#include <ahci.h> +#include <scsi.h> #include <asm/arch/hardware.h> #include <asm/arch/sys_proto.h> #include <asm/io.h> @@ -15,6 +17,8 @@ DECLARE_GLOBAL_DATA_PTR; int board_init(void) { + printf("EL Level:\tEL%d\n", current_el()); + return 0; } @@ -51,6 +55,39 @@ void reset_cpu(ulong addr) { } +#ifdef CONFIG_SCSI_AHCI_PLAT +void scsi_init(void) +{ + ahci_init((void __iomem *)ZYNQMP_SATA_BASEADDR); + scsi_scan(1); +} +#endif + +int board_eth_init(bd_t *bis) +{ + u32 ret = 0; + +#if defined(CONFIG_ZYNQ_GEM) +# if defined(CONFIG_ZYNQ_GEM0) + ret |= zynq_gem_initialize(bis, ZYNQ_GEM_BASEADDR0, + CONFIG_ZYNQ_GEM_PHY_ADDR0, 0); +# endif +# if defined(CONFIG_ZYNQ_GEM1) + ret |= zynq_gem_initialize(bis, ZYNQ_GEM_BASEADDR1, + CONFIG_ZYNQ_GEM_PHY_ADDR1, 0); +# endif +# if defined(CONFIG_ZYNQ_GEM2) + ret |= zynq_gem_initialize(bis, ZYNQ_GEM_BASEADDR2, + CONFIG_ZYNQ_GEM_PHY_ADDR2, 0); +# endif +# if defined(CONFIG_ZYNQ_GEM3) + ret |= zynq_gem_initialize(bis, ZYNQ_GEM_BASEADDR3, + CONFIG_ZYNQ_GEM_PHY_ADDR3, 0); +# endif +#endif + return ret; +} + #ifdef CONFIG_CMD_MMC int board_mmc_init(bd_t *bd) { |