summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Wojtas <mw@semihalf.com>2021-04-16 22:54:14 +0200
committerArd Biesheuvel <ardb@google.com>2021-04-19 09:49:37 +0200
commitf3fe738fe89d698f7b1de4bdaeafa3886015370c (patch)
tree91c7a4ae694eebccb9f03727cd1052df1c9459bd
parent1173b1d4a52047e5a9df13cda578fee2edbc2202 (diff)
Marvell/Cn9132Db: Enable ACPI support
Because of the limitation in a number of available intterrupts that can be mapped in a current version of the IcuLib, the ACPI support for Cn9132 variant remained disabled. Such hard limitation is not needed though and enable ACPI boot, however with a the interfaces present only on the first two CP115 HW blocks. Signed-off-by: Marcin Wojtas <mw@semihalf.com> Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
-rw-r--r--Platform/Marvell/Cn913xDb/Cn913xDbA.dsc2
-rw-r--r--Platform/Marvell/Cn913xDb/Cn913xDbA.fdf.inc6
2 files changed, 6 insertions, 2 deletions
diff --git a/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc b/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
index 67355f39..ff91d101 100644
--- a/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
+++ b/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
@@ -54,6 +54,8 @@
!ifndef $(CN9132)
[Components.AARCH64]
Silicon/Marvell/OcteonTx/AcpiTables/T91/$(PLATFORM_NAME).inf
+!else
+ Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn9131DbA.inf
!endif
[LibraryClasses.common]
diff --git a/Platform/Marvell/Cn913xDb/Cn913xDbA.fdf.inc b/Platform/Marvell/Cn913xDb/Cn913xDbA.fdf.inc
index 78bdb79b..c2fb71fa 100644
--- a/Platform/Marvell/Cn913xDb/Cn913xDbA.fdf.inc
+++ b/Platform/Marvell/Cn913xDb/Cn913xDbA.fdf.inc
@@ -12,9 +12,11 @@
# DTB
INF RuleOverride = DTB Silicon/Marvell/OcteonTx/DeviceTree/T91/$(PLATFORM_NAME).inf
-!ifndef $(CN9132)
-!if $(ARCH) == AARCH64
# ACPI support
+!if $(ARCH) == AARCH64
+!ifndef $(CN9132)
INF RuleOverride = ACPITABLE Silicon/Marvell/OcteonTx/AcpiTables/T91/$(PLATFORM_NAME).inf
+!else
+ INF RuleOverride = ACPITABLE Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn9131DbA.inf
!endif
!endif