diff options
author | Tom Rini <trini@konsulko.com> | 2018-11-06 08:23:32 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-11-06 08:23:32 -0500 |
commit | 8f78e70012c7ea7eac85d5980bc23e6cb162b8b4 (patch) | |
tree | 3fc99fb88b4659437b60f407b29b15baff751979 | |
parent | 5ef76e59c12c79d106ebda70b710468aa6bd8b75 (diff) | |
parent | 24109bba6a4f81774e384c15c2e8a4d47791455f (diff) | |
download | u-boot-8f78e70012c7ea7eac85d5980bc23e6cb162b8b4.tar.gz |
Merge git://git.denx.de/u-boot-x86
-rw-r--r-- | arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/arch-quark/acpi/global_nvs.asl | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl b/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl index 9b8d1895ee..aaf87f4735 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl @@ -8,7 +8,6 @@ OperationRegion(GNVS, SystemMemory, ACPI_GNVS_ADDR, ACPI_GNVS_SIZE) Field(GNVS, ByteAcc, NoLock, Preserve) { - Offset (0x00), PCNT, 8, /* processor count */ IURE, 8, /* internal UART enabled */ } diff --git a/arch/x86/include/asm/arch-quark/acpi/global_nvs.asl b/arch/x86/include/asm/arch-quark/acpi/global_nvs.asl index 44b9f12c7c..61602173f8 100644 --- a/arch/x86/include/asm/arch-quark/acpi/global_nvs.asl +++ b/arch/x86/include/asm/arch-quark/acpi/global_nvs.asl @@ -8,6 +8,5 @@ OperationRegion(GNVS, SystemMemory, ACPI_GNVS_ADDR, ACPI_GNVS_SIZE) Field(GNVS, ByteAcc, NoLock, Preserve) { - Offset (0x00), PCNT, 8, /* processor count */ } diff --git a/arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl b/arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl index a6296c2cb6..895b807e96 100644 --- a/arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl +++ b/arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl @@ -10,6 +10,5 @@ OperationRegion(GNVS, SystemMemory, ACPI_GNVS_ADDR, ACPI_GNVS_SIZE) Field(GNVS, ByteAcc, NoLock, Preserve) { - Offset (0x00), PCNT, 8, /* processor count */ } |