6 files changed, 0 insertions, 22 deletions

diff --git a/src/soc/intel/fsp_baytrail/baytrail/smm.h b/src/soc/intel/fsp_baytrail/baytrail/smm.h
index 0dfb488d74..c929572dbc 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/smm.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/smm.h
@@ -22,10 +22,6 @@
  * clobbered by the arch/x86/Kconfig if they have the same name. */
 static inline int smm_region_size(void)
 {
-#ifndef CONFIG_SMM_TSEG_SIZE
-#error CONFIG_SMM_TSEG_SIZE must be set.
-#endif
-
 	/* Make it 8MiB by default. */
 	if (CONFIG_SMM_TSEG_SIZE == 0)
 		return (8 << 20);
diff --git a/src/soc/intel/fsp_baytrail/cpu.c b/src/soc/intel/fsp_baytrail/cpu.c
index 2f6defc3e6..5f9fc4b8e6 100644
--- a/src/soc/intel/fsp_baytrail/cpu.c
+++ b/src/soc/intel/fsp_baytrail/cpu.c
@@ -147,9 +147,6 @@ static void adjust_apic_id_map(struct smm_loader_params *smm_params)
 
 static void asmlinkage cpu_smm_do_relocation(void *arg)
 {
-#ifndef CONFIG_MAX_CPUS
-#error CONFIG_MAX_CPUS must be set.
-#endif
 	msr_t smrr;
 	em64t100_smm_state_save_area_t *smm_state;
         const struct smm_module_params *p;
@@ -204,9 +201,6 @@ static int install_relocation_handler(int num_cpus)
 
 static int install_permanent_handler(int num_cpus)
 {
-#ifndef CONFIG_SMM_RESERVED_SIZE
-#error CONFIG_SMM_RESERVED_SIZE must be set.
-#endif
 	/* There are num_cpus concurrent stacks and num_cpus concurrent save
 	 * state areas. Lastly, set the stack size to the save state size. */
 	int save_state_size = sizeof(em64t100_smm_state_save_area_t);
diff --git a/src/soc/intel/fsp_baytrail/iosf.c b/src/soc/intel/fsp_baytrail/iosf.c
index 078e5dddce..334e2dcfd1 100644
--- a/src/soc/intel/fsp_baytrail/iosf.c
+++ b/src/soc/intel/fsp_baytrail/iosf.c
@@ -18,9 +18,6 @@
 #include <baytrail/iosf.h>
 
 #if !defined(__PRE_RAM__)
-#ifndef CONFIG_MMCONF_BASE_ADDRESS
-#error CONFIG_MMCONF_BASE_ADDRESS must be set.
-#endif
 #define IOSF_PCI_BASE (CONFIG_MMCONF_BASE_ADDRESS + (IOSF_PCI_DEV << 12))
 
 static inline void write_iosf_reg(int reg, uint32_t value)
diff --git a/src/soc/intel/fsp_baytrail/nvm.c b/src/soc/intel/fsp_baytrail/nvm.c
index 9c1c381676..896e9b0058 100644
--- a/src/soc/intel/fsp_baytrail/nvm.c
+++ b/src/soc/intel/fsp_baytrail/nvm.c
@@ -46,9 +46,6 @@ static int nvm_init(void)
 /* Convert memory mapped pointer to flash offset. */
 static inline uint32_t to_flash_offset(void *p)
 {
-#ifndef CONFIG_ROM_SIZE
-#error CONFIG_ROM_SIZE must be set.
-#endif
 	return CONFIG_ROM_SIZE + (uintptr_t)p;
 }
 
diff --git a/src/soc/intel/fsp_baytrail/smihandler.c b/src/soc/intel/fsp_baytrail/smihandler.c
index 46da662397..4d8bcc0f51 100644
--- a/src/soc/intel/fsp_baytrail/smihandler.c
+++ b/src/soc/intel/fsp_baytrail/smihandler.c
@@ -177,9 +177,6 @@ static void southbridge_smi_sleep(void)
  */
 static em64t100_smm_state_save_area_t *smi_apmc_find_state_save(uint8_t cmd)
 {
-#ifndef CONFIG_MAX_CPUS
-#error CONFIG_MAX_CPUS must be set.
-#endif
 	em64t100_smm_state_save_area_t *state;
 	int node;
 
diff --git a/src/soc/intel/fsp_baytrail/southcluster.c b/src/soc/intel/fsp_baytrail/southcluster.c
index 4d02896b6e..6182948462 100644
--- a/src/soc/intel/fsp_baytrail/southcluster.c
+++ b/src/soc/intel/fsp_baytrail/southcluster.c
@@ -57,9 +57,6 @@ add_mmio_resource(device_t dev, int i, unsigned long addr, unsigned long size)
 
 static void sc_add_mmio_resources(device_t dev)
 {
-#ifndef CONFIG_VIRTUAL_ROM_SIZE
-#error CONFIG_VIRTUAL_ROM_SIZE must be set.
-#endif
 	add_mmio_resource(dev, 0xfeb, ABORT_BASE_ADDRESS, ABORT_BASE_SIZE);
 	add_mmio_resource(dev, PBASE, PMC_BASE_ADDRESS, PMC_BASE_SIZE);
 	add_mmio_resource(dev, IOBASE, IO_BASE_ADDRESS, IO_BASE_SIZE);