2 files changed, 9 insertions, 9 deletions
diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h
index 9a283735d3..cdb681729e 100644
--- a/src/include/cpu/cpu.h
+++ b/src/include/cpu/cpu.h
@@ -3,7 +3,6 @@
 
 #include <arch/cpu.h>
 
-#if !defined(__ROMCC__)
 void cpu_initialize(unsigned int cpu_index);
 /* Returns default APIC id based on logical_cpu number or < 0 on failure. */
 int cpu_get_apic_id(int logical_cpu);
@@ -14,13 +13,15 @@ void initialize_cpus(struct bus *cpu_bus);
 asmlinkage void secondary_cpu_init(unsigned int cpu_index);
 int cpu_phys_address_size(void);
 
+#if ENV_RAMSTAGE
 #define __cpu_driver __attribute__((used, __section__(".rodata.cpu_driver")))
-#ifndef __SIMPLE_DEVICE__
+#else
+#define __cpu_driver __attribute__((unused))
+#endif
+
 /** start of compile time generated pci driver array */
 extern struct cpu_driver _cpu_drivers[];
 /** end of compile time generated pci driver array */
 extern struct cpu_driver _ecpu_drivers[];
-#endif
-#endif /* !__ROMCC__ */
 
 #endif /* CPU_CPU_H */
diff --git a/src/include/device/pci.h b/src/include/device/pci.h
index fa695d440f..8d6a9ae520 100644
--- a/src/include/device/pci.h
+++ b/src/include/device/pci.h
@@ -55,11 +55,12 @@ struct msix_entry {
 	u32 vec_control;
 };
 
-#ifdef __SIMPLE_DEVICE__
-#define __pci_driver __attribute__((unused))
-#else
+#if ENV_RAMSTAGE
 #define __pci_driver __attribute__((used, __section__(".rodata.pci_driver")))
+#else
+#define __pci_driver __attribute__((unused))
 #endif
+
 /** start of compile time generated pci driver array */
 extern struct pci_driver _pci_drivers[];
 /** end of compile time generated pci driver array */
@@ -119,12 +120,10 @@ void pci_early_mmio_window(pci_devfn_t p2p_bridge, u32 mmio_base,
 			   u32 mmio_size);
 int pci_early_device_probe(u8 bus, u8 dev, u32 mmio_base);
 
-#ifndef __ROMCC__
 static inline int pci_base_address_is_memory_space(unsigned int attr)
 {
 	return (attr & PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_MEMORY;
 }
-#endif
 
 #endif /* CONFIG_PCI */