Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ArmPlatformPkg/ArmJunoPkg: Update with Juno R1 device tree names 

Juno R1 support two configurations:
- A57x2
- A57x2-A53x4

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>




git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16941 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Olivier Martin 2015-02-26 11:03:41 +00:00 committed by oliviermartin
parent 6332ffb0af
commit 1ccc0fd73f
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ArmPlatformPkg/ArmJunoPkg/ArmJuno.dec
View File

@ -36,5 +36,6 @@
gArmJunoTokenSpaceGuid.PcdSynopsysUsbEhciBaseAddress|0x7FFC0000|UINT32|0x00000005 gArmJunoTokenSpaceGuid.PcdSynopsysUsbEhciBaseAddress|0x7FFC0000|UINT32|0x00000005
# Juno Device Trees are loaded from NOR Flash # Juno Device Trees are loaded from NOR Flash
gArmJunoTokenSpaceGuid.PcdR0FdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/juno_r0.dtb"|VOID*|0x00000006 gArmJunoTokenSpaceGuid.PcdJunoR0FdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/juno-r0.dtb"|VOID*|0x00000006
gArmJunoTokenSpaceGuid.PcdR1FdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/juno_r1.dtb"|VOID*|0x00000007 gArmJunoTokenSpaceGuid.PcdJunoR1A57x2FdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/juno-r1-ca57x2.dtb"|VOID*|0x00000007
gArmJunoTokenSpaceGuid.PcdJunoR1A57x2A53x4FdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/juno-r1-ca57x2_ca53x4.dtb"|VOID*|0x00000008

8
ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
View File

@ -97,17 +97,17 @@ ArmJunoEntryPoint (
switch (CpuType) { switch (CpuType) {
case ARM_CPU_TYPE_A53: case ARM_CPU_TYPE_A53:
if (CpuRev == ARM_CPU_REV (0, 0)) { if (CpuRev == ARM_CPU_REV (0, 0)) {
TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdR0FdtDevicePath); TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdJunoR0FdtDevicePath);
} else if (CpuRev == ARM_CPU_REV (0, 3)) { } else if (CpuRev == ARM_CPU_REV (0, 3)) {
TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdR1FdtDevicePath); TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdJunoR1A57x2FdtDevicePath);
} }
break; break;
case ARM_CPU_TYPE_A57: case ARM_CPU_TYPE_A57:
if (CpuRev == ARM_CPU_REV (0, 0)) { if (CpuRev == ARM_CPU_REV (0, 0)) {
TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdR0FdtDevicePath); TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdJunoR0FdtDevicePath);
} else if (CpuRev == ARM_CPU_REV (1, 1)) { } else if (CpuRev == ARM_CPU_REV (1, 1)) {
TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdR1FdtDevicePath); TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdJunoR1A57x2FdtDevicePath);
} }
} }

7
ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2013-2014, ARM Limited. All rights reserved. # Copyright (c) 2013-2015, ARM Limited. All rights reserved.
# #
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -69,8 +69,9 @@
gArmJunoTokenSpaceGuid.PcdSynopsysUsbEhciBaseAddress gArmJunoTokenSpaceGuid.PcdSynopsysUsbEhciBaseAddress
gArmJunoTokenSpaceGuid.PcdSynopsysUsbOhciBaseAddress gArmJunoTokenSpaceGuid.PcdSynopsysUsbOhciBaseAddress
gArmJunoTokenSpaceGuid.PcdR0FdtDevicePath gArmJunoTokenSpaceGuid.PcdJunoR0FdtDevicePath
gArmJunoTokenSpaceGuid.PcdR1FdtDevicePath gArmJunoTokenSpaceGuid.PcdJunoR1A57x2FdtDevicePath
gArmJunoTokenSpaceGuid.PcdJunoR1A57x2A53x4FdtDevicePath
[Pcd] [Pcd]
gEmbeddedTokenSpaceGuid.PcdFdtDevicePaths gEmbeddedTokenSpaceGuid.PcdFdtDevicePaths