diff --git a/hypervisor/common/efi_mmap.c b/hypervisor/common/efi_mmap.c
index bf30d0e70..015b8bdc2 100644
--- a/hypervisor/common/efi_mmap.c
+++ b/hypervisor/common/efi_mmap.c
@@ -11,7 +11,7 @@
 #include <logmsg.h>
 
 static uint16_t hv_memdesc_nr;
-static struct efi_memory_desc hv_memdesc[MAX_EFI_MMAP_ENTRIES];
+static struct efi_memory_desc hv_memdesc[CONFIG_MAX_EFI_MMAP_ENTRIES];
 
 static void sort_efi_mmap_entries(void)
 {
@@ -37,8 +37,8 @@ void init_efi_mmap_entries(struct efi_info *uefi_info)
 	uint32_t entry = 0U;
 
 	while ((void *)efi_memdesc < (efi_memmap + uefi_info->memmap_size)) {
-		if (entry >= MAX_EFI_MMAP_ENTRIES) {
-			pr_err("Too many efi memmap entries, entries up %d are ignored.", MAX_EFI_MMAP_ENTRIES);
+		if (entry >= CONFIG_MAX_EFI_MMAP_ENTRIES) {
+			pr_err("Too many efi memmap entries, entries up %d are ignored.", CONFIG_MAX_EFI_MMAP_ENTRIES);
 			break;
 		}
 
diff --git a/hypervisor/include/common/efi_mmap.h b/hypervisor/include/common/efi_mmap.h
index 615192bba..bb8a33afd 100644
--- a/hypervisor/include/common/efi_mmap.h
+++ b/hypervisor/include/common/efi_mmap.h
@@ -8,8 +8,6 @@
 #define EFI_MMAP_H
 #include <types.h>
 
-#define MAX_EFI_MMAP_ENTRIES		256U
-
 void init_efi_mmap_entries(struct efi_info *uefi_info);
 
 uint32_t get_efi_mmap_entries_count(void);
diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
index 93f0b6d7a..b5400e3a0 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
@@ -44,6 +44,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/cfl-k700-i7/industry.xml b/misc/config_tools/data/cfl-k700-i7/industry.xml
index badf8d5c5..ba6f01555 100644
--- a/misc/config_tools/data/cfl-k700-i7/industry.xml
+++ b/misc/config_tools/data/cfl-k700-i7/industry.xml
@@ -44,6 +44,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/ehl-crb-b/fusa_partition.xml b/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
index 37cb0828a..51372d96e 100644
--- a/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
+++ b/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
@@ -57,6 +57,7 @@
         </MEMORY>
         <CAPACITIES>
             <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+            <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
             <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
             <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid.xml b/misc/config_tools/data/ehl-crb-b/hybrid.xml
index a5706a42c..e9238b71a 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid.xml
@@ -57,6 +57,7 @@
         </MEMORY>
         <CAPACITIES>
             <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+            <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
             <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
             <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml b/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
index d7756af34..92d9ba804 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
@@ -60,6 +60,7 @@
         </MEMORY>
         <CAPACITIES>
             <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+            <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
             <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
             <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml b/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
index 6deb7bfeb..d8d871b4c 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
@@ -57,6 +57,7 @@
         </MEMORY>
         <CAPACITIES>
             <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+            <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
             <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
             <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/ehl-crb-b/industry.xml b/misc/config_tools/data/ehl-crb-b/industry.xml
index aa860ca35..fa67078ee 100644
--- a/misc/config_tools/data/ehl-crb-b/industry.xml
+++ b/misc/config_tools/data/ehl-crb-b/industry.xml
@@ -60,6 +60,7 @@
         </MEMORY>
         <CAPACITIES>
             <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+            <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
             <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
             <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/ehl-crb-b/logical_partition.xml b/misc/config_tools/data/ehl-crb-b/logical_partition.xml
index 4fb9ee765..d44ec8a62 100644
--- a/misc/config_tools/data/ehl-crb-b/logical_partition.xml
+++ b/misc/config_tools/data/ehl-crb-b/logical_partition.xml
@@ -57,6 +57,7 @@
         </MEMORY>
         <CAPACITIES>
             <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+            <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
             <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
             <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/ehl-crb-b/sdc.xml b/misc/config_tools/data/ehl-crb-b/sdc.xml
index 6376709ab..35309da50 100644
--- a/misc/config_tools/data/ehl-crb-b/sdc.xml
+++ b/misc/config_tools/data/ehl-crb-b/sdc.xml
@@ -57,6 +57,7 @@
         </MEMORY>
         <CAPACITIES>
             <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+            <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
             <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
             <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml
index 46f68fccb..2075a3d34 100644
--- a/misc/config_tools/data/generic_board/hybrid.xml
+++ b/misc/config_tools/data/generic_board/hybrid.xml
@@ -48,6 +48,7 @@
     </MEMORY>
     <CAPACITIES>
       <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+      <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
       <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
       <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
       <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/generic_board/industry.xml b/misc/config_tools/data/generic_board/industry.xml
index b56ce266f..70be97bc5 100644
--- a/misc/config_tools/data/generic_board/industry.xml
+++ b/misc/config_tools/data/generic_board/industry.xml
@@ -48,6 +48,7 @@
     </MEMORY>
     <CAPACITIES>
       <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+      <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
       <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
       <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
       <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/generic_board/logical_partition.xml b/misc/config_tools/data/generic_board/logical_partition.xml
index 33dd550b7..5a906e946 100644
--- a/misc/config_tools/data/generic_board/logical_partition.xml
+++ b/misc/config_tools/data/generic_board/logical_partition.xml
@@ -48,6 +48,7 @@
     </MEMORY>
     <CAPACITIES>
       <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+      <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
       <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
       <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
       <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml
index 9ce4384d8..dbfcbc7e6 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml
@@ -48,6 +48,7 @@
     </MEMORY>
     <CAPACITIES>
       <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+      <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
       <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
       <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
       <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/nuc11tnbi5/industry.xml b/misc/config_tools/data/nuc11tnbi5/industry.xml
index abbb482f5..a9a19588f 100644
--- a/misc/config_tools/data/nuc11tnbi5/industry.xml
+++ b/misc/config_tools/data/nuc11tnbi5/industry.xml
@@ -48,6 +48,7 @@
     </MEMORY>
     <CAPACITIES>
       <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+      <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
       <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
       <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
       <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/nuc11tnbi5/logical_partition.xml b/misc/config_tools/data/nuc11tnbi5/logical_partition.xml
index b6fe93563..740426b1f 100644
--- a/misc/config_tools/data/nuc11tnbi5/logical_partition.xml
+++ b/misc/config_tools/data/nuc11tnbi5/logical_partition.xml
@@ -48,6 +48,7 @@
     </MEMORY>
     <CAPACITIES>
       <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+      <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
       <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
       <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
       <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/nuc7i7dnb/hybrid.xml b/misc/config_tools/data/nuc7i7dnb/hybrid.xml
index adc210983..21f702e51 100644
--- a/misc/config_tools/data/nuc7i7dnb/hybrid.xml
+++ b/misc/config_tools/data/nuc7i7dnb/hybrid.xml
@@ -44,6 +44,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/nuc7i7dnb/industry.xml b/misc/config_tools/data/nuc7i7dnb/industry.xml
index 167184341..3b2ef668e 100644
--- a/misc/config_tools/data/nuc7i7dnb/industry.xml
+++ b/misc/config_tools/data/nuc7i7dnb/industry.xml
@@ -44,6 +44,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/nuc7i7dnb/logical_partition.xml b/misc/config_tools/data/nuc7i7dnb/logical_partition.xml
index 382d89fda..05649b878 100644
--- a/misc/config_tools/data/nuc7i7dnb/logical_partition.xml
+++ b/misc/config_tools/data/nuc7i7dnb/logical_partition.xml
@@ -44,6 +44,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/nuc7i7dnb/sdc.xml b/misc/config_tools/data/nuc7i7dnb/sdc.xml
index 5e141a89c..0dca190a9 100644
--- a/misc/config_tools/data/nuc7i7dnb/sdc.xml
+++ b/misc/config_tools/data/nuc7i7dnb/sdc.xml
@@ -44,6 +44,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/qemu/sdc.xml b/misc/config_tools/data/qemu/sdc.xml
index f686602e4..15a9afea6 100644
--- a/misc/config_tools/data/qemu/sdc.xml
+++ b/misc/config_tools/data/qemu/sdc.xml
@@ -44,6 +44,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/tgl-rvp/hybrid.xml b/misc/config_tools/data/tgl-rvp/hybrid.xml
index f0038e06c..425585c8d 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid.xml
@@ -52,6 +52,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>300</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/tgl-rvp/hybrid_rt.xml b/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
index e525277a2..ed629a556 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
@@ -55,6 +55,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>300</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/tgl-rvp/industry.xml b/misc/config_tools/data/tgl-rvp/industry.xml
index 9e08b64b5..a60776531 100644
--- a/misc/config_tools/data/tgl-rvp/industry.xml
+++ b/misc/config_tools/data/tgl-rvp/industry.xml
@@ -51,6 +51,7 @@
     </MEMORY>
     <CAPACITIES>
       <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+      <MAX_EFI_MMAP_ENTRIES>300</MAX_EFI_MMAP_ENTRIES>
       <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
       <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
       <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/tgl-rvp/logical_partition.xml b/misc/config_tools/data/tgl-rvp/logical_partition.xml
index 22d98e00a..a58222dee 100644
--- a/misc/config_tools/data/tgl-rvp/logical_partition.xml
+++ b/misc/config_tools/data/tgl-rvp/logical_partition.xml
@@ -52,6 +52,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>300</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/tgl-rvp/sdc.xml b/misc/config_tools/data/tgl-rvp/sdc.xml
index c9a2f977a..2db5df099 100644
--- a/misc/config_tools/data/tgl-rvp/sdc.xml
+++ b/misc/config_tools/data/tgl-rvp/sdc.xml
@@ -52,6 +52,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>300</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
index 6abdc2744..8a89f1c73 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
@@ -44,6 +44,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
index 662c3ac95..16f5bd895 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
@@ -44,6 +44,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/whl-ipc-i5/industry.xml b/misc/config_tools/data/whl-ipc-i5/industry.xml
index d57ce744f..0403f2055 100644
--- a/misc/config_tools/data/whl-ipc-i5/industry.xml
+++ b/misc/config_tools/data/whl-ipc-i5/industry.xml
@@ -44,6 +44,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/whl-ipc-i5/logical_partition.xml b/misc/config_tools/data/whl-ipc-i5/logical_partition.xml
index 98b0a2fc6..8f7333128 100644
--- a/misc/config_tools/data/whl-ipc-i5/logical_partition.xml
+++ b/misc/config_tools/data/whl-ipc-i5/logical_partition.xml
@@ -44,6 +44,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml
index 5b66f5c7b..1f7efa60e 100644
--- a/misc/config_tools/data/whl-ipc-i5/sdc.xml
+++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml
@@ -44,6 +44,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/whl-ipc-i7/hybrid.xml b/misc/config_tools/data/whl-ipc-i7/hybrid.xml
index 7296cb44b..057c590f6 100644
--- a/misc/config_tools/data/whl-ipc-i7/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i7/hybrid.xml
@@ -44,6 +44,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml
index 85fcb87d7..95efa3809 100644
--- a/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml
@@ -44,6 +44,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/whl-ipc-i7/industry.xml b/misc/config_tools/data/whl-ipc-i7/industry.xml
index 39eeebd89..22b7fb968 100644
--- a/misc/config_tools/data/whl-ipc-i7/industry.xml
+++ b/misc/config_tools/data/whl-ipc-i7/industry.xml
@@ -44,6 +44,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/whl-ipc-i7/logical_partition.xml b/misc/config_tools/data/whl-ipc-i7/logical_partition.xml
index bab5ea8c8..ee30d4897 100644
--- a/misc/config_tools/data/whl-ipc-i7/logical_partition.xml
+++ b/misc/config_tools/data/whl-ipc-i7/logical_partition.xml
@@ -44,6 +44,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/data/whl-ipc-i7/sdc.xml b/misc/config_tools/data/whl-ipc-i7/sdc.xml
index ca0d0620f..44bbc9fa7 100644
--- a/misc/config_tools/data/whl-ipc-i7/sdc.xml
+++ b/misc/config_tools/data/whl-ipc-i7/sdc.xml
@@ -48,6 +48,7 @@
 
     <CAPACITIES>
         <IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
+        <MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
         <MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
         <MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd
index 6e1699e41..367b5c92f 100644
--- a/misc/config_tools/schema/config.xsd
+++ b/misc/config_tools/schema/config.xsd
@@ -285,6 +285,11 @@ initialization.</xs:documentation>
         </xs:restriction>
       </xs:simpleType>
     </xs:element>
+    <xs:element name="MAX_EFI_MMAP_ENTRIES" type="xs:integer" default="256">
+      <xs:annotation>
+        <xs:documentation>The maximum number of EFI memmap entries.</xs:documentation>
+      </xs:annotation>
+    </xs:element>
     <xs:element name="MAX_PT_IRQ_ENTRIES" type="xs:integer" default="256">
       <xs:annotation>
         <xs:documentation>The pre-defined number of interrupt sources of all pass-through devices.</xs:documentation>
diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl
index 629e2c5ec..e4bb228d4 100644
--- a/misc/config_tools/xforms/config_common.xsl
+++ b/misc/config_tools/xforms/config_common.xsl
@@ -167,6 +167,10 @@
       <xsl:with-param name="key" select="'MAX_IOAPIC_NUM'" />
     </xsl:call-template>
 
+    <xsl:call-template name="integer-by-key">
+      <xsl:with-param name="key" select="'MAX_EFI_MMAP_ENTRIES'" />
+    </xsl:call-template>
+
     <xsl:call-template name="integer-by-key">
       <xsl:with-param name="key" select="'MAX_IR_ENTRIES'" />
     </xsl:call-template>