diff --git a/arch/arm64/configs/davinci_defconfig b/arch/arm64/configs/davinci_defconfig
index 271d438054a89fbe733929064559a9285d6b3316..747d99218bab7e7e770a1510d9034620e928fd2e 100644
--- a/arch/arm64/configs/davinci_defconfig
+++ b/arch/arm64/configs/davinci_defconfig
@@ -4,7 +4,7 @@
 #
 
 #
-# Compiler: aarch64-linux-gnu-gcc 6.3.0
+# Compiler: aarch64-linux-gnu-gcc 7.3.0
 #
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=60300
@@ -286,7 +286,7 @@ CONFIG_PCI_DOMAINS_GENERIC=y
 CONFIG_PCI_SYSCALL=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# CONFIG_PCIEAER_INJECT is not set
+CONFIG_PCIEAER_INJECT=y
 # CONFIG_PCIE_ECRC is not set
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
@@ -520,6 +520,8 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_TEST is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
+CONFIG_UEFI_CPER=y
+CONFIG_UEFI_CPER_ARM=y
 
 #
 # Tegra firmware driver
@@ -546,12 +548,17 @@ CONFIG_ACPI_TABLE_UPGRADE=y
 # CONFIG_ACPI_DEBUG is not set
 # CONFIG_ACPI_PCI_SLOT is not set
 CONFIG_ACPI_CONTAINER=y
-# CONFIG_ACPI_HED is not set
+CONFIG_ACPI_HED=y
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_BGRT is not set
 CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
 CONFIG_HAVE_ACPI_APEI=y
-# CONFIG_ACPI_APEI is not set
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_SEA=y
+CONFIG_ACPI_APEI_EINJ=y
+# CONFIG_ACPI_APEI_ERST_DEBUG is not set
 # CONFIG_PMIC_OPREGION is not set
 # CONFIG_ACPI_CONFIGFS is not set
 CONFIG_ACPI_IORT=y