Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34943 )
Change subject: device/pnp.h: Move __SIMPLE_DEVICE__ guards ......................................................................
device/pnp.h: Move __SIMPLE_DEVICE__ guards
Some files under src/ec are built for both ramstage and SMM. This change provides declarations of the required struct to have __SMM__ guards removed from those files.
Change-Id: Ic0c01a11f29381153f19378d5bc4559db8126e00 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/34943 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: HAOUAS Elyes ehaouas@noos.fr Reviewed-by: Aaron Durbin adurbin@chromium.org --- M src/include/device/pnp.h 1 file changed, 2 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Aaron Durbin: Looks good to me, approved HAOUAS Elyes: Looks good to me, but someone else must approve
diff --git a/src/include/device/pnp.h b/src/include/device/pnp.h index bc6391f..ee92a32 100644 --- a/src/include/device/pnp.h +++ b/src/include/device/pnp.h @@ -18,6 +18,8 @@ void pnp_set_irq(struct device *dev, u8 index, u8 irq); void pnp_set_drq(struct device *dev, u8 index, u8 drq);
+#endif /* __SIMPLE_DEVICE */ + /* PNP device operations */ void pnp_read_resources(struct device *dev); void pnp_set_resources(struct device *dev); @@ -108,5 +110,4 @@ outb(value, port + 1); }
-#endif /* ! __SIMPLE_DEVICE__ */ #endif /* DEVICE_PNP_H */