Subrata Banik has uploaded this change for review.

View Change

Use !ENV_PAYLOAD_LOADER to select __SIMPLE_DEVICE__

This patch removes multiple(defined(__PRE_RAM__) || ENV_SMM ||
ENV_POSTCAR) checks to enable __SIMPLE_DEVICE__.

Change-Id: Ide61ec2c908758ba96c61ca9ed7278e7d11d1ee5
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
---
M src/include/rules.h
1 file changed, 4 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/32765/1

diff --git a/src/include/rules.h b/src/include/rules.h
index ce968f0..1effe3f 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -262,17 +262,16 @@
 #define ENV_PAYLOAD_LOADER ENV_RAMSTAGE
 
 /**
- * For pre-DRAM stages and post-CAR always build with simple device model, ie.
- * PCI, PNP and CPU functions operate without use of devicetree. The reason
- * post-CAR utilizes __SIMPLE_DEVICE__ is for simplicity. Currently there's
- * no known requirement that devicetree would be needed during that stage.
+ * !ENV_PAYLOAD_LOADER enable stages always build with simple device model,
+ * ie. PCI, PNP and CPU functions operate without use of devicetree. The reason
+ * post-CAR utilizes __SIMPLE_DEVICE__ is for simplicity.
  *
  * For ramstage individual source file may define __SIMPLE_DEVICE__
  * before including any header files to force that particular source
  * be built with simple device model.
  */
 
-#if (defined(__PRE_RAM__) || ENV_SMM || ENV_POSTCAR)
+#if !ENV_PAYLOAD_LOADER
 #define __SIMPLE_DEVICE__
 #endif
 

To view, visit change 32765. To unsubscribe, or for help writing mail filters, visit settings.