diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index ca5fecf51..3ff9bc821 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -231,7 +231,6 @@ INCLUDE_PATH += bsp/include/uefi
 C_SRCS += bsp/uefi/uefi.c
 C_SRCS += bsp/uefi/cmdline.c
 C_SRCS += boot/uefi/uefi_boot.c
-TEMPLATE_ACPI_INFO_HEADER := bsp/include/uefi/platform_acpi_info.h
 else
 ifeq ($(CONFIG_PLATFORM_SBL),y)
 C_SRCS += bsp/sbl/sbl.c
@@ -239,7 +238,6 @@ C_SRCS += bsp/sbl/const_dmar.c
 C_SRCS += boot/sbl/multiboot.c
 C_SRCS += boot/sbl/sbl_seed_parse.c
 C_SRCS += boot/sbl/abl_seed_parse.c
-TEMPLATE_ACPI_INFO_HEADER := bsp/include/sbl/platform_acpi_info.h
 endif
 endif
 
@@ -266,7 +264,9 @@ DISTCLEAN_OBJS := $(shell find $(BASEDIR) -name '*.o')
 VERSION := $(HV_OBJDIR)/include/version.h
 
 # Create platform_acpi_info.h
-SOURCE_ACPI_INFO_HEADER := bsp/include/$(CONFIG_BOARD)_acpi_info.h
+TEMPLATE_ACPI_INFO_HEADER := arch/x86/configs/platform_acpi_info.h
+BOARDTEMPLATE_ACPI_INFO_HEADER := arch/x86/configs/$(CONFIG_BOARD)/platform_acpi_info.h
+SOURCE_ACPI_INFO_HEADER := arch/x86/configs/$(CONFIG_BOARD)/$(CONFIG_BOARD)_acpi_info.h
 TARGET_ACPI_INFO_HEADER := $(HV_OBJDIR)/include/platform_acpi_info.h
 
 $(TARGET_ACPI_INFO_HEADER): $(HV_OBJDIR)/$(HV_CONFIG)
@@ -282,11 +282,16 @@ ifdef CONFIG_ENFORCE_VALIDATED_ACPI_INFO
 	 echo "If you want to build the hypervisor with the template ACPI info," && \
 	 echo "unset ENFORCE_VALIDATED_ACPI_INFO using 'make menuconfig'." && \
 	 false
-else
+else ifeq (,$(wildcard $(BOARDTEMPLATE_ACPI_INFO_HEADER)))
 	@echo "" && \
 	 echo "Using the template at $(TEMPLATE_ACPI_INFO_HEADER) instead" && \
 	 echo "**********************************"
 	@cp $(TEMPLATE_ACPI_INFO_HEADER) $(TARGET_ACPI_INFO_HEADER)
+else
+	@echo "" && \
+	 echo "Using the template at $(BOARDTEMPLATE_ACPI_INFO_HEADER) instead" && \
+	 echo "**********************************"
+	@cp $(BOARDTEMPLATE_ACPI_INFO_HEADER) $(TARGET_ACPI_INFO_HEADER)
 endif
 else
 	@cp $(SOURCE_ACPI_INFO_HEADER) $(TARGET_ACPI_INFO_HEADER)
diff --git a/hypervisor/bsp/include/sbl/platform_acpi_info.h b/hypervisor/arch/x86/configs/apl-mrb/platform_acpi_info.h
similarity index 91%
rename from hypervisor/bsp/include/sbl/platform_acpi_info.h
rename to hypervisor/arch/x86/configs/apl-mrb/platform_acpi_info.h
index 9a73dc640..0e5c09f7b 100644
--- a/hypervisor/bsp/include/sbl/platform_acpi_info.h
+++ b/hypervisor/arch/x86/configs/apl-mrb/platform_acpi_info.h
@@ -4,8 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-/* This is a template header file for platform ACPI info definition,
- * we should use a user space tool running on target to generate this file.
+/* This is a template header file for apl-mrb platform ACPI info definition,
+ * we should use a user space tool running on target to generate apl-mrb
+ * specific acpi info file named as apl-mrb_acpi_info.h
+ * and put it in hypervisor/arch/x86/configs/apl-mrb/.
  */
 #ifndef PLATFORM_ACPI_INFO_H
 #define PLATFORM_ACPI_INFO_H
