From: Fu Wei <fu.wei(a)linaro.org>
This patchset add xen_boot support into grup-mkconfig for
generating xen boot entrances automatically
Also update the docs/grub.texi for new xen_boot commands.
This patchset has been tested on Foudation model with a bug fix:
http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00205.html
ChangeLog:
v4: http://lists.gnu.org/archive/html/grub-devel/2016-05/
according to the XSM loading mechanism of Xen(upstreamed),
update the introduction of xen_module commands in docs/grub.texi
v3: http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00314.html
reorder the patches
update the introduction of xen_module commands in docs/grub.texi
v2: http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00282.html
add "--nounzip" option support in xen_module
use "feature_xen_boot" instead of "grub_xen_boot"
update the introduction of xen boot commands in docs/grub.texi
v1 :first upstream patchset:
http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00264.html
Fu Wei (4):
i386,xen: Add xen_hypervisor and xen_module aliases for i386
arm64: add "--nounzip" option support in xen_module command
* util/grub.d/20_linux_xen.in: Add xen_boot command support
arm64: update the introduction of xen boot commands in docs/grub.texi
docs/grub.texi | 33 ++++++++++-----------------------
grub-core/loader/arm64/xen_boot.c | 17 +++++++++++++++++
grub-core/loader/i386/xen.c | 7 +++++++
grub-core/normal/main.c | 2 +-
util/grub.d/20_linux_xen.in | 13 ++++++++++---
5 files changed, 45 insertions(+), 27 deletions(-)
--
2.5.5
From: Evan Lloyd <evan.lloyd(a)arm.com>
This patch set comprises a split version of the single patch previously
submitted under the title "Platforms/ARM: Juno: Acpi - update SPCR to
aslc." The split divides the change to aslC format from the update to
use PCDs.
Code is available at:
https://github.com/EvanLloyd/OpenPlatformPkg/tree/SPCR_v3
Original Commit message was:
Amend the Serial Port Console Redirection Table to enable (i.a.)
Microsoft Windows Emergency Management Services (EMS) over the
serial port.
This patch replaces the Spcr.asl file which described the SPCR table
in TDL format with Spcr.aslc which allows more flexibility by way of
permitting the use of PCDs. This means the serial port usage can be
modified at build.
Evan Lloyd (1):
Platforms/ARM/Juno: Use PCDs for SPCR info
Sami Mujawar (1):
Platforms/ARM/Juno: Acpi - update SPCR to aslc.
Platforms/ARM/Juno/ArmJuno.dsc | 1 +
Platforms/ARM/Juno/AcpiTables/AcpiTables.inf | 12 ++-
Platforms/ARM/Juno/AcpiTables/Spcr.asl | 73 ---------------
Platforms/ARM/Juno/AcpiTables/Spcr.aslc | 99 ++++++++++++++++++++
4 files changed, 110 insertions(+), 75 deletions(-)
delete mode 100644 Platforms/ARM/Juno/AcpiTables/Spcr.asl
create mode 100644 Platforms/ARM/Juno/AcpiTables/Spcr.aslc
--
Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")
From: Sami Mujawar <sami.mujawar(a)arm.com>
The generic PL011 driver has been updated to allow for UARTs on a board
having different clock sources (as is the case on Juno).
See "ArmPlatformPkg: Add support to configure PL011 UART clock"
This change modifies the Juno code to use the new driver options.
By replacing Pl011UartInteger with Pl011UartClKInHz, the driver can be
used with different serial ports. This replaces an erroneous calculated
value with a TRM defined clock rate.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Sami Mujawar <sami.mujawar(a)arm.com>
Signed-off-by: Evan Lloyd <evan.lloyd(a)arm.com>
---
Notes:
PL011_v2:
- Commit message updated to clarify [Ryan Harking]
PL011_v3:
- No code update, just adding a link for Leif [Leif Lindholm]
Code available at:
https://github.com/EvanLloyd/OpenPlatformPkg/tree/PL011_v3
Platforms/ARM/Juno/ArmJuno.dsc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Platforms/ARM/Juno/ArmJuno.dsc b/Platforms/ARM/Juno/ArmJuno.dsc
index 3626dfb6e5834f36d136214550ecfde7ed41e4e5..490e08eb9248a4c63ae4580a55037624be435d6c 100644
--- a/Platforms/ARM/Juno/ArmJuno.dsc
+++ b/Platforms/ARM/Juno/ArmJuno.dsc
@@ -122,8 +122,7 @@ [PcdsFixedAtBuild.common]
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x7FF80000
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|0
- gArmPlatformTokenSpaceGuid.PL011UartInteger|4
- gArmPlatformTokenSpaceGuid.PL011UartFractional|0
+ gArmPlatformTokenSpaceGuid.PL011UartClkInHz|7372800
gArmPlatformTokenSpaceGuid.PL011UartInterrupt|115
## PL031 RealTimeClock
--
Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")
From: Sami Mujawar <sami.mujawar(a)arm.com>
The wrong type name is used in the definition of the GTDT, causing the
header to have an incorrect size value.
EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE is changed to
EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLES to rectify this.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Sami Mujawar <sami.mujawar(a)arm.com>
Signed-off-by: Evan Lloyd <evan.lloyd(a)arm.com>
---
Notes:
GTDT_v3:
- No code update, resubmit with Link [Leif Lindholm]
Code available at:
https://github.com/EvanLloyd/OpenPlatformPkg/tree/GTDT_v3
Platforms/ARM/Juno/AcpiTables/Gtdt.aslc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Platforms/ARM/Juno/AcpiTables/Gtdt.aslc b/Platforms/ARM/Juno/AcpiTables/Gtdt.aslc
index c0e3f5fc11203ed4cc41dddf4aecb6dc600f38d0..1c258fcfe2489601a3fa55bbdddc5bff686b0c4a 100644
--- a/Platforms/ARM/Juno/AcpiTables/Gtdt.aslc
+++ b/Platforms/ARM/Juno/AcpiTables/Gtdt.aslc
@@ -1,7 +1,7 @@
/** @file
* Generic Timer Description Table (GTDT)
*
-* Copyright (c) 2012 - 2014, ARM Limited. All rights reserved.
+* Copyright (c) 2012 - 2016, ARM Limited. All rights reserved.
*
* This program and the accompanying materials
* are licensed and made available under the terms and conditions of the BSD License
@@ -70,7 +70,7 @@
{
ARM_ACPI_HEADER(
EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE,
- EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE,
+ EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLES,
EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
),
SYSTEM_TIMER_BASE_ADDRESS, // UINT64 PhysicalAddress
--
Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")
From: Alexei Fedorov <Alexei.Fedorov(a)arm.com>
#if ARM_JUNO_ACPI_5_0
causes the GCC error listed below
k:\edk2\OpenPlatformPkg\Platforms\ARM\Juno\AcpiTables\Fadt.aslc:76:22:
error: #if with no expression
when ARM_JUNO_ACPI_5_0 is defined in
edk2\ArmPlatformPkg\ArmJunoPkg\Include\ArmPlatform.h:
The problem occurs because the macro is defined but has no value.
The bug is corrected by replacing
#if ARM_JUNO_ACPI_5_0
with
#ifdef ARM_JUNO_ACPI_5_0
This usage is also consistent with that on line 20
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Alexei Fedorov <Alexei.Fedorov(a)arm.com>
Signed-off-by: Evan Lloyd <Evan.Lloyd(a)arm.com>
---
Platforms/ARM/Juno/AcpiTables/Fadt.aslc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Platforms/ARM/Juno/AcpiTables/Fadt.aslc b/Platforms/ARM/Juno/AcpiTables/Fadt.aslc
index eafdecb8aff74a1c5899fcf552d73fce1d0cad2b..6b756292bdd14de7585c9c792a42542b88eb865e 100644
--- a/Platforms/ARM/Juno/AcpiTables/Fadt.aslc
+++ b/Platforms/ARM/Juno/AcpiTables/Fadt.aslc
@@ -1,7 +1,7 @@
/** @file
* Fixed ACPI Description Table (FADT)
*
-* Copyright (c) 2012 - 2014, ARM Limited. All rights reserved.
+* Copyright (c) 2012 - 2016, ARM Limited. All rights reserved.
*
* This program and the accompanying materials
* are licensed and made available under the terms and conditions of the BSD License
@@ -72,7 +72,7 @@ EFI_ACPI_5_1_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
EFI_ACPI_5_0_HW_REDUCED_ACPI | EFI_ACPI_5_0_LOW_POWER_S0_IDLE_CAPABLE, // UINT32 Flags
NULL_GAS, // EFI_ACPI_5_0_GENERIC_ADDRESS_STRUCTURE ResetReg
0, // UINT8 ResetValue
-#if ARM_JUNO_ACPI_5_0
+#ifdef ARM_JUNO_ACPI_5_0
{EFI_ACPI_RESERVED_BYTE,EFI_ACPI_RESERVED_BYTE,EFI_ACPI_RESERVED_BYTE}, // UINT8 Reserved2[3]
#else
EFI_ACPI_5_1_ARM_PSCI_COMPLIANT, // UINT16 ArmBootArchFlags
--
Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")