diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2015-11-05 08:34:35 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2016-01-27 15:55:56 +0100 |
| commit | 0785dfd8a7b14cb2c99fc1271c865eb2170c620b (patch) | |
| tree | 257fe44ca352165c6c42463bde6dc2f875bb56fd /arch/arm/cpu/armv8/zynqmp/cpu.c | |
| parent | d041e3e15765c3e1977f125083bd7deebe83f40b (diff) | |
| download | blackbird-obmc-uboot-0785dfd8a7b14cb2c99fc1271c865eb2170c620b.tar.gz blackbird-obmc-uboot-0785dfd8a7b14cb2c99fc1271c865eb2170c620b.zip | |
ARM64: zynqmp: Use the same U-Boot version with/without ATF
Remove SECURE_IOU option which is not needed. U-Boot itself can detect
which EL level it is on and based on that use do platform setup.
It also simplify usage because one Kconfig entry is gone.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/arm/cpu/armv8/zynqmp/cpu.c')
| -rw-r--r-- | arch/arm/cpu/armv8/zynqmp/cpu.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv8/zynqmp/cpu.c b/arch/arm/cpu/armv8/zynqmp/cpu.c index f90cca36aa..45b49dc018 100644 --- a/arch/arm/cpu/armv8/zynqmp/cpu.c +++ b/arch/arm/cpu/armv8/zynqmp/cpu.c @@ -15,8 +15,22 @@ DECLARE_GLOBAL_DATA_PTR; +static unsigned int zynqmp_get_silicon_version_secure(void) +{ + u32 ver; + + ver = readl(&csu_base->version); + ver &= ZYNQMP_SILICON_VER_MASK; + ver >>= ZYNQMP_SILICON_VER_SHIFT; + + return ver; +} + unsigned int zynqmp_get_silicon_version(void) { + if (current_el() == 3) + return zynqmp_get_silicon_version_secure(); + gd->cpu_clk = get_tbclk(); switch (gd->cpu_clk) { |
