projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 5cd9bbf711f7fcf3766ee9ce9efd2177924a2813..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 2012 Michal Simek <monstr@monstr.eu>
+ * (C) Copyright 2013 - 2018 Xilinx, Inc.
*
* SPDX-License-Identifier: GPL-2.0+
*/
*
* 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 <zynqpl.h>
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
+#include <asm/arch/ps7_init_gpl.h>
DECLARE_GLOBAL_DATA_PTR;
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) {
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:
case ZYNQ_BM_NOR:
-
setenv
("modeboot", "norboot");
+
env_set
("modeboot", "norboot");
break;
case ZYNQ_BM_SD:
break;
case ZYNQ_BM_SD:
-
setenv
("modeboot", "sdboot");
+
env_set
("modeboot", "sdboot");
break;
case ZYNQ_BM_JTAG:
break;
case ZYNQ_BM_JTAG:
-
setenv
("modeboot", "jtagboot");
+
env_set
("modeboot", "jtagboot");
break;
default:
break;
default:
-
setenv
("modeboot", "");
+
env_set
("modeboot", "");
break;
}
break;
}
@@
-105,7
+113,15
@@
int board_late_init(void)
#ifdef CONFIG_DISPLAY_BOARDINFO
int checkboard(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");
puts("Board: Xilinx Zynq\n");
+ printf("Silicon: v%d.%d\n", version >> 1, version & 1);
+
return 0;
}
#endif
return 0;
}
#endif
@@
-124,9
+140,9
@@
int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)
}
#if !defined(CONFIG_SYS_SDRAM_BASE) && !defined(CONFIG_SYS_SDRAM_SIZE)
}
#if !defined(CONFIG_SYS_SDRAM_BASE) && !defined(CONFIG_SYS_SDRAM_SIZE)
-
void
dram_init_banksize(void)
+
int
dram_init_banksize(void)
{
{
- fdtdec_setup_memory_banksize();
+
return
fdtdec_setup_memory_banksize();
}
int dram_init(void)
}
int dram_init(void)