diff --git a/hypervisor/arch/x86/configs/platform_acpi_info.h b/hypervisor/arch/x86/configs/platform_acpi_info.h
new file mode 100644
index 000000000..619959dea
--- /dev/null
+++ b/hypervisor/arch/x86/configs/platform_acpi_info.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/* This is a template header file for platform ACPI info definition,
+ * we should use a user space tool running on target to generate
+ * board specific acpi info file named as $(CONFIG_BOARD)_acpi_info.h
+ * and put it in hypervisor/arch/x86/configs/$(CONFIG_BOARD)/.
+ */
+#ifndef PLATFORM_ACPI_INFO_H
+#define PLATFORM_ACPI_INFO_H
+
+/* pm sstate data */
+#define PM1A_EVT_ACCESS_SIZE	0U
+#define PM1A_EVT_ADDRESS	0UL
+#define PM1A_CNT_ADDRESS	0UL
+
+#define WAKE_VECTOR_32		0UL
+#define WAKE_VECTOR_64		0UL
+
+/* DRHD of DMAR */
+#define DRHD_COUNT		0U
+
+#define DRHD0_DEV_CNT		0U
+#define DRHD0_SEGMENT		0U
+#define DRHD0_FLAGS		0U
+#define DRHD0_REG_BASE		0UL
+#define DRHD0_IGNORE		false
+#define DRHD0_DEVSCOPE0_BUS	0U
+#define DRHD0_DEVSCOPE0_PATH	0U
+#define DRHD0_DEVSCOPE1_BUS	0U
+#define DRHD0_DEVSCOPE1_PATH	0U
+#define DRHD0_DEVSCOPE2_BUS	0U
+#define DRHD0_DEVSCOPE2_PATH	0U
+#define DRHD0_DEVSCOPE3_BUS	0U
+#define DRHD0_DEVSCOPE3_PATH	0U
+
+#define DRHD1_DEV_CNT		0U
+#define DRHD1_SEGMENT		0U
+#define DRHD1_FLAGS		0U
+#define DRHD1_REG_BASE		0UL
+#define DRHD1_IGNORE		false
+#define DRHD1_DEVSCOPE0_BUS	0U
+#define DRHD1_DEVSCOPE0_PATH	0U
+#define DRHD1_DEVSCOPE1_BUS	0U
+#define DRHD1_DEVSCOPE1_PATH	0U
+#define DRHD1_DEVSCOPE2_BUS	0U
+#define DRHD1_DEVSCOPE2_PATH	0U
+#define DRHD1_DEVSCOPE3_BUS	0U
+#define DRHD1_DEVSCOPE3_PATH	0U
+#define DRHD1_IOAPIC_ID		0U
+
+#define DRHD2_DEV_CNT		0U
+#define DRHD2_SEGMENT		0U
+#define DRHD2_FLAGS		0U
+#define DRHD2_REG_BASE		0U
+#define DRHD2_IGNORE		false
+#define DRHD2_DEVSCOPE0_BUS	0U
+#define DRHD2_DEVSCOPE0_PATH	0U
+#define DRHD2_DEVSCOPE1_BUS	0U
+#define DRHD2_DEVSCOPE1_PATH	0U
+#define DRHD2_DEVSCOPE2_BUS	0U
+#define DRHD2_DEVSCOPE2_PATH	0U
+#define DRHD2_DEVSCOPE3_BUS	0U
+#define DRHD2_DEVSCOPE3_PATH	0U
+
+#define DRHD3_DEV_CNT		0U
+#define DRHD3_SEGMENT		0U
+#define DRHD3_FLAGS		0U
+#define DRHD3_REG_BASE		0U
+#define DRHD3_IGNORE		false
+#define DRHD3_DEVSCOPE0_BUS	0U
+#define DRHD3_DEVSCOPE0_PATH	0U
+#define DRHD3_DEVSCOPE1_BUS	0U
+#define DRHD3_DEVSCOPE1_PATH	0U
+#define DRHD3_DEVSCOPE2_BUS	0U
+#define DRHD3_DEVSCOPE2_PATH	0U
+#define DRHD3_DEVSCOPE3_BUS	0U
+#define DRHD3_DEVSCOPE3_PATH	0U
+
+#endif	/* PLATFORM_ACPI_INFO_H */
diff --git a/hypervisor/arch/x86/guest/pm.c b/hypervisor/arch/x86/guest/pm.c
index d3f4367db..9a0c30959 100644
--- a/hypervisor/arch/x86/guest/pm.c
+++ b/hypervisor/arch/x86/guest/pm.c
@@ -9,6 +9,7 @@
 #include <vm.h>
 #include <io.h>
 #include <logmsg.h>
+#include <platform_acpi_info.h>
 
 int32_t validate_pstate(const struct acrn_vm *vm, uint64_t perf_ctl)
 {
diff --git a/hypervisor/bsp/include/bsp_extern.h b/hypervisor/bsp/include/bsp_extern.h
index 674ec97a2..79235e533 100644
--- a/hypervisor/bsp/include/bsp_extern.h
+++ b/hypervisor/bsp/include/bsp_extern.h
@@ -18,9 +18,6 @@
 #ifndef BSP_EXTERN_H
 #define BSP_EXTERN_H
 
-#include "default_acpi_info.h"
-#include "platform_acpi_info.h"
-
 /* BSP Interfaces */
 void init_bsp(void);
 uint64_t bsp_get_ap_trampoline(void);
diff --git a/hypervisor/bsp/include/uefi/platform_acpi_info.h b/hypervisor/bsp/include/uefi/platform_acpi_info.h
deleted file mode 100644
index 2e5baed8d..000000000
--- a/hypervisor/bsp/include/uefi/platform_acpi_info.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-/* This is a template header file for platform ACPI info definition,
- * we should use a user space tool running on target to generate this file.
- */
-#ifndef PLATFORM_ACPI_INFO_H
-#define PLATFORM_ACPI_INFO_H
-
-/* pm sstate data */
-#define PM1A_EVT_ACCESS_SIZE	0U
-#define PM1A_EVT_ADDRESS	0UL
-#define PM1A_CNT_ADDRESS	0UL
-
-#define WAKE_VECTOR_32		0UL
-#define WAKE_VECTOR_64		0UL
-
-#endif	/* PLATFORM_ACPI_INFO_H */
diff --git a/hypervisor/bsp/sbl/const_dmar.c b/hypervisor/bsp/sbl/const_dmar.c
index 392152fee..fd8259608 100644
--- a/hypervisor/bsp/sbl/const_dmar.c
+++ b/hypervisor/bsp/sbl/const_dmar.c
@@ -6,6 +6,7 @@
 
 #include <hypervisor.h>
 #include <vtd.h>
+#include <platform_acpi_info.h>
 
 #ifndef CONFIG_DMAR_PARSE_ENABLED
 
diff --git a/hypervisor/bsp/include/default_acpi_info.h b/hypervisor/include/arch/x86/default_acpi_info.h
similarity index 100%
rename from hypervisor/bsp/include/default_acpi_info.h
rename to hypervisor/include/arch/x86/default_acpi_info.